Sync git svn branch with SVN repository r33153.

[simantics/platform.git] / bundles / org.simantics.views.swt.client / src / org / simantics / views / swt / client / base / SingleSWTViewNode.java

diff --git a/bundles/org.simantics.views.swt.client/src/org/simantics/views/swt/client/base/SingleSWTViewNode.java b/bundles/org.simantics.views.swt.client/src/org/simantics/views/swt/client/base/SingleSWTViewNode.java
index 182aee594f3c5e1af6a7ec538787586354a383cf..55ac799d3ba9509630e54c64c9c36f7ec4d1ef2f 100644 (file)
--- a/bundles/org.simantics.views.swt.client/src/org/simantics/views/swt/client/base/SingleSWTViewNode.java
+++ b/bundles/org.simantics.views.swt.client/src/org/simantics/views/swt/client/base/SingleSWTViewNode.java
@@ -27,7 +27,7 @@ import org.simantics.ui.colors.Colors;
 import org.simantics.ui.fonts.Fonts;\r
 import org.simantics.utils.threads.IThreadWorkQueue;\r
 import org.simantics.utils.threads.SWTThread;\r
-import org.simantics.views.ViewUtils.GridDataBean;\r
+import org.simantics.views.ViewUtils.LayoutDataBean;\r
 \r
 abstract public class SingleSWTViewNode<T extends Control> extends SWTParentNode implements LoaderNode {\r
        \r
@@ -36,7 +36,7 @@ abstract public class SingleSWTViewNode<T extends Control> extends SWTParentNode
        private Map<String, Object> genericProperties = new HashMap<String, Object>();\r
        \r
        public Function2<String, Object, Boolean> propertyCallback;\r
-       public GridDataBean layoutData;\r
+       public LayoutDataBean layoutData;\r
        public int style;\r
        public String text;\r
        public RGB.Integer background;\r
@@ -292,8 +292,8 @@ abstract public class SingleSWTViewNode<T extends Control> extends SWTParentNode
        final public void synchronizeStyle(int style) {\r
        }\r
 \r
-       final public void synchronizeLayoutData(GridDataBean layoutData) {\r
-               if(layoutData != null) control.setLayoutData(SWTViewUtils.toGridData(layoutData));\r
+       final public void synchronizeLayoutData(LayoutDataBean layoutData) {\r
+               if(layoutData != null) control.setLayoutData(SWTViewUtils.toLayoutData(layoutData));\r
        }\r
        \r
 }\r