aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatti Tahvonen <matti.tahvonen@itmill.com>2008-10-28 08:59:43 +0000
committerMatti Tahvonen <matti.tahvonen@itmill.com>2008-10-28 08:59:43 +0000
commitb53f44c446d8f70e86ba46d542e313abaf4d6c5e (patch)
tree57b3d855d16daa24fef97d620402172ad88a7b00 /src
parent8b341ce3a1202a8bd93a477f6c1dada2a585e0ed (diff)
downloadvaadin-framework-b53f44c446d8f70e86ba46d542e313abaf4d6c5e.tar.gz
vaadin-framework-b53f44c446d8f70e86ba46d542e313abaf4d6c5e.zip
removed obsolete check that couses npe in emptied grid
svn changeset:5747/svn branch:trunk
Diffstat (limited to 'src')
-rw-r--r--src/com/itmill/toolkit/ui/GridLayout.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/itmill/toolkit/ui/GridLayout.java b/src/com/itmill/toolkit/ui/GridLayout.java
index 2e019835b3..88dfb5d5cb 100644
--- a/src/com/itmill/toolkit/ui/GridLayout.java
+++ b/src/com/itmill/toolkit/ui/GridLayout.java
@@ -412,7 +412,7 @@ public class GridLayout extends AbstractLayout implements
boolean equallyDividedCols = false;
int realColExpandRatioSum = 0;
float colSum = getExpandRatioSum(columnExpandRatio);
- if (colSum == 0 && components.size() > 0) {
+ if (colSum == 0) {
// no columns has been expanded, all cols have same expand
// rate
equallyDividedCols = true;
@@ -434,7 +434,7 @@ public class GridLayout extends AbstractLayout implements
boolean equallyDividedRows = false;
int realRowExpandRatioSum = 0;
float rowSum = getExpandRatioSum(rowExpandRatio);
- if (rowSum == 0 && components.size() > 0) {
+ if (rowSum == 0) {
// no rows have been expanded
equallyDividedRows = true;
float equalSize = 1 / (float) rows;