Fixed exceptions when OrderedLayout has no components

svn changeset:5674/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 1cdc5ff76096d97b017896c9573d9a6b5ce41c25..fc6f35e7a8508c1ce7be599d227e1fbbff99a49d 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
@@ -174,19 +174,21 @@ public class IOrderedLayout extends CellBasedLayout {
     }\r
 \r
     private void recalculateLayout() {\r
+\r
         /* Calculate space for relative size components */\r
         int spaceForExpansion = calculateLayoutDimensions();\r
 \r
-        /* Divide expansion space between component containers */\r
-        expandComponentContainers(spaceForExpansion);\r
+        if (!widgetToComponentContainer.isEmpty()) {\r
+            /* Divide expansion space between component containers */\r
+            expandComponentContainers(spaceForExpansion);\r
 \r
-        /* Update container sizes */\r
-        calculateContainerSize();\r
+            /* Update container sizes */\r
+            calculateContainerSize();\r
+        }\r
 \r
     }\r
 \r
     private void expandComponentContainers(int spaceForExpansion) {\r
-\r
         int remaining = spaceForExpansion;\r
         for (ChildComponentContainer childComponentContainer : widgetToComponentContainer\r
                 .values()) {\r

diff --git a/src/com/itmill/toolkit/ui/OrderedLayout.java b/src/com/itmill/toolkit/ui/OrderedLayout.java
index 7e7ee27f637480eb74dab10dd018deedf8d3ef7e..9f5cfa86e89538b1fadad94677328626fbfbae6f 100644 (file)
--- a/src/com/itmill/toolkit/ui/OrderedLayout.java
+++ b/src/com/itmill/toolkit/ui/OrderedLayout.java
@@ -227,7 +227,9 @@ public class OrderedLayout extends AbstractLayout implements
         }
 
         // correct possible rounding error
-        expandRatioArray[0] -= realSum - 1000;
+        if (expandRatioArray.length > 0) {
+            expandRatioArray[0] -= realSum - 1000;
+        }
 
         // Add child component alignment info to layout tag
         target.addAttribute("alignments", alignmentsArray);