From 22100f9e8a3270ec70dbd2b87c12befb4c037186 Mon Sep 17 00:00:00 2001 From: Matti Tahvonen Date: Wed, 7 Jan 2009 13:54:58 +0000 Subject: [PATCH] fixes #2421, added some null checks svn changeset:6432/svn branch:trunk --- .../itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java index e135c30b29..fa0a8b2641 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java @@ -271,7 +271,8 @@ public class IGridLayout extends SimplePanel implements Paintable, Container { Cell[] column = cells[i]; for (int j = 0; j < column.length; j++) { Cell c = column[j]; - if (c != null && c.widthCanAffectHeight()) { + if (c != null && c.cc != null + && c.widthCanAffectHeight()) { c.cc.setContainerSize(c.getAvailableWidth(), c .getAvailableHeight()); client.handleComponentRelativeSize(c.cc @@ -768,6 +769,7 @@ public class IGridLayout extends SimplePanel implements Paintable, Container { for (int j = 0; j < cells[i].length; j++) { Cell cell = cells[i][j]; if (cell != null + && cell.cc != null && (cell.hasRelativeHeight() || cell .hasRelativeWidth())) { client.handleComponentRelativeSize(cell.cc.getWidget()); -- 2.39.5