fixes rather fatal expand layout bug (expanded element reference lost on each removeC...

svn changeset:3914/svn branch:trunk

diff --git a/src/com/itmill/toolkit/ui/ExpandLayout.java b/src/com/itmill/toolkit/ui/ExpandLayout.java
index 79cc69c1f187ea15a15475e421a9c96bb432b55c..331519f3bb247deec83f9eb3aa0511ac7302f0b0 100644 (file)
--- a/src/com/itmill/toolkit/ui/ExpandLayout.java
+++ b/src/com/itmill/toolkit/ui/ExpandLayout.java
@@ -112,10 +112,12 @@ public class ExpandLayout extends OrderedLayout {
 
     public void removeComponent(Component c) {
         super.removeComponent(c);
-        if (c == expanded && getComponentIterator().hasNext()) {
-            expanded = (Component) getComponentIterator().next();
-        } else {
-            expanded = null;
+        if (c == expanded) {
+            if (getComponentIterator().hasNext()) {
+                expanded = (Component) getComponentIterator().next();
+            } else {
+                expanded = null;
+            }
         }
     }