From b6bbf6e0bb04e008d9b353ecb2c26791ad131a13 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Thu, 18 Dec 2008 09:40:31 +0000 Subject: [PATCH] Fixed NPE in OrderedLayout svn changeset:6261/svn branch:trunk --- .../toolkit/terminal/gwt/client/ui/IOrderedLayout.java | 7 ++++--- .../terminal/gwt/client/ui/layout/CellBasedLayout.java | 2 +- 2 files changed, 5 insertions(+), 4 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 cd4070ee6c..624afedcba 100644 --- 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 // Add extra pixels to first container - getFirstChildComponentContainer().expandExtra(orientation, - remaining); - + ChildComponentContainer firstChildContainer = getFirstChildComponentContainer(); + if (firstChildContainer != null) { + firstChildContainer.expandExtra(orientation, remaining); + } } } 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 0e9991669d..b7df151548 100644 --- 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; } -- 2.39.5