Fixed NPE in OrderedLayout

svn changeset:6261/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 cd4070ee6c9aaae868bd267d5c1ce6c58932374b..624afedcba7e7694f957ad7e31bfb36f7791b923 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
@@ -240,9 +240,10 @@ public class IOrderedLayout extends CellBasedLayout {
             // Some left-over pixels due to rounding errors\r
 \r
             // Add extra pixels to first container\r
-            getFirstChildComponentContainer().expandExtra(orientation,\r
-                    remaining);\r
-\r
+            ChildComponentContainer firstChildContainer = getFirstChildComponentContainer();\r
+            if (firstChildContainer != null) {\r
+                firstChildContainer.expandExtra(orientation, remaining);\r
+            }\r
         }\r
 \r
     }\r

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/CellBasedLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/CellBasedLayout.java
index 0e9991669db47b4bdb41af83f521397b7aea736f..b7df151548a335e5140fd43dab15b243f4dde53f 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/CellBasedLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/CellBasedLayout.java
@@ -267,7 +267,7 @@ public abstract class CellBasedLayout extends ComplexPanel implements Container
 
     protected ChildComponentContainer getFirstChildComponentContainer() {
         int size = getChildren().size();
-        if (size < 2) {
+        if (size < 1) {
             return null;
         }