From d5956fe2ed95853bb386f7419ee7736461660352 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Mon, 20 Oct 2008 11:26:01 +0000
Subject: [PATCH] Fixed exceptions when OrderedLayout has no components

svn changeset:5674/svn branch:trunk
---
 .../terminal/gwt/client/ui/IOrderedLayout.java       | 12 +++++++-----
 src/com/itmill/toolkit/ui/OrderedLayout.java         |  4 +++-
 2 files changed, 10 insertions(+), 6 deletions(-)

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 1cdc5ff760..fc6f35e7a8 100644
--- 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 {
     }
 
     private void recalculateLayout() {
+
         /* Calculate space for relative size components */
         int spaceForExpansion = calculateLayoutDimensions();
 
-        /* Divide expansion space between component containers */
-        expandComponentContainers(spaceForExpansion);
+        if (!widgetToComponentContainer.isEmpty()) {
+            /* Divide expansion space between component containers */
+            expandComponentContainers(spaceForExpansion);
 
-        /* Update container sizes */
-        calculateContainerSize();
+            /* Update container sizes */
+            calculateContainerSize();
+        }
 
     }
 
     private void expandComponentContainers(int spaceForExpansion) {
-
         int remaining = spaceForExpansion;
         for (ChildComponentContainer childComponentContainer : widgetToComponentContainer
                 .values()) {
diff --git a/src/com/itmill/toolkit/ui/OrderedLayout.java b/src/com/itmill/toolkit/ui/OrderedLayout.java
index 7e7ee27f63..9f5cfa86e8 100644
--- 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);
-- 
2.39.5