reverted fixes for #6060, #6061, should be better covered by #6150

svn changeset:16509/svn branch:6.5

2 files changed, 2 insertions, 14 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayout.java
index 4d8c6fe86f..50e33c4c19 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayout.java
@@ -297,14 +297,7 @@ public class VAbsoluteLayout extends ComplexPanel implements Container {
             if (caption != null) {
                 caption.removeFromParent();
             }
-
-            // Only unregister if the paintable has not been moved to another
-            // layout and detached from this (hence parent != this or
-            // getWidget() != paintable)
-            if (getWidget() == paintable) {
-                client.unregisterPaintable(paintable);
-            }
-
+            client.unregisterPaintable(paintable);
             removeFromParent();
         }
 
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
index 637b9cc51f..1dfbd88bf7 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
@@ -243,12 +243,7 @@ public class VGridLayout extends SimplePanel implements Paintable, Container {
             paintableToCell.remove(w);
             widgetToComponentContainer.remove(w);
             childComponentContainer.removeFromParent();
-            if (childComponentContainer.getWidget() == w) {
-                // Only unregister if the paintable has not been moved to
-                // another layout and detached from this (hence cc.getWidget()
-                // == null, or w.getParent() != this)
-                client.unregisterPaintable((Paintable) w);
-            }
+            client.unregisterPaintable((Paintable) w);
         }
         nonRenderedWidgets = null;