From: Leif Åstrand <leif@vaadin.com>
Date: Thu, 15 Mar 2012 11:53:37 +0000 (+0200)
Subject: Ensure layout -> caption dependencies are unregistered when a slot
X-Git-Tag: 7.0.0.alpha2~313
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6704241d8a2e9e4127aea0c5c78571d56651ecc9;p=vaadin-framework.git

Ensure layout -> caption dependencies are unregistered when a slot
is removed
---

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayout.java
index ce317ee563..cb353825b6 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayout.java
@@ -77,7 +77,9 @@ public class VMeasuringOrderedLayout extends ComplexPanel {
     public void removeSlot(VLayoutSlot slot) {
         VCaption caption = slot.getCaption();
         if (caption != null) {
-            remove(caption);
+            // Must remove using setCaption to ensure dependencies (layout ->
+            // caption) are unregistered
+            slot.setCaption(null);
         }
 
         remove(slot.getWidget());