added null check (in case of empty ordered layout)

svn changeset:5692/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
index 5e14496553c54a7edbf19a77574c6046c8dde258..fe5373fd1f669cd59f6ff5966c292d4621d443cd 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
@@ -508,20 +508,21 @@ public class IOrderedLayout extends CellBasedLayout {
      */\r
     private void updateContainerMargins() {\r
         ChildComponentContainer firstChildComponent = getFirstChildComponentContainer();\r
+        if (firstChildComponent != null) {\r
+            firstChildComponent.setMarginLeft(0);\r
+            firstChildComponent.setMarginTop(0);\r
 \r
-        firstChildComponent.setMarginLeft(0);\r
-        firstChildComponent.setMarginTop(0);\r
-\r
-        for (ChildComponentContainer childComponent : widgetToComponentContainer\r
-                .values()) {\r
-            if (childComponent == firstChildComponent) {\r
-                continue;\r
-            }\r
+            for (ChildComponentContainer childComponent : widgetToComponentContainer\r
+                    .values()) {\r
+                if (childComponent == firstChildComponent) {\r
+                    continue;\r
+                }\r
 \r
-            if (isHorizontal()) {\r
-                childComponent.setMarginLeft(activeSpacing.hSpacing);\r
-            } else {\r
-                childComponent.setMarginTop(activeSpacing.vSpacing);\r
+                if (isHorizontal()) {\r
+                    childComponent.setMarginLeft(activeSpacing.hSpacing);\r
+                } else {\r
+                    childComponent.setMarginTop(activeSpacing.vSpacing);\r
+                }\r
             }\r
         }\r
     }\r