Changeset 4788

Timestamp:

06/09/08 07:09:21 (6 months ago)

Author:

magi@…

Message:

Merged [4744] from trunk to 5.2 branch: fixes #1775 (CustomLayout? does not remove component from an emptied slot)

Files:

• branches/5.2/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java (modified) (3 diffs)

branches/5.2/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java

@@ -6 +6 @@
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Set;
 
 import com.google.gwt.user.client.DOM;
@@ -137 +139 @@
 
         iLayout();
+
+        Set oldWidgets = new HashSet();
+        oldWidgets.addAll(locationToWidget.values());
 
         // For all contained widgets
@@ -151 +156 @@
                     // If no location is found, this component is not visible
                 }
+                oldWidgets.remove(child);
+            }
+        }
+        for (Iterator iterator = oldWidgets.iterator(); iterator.hasNext();) {
+            Widget oldWidget = (Widget) iterator.next();
+            if (oldWidget.isAttached()) {
+                // slot of this widget is emptied, remove it
+                remove(oldWidget);
             }
         }