From 67e2841139a77fc3099d57cfaeaff6da1f93f0d0 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Thu, 5 Apr 2012 00:30:17 +0300
Subject: [PATCH] Removed unnecessary calls to unregisterPaintable

---
 src/com/vaadin/terminal/gwt/client/ui/FormConnector.java   | 7 -------
 src/com/vaadin/terminal/gwt/client/ui/RootConnector.java   | 3 ---
 src/com/vaadin/terminal/gwt/client/ui/VPopupView.java      | 7 -------
 src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java | 1 -
 4 files changed, 18 deletions(-)

diff --git a/src/com/vaadin/terminal/gwt/client/ui/FormConnector.java b/src/com/vaadin/terminal/gwt/client/ui/FormConnector.java
index 2cc9c9968e..4822ec734d 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/FormConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/FormConnector.java
@@ -10,7 +10,6 @@ import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.AbstractFieldState;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorMap;
 import com.vaadin.terminal.gwt.client.LayoutManager;
 import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
@@ -99,8 +98,6 @@ public class FormConnector extends AbstractComponentContainerConnector
                 getWidget().footer = newFooterWidget;
             } else if (newFooter != getWidget().footer) {
                 getWidget().remove(getWidget().footer);
-                client.unregisterPaintable(ConnectorMap.get(getConnection())
-                        .getConnector(getWidget().footer));
                 getWidget().add(newFooter.getWidget(),
                         getWidget().footerContainer);
             }
@@ -108,8 +105,6 @@ public class FormConnector extends AbstractComponentContainerConnector
         } else {
             if (getWidget().footer != null) {
                 getWidget().remove(getWidget().footer);
-                client.unregisterPaintable(ConnectorMap.get(getConnection())
-                        .getConnector(getWidget().footer));
             }
         }
 
@@ -122,8 +117,6 @@ public class FormConnector extends AbstractComponentContainerConnector
             getWidget().add(newLayoutWidget, getWidget().fieldContainer);
         } else if (getWidget().lo != newLayoutWidget) {
             // Layout has changed
-            client.unregisterPaintable(ConnectorMap.get(getConnection())
-                    .getConnector(getWidget().lo));
             getWidget().remove(getWidget().lo);
             getWidget().lo = newLayoutWidget;
             getWidget().add(newLayoutWidget, getWidget().fieldContainer);
diff --git a/src/com/vaadin/terminal/gwt/client/ui/RootConnector.java b/src/com/vaadin/terminal/gwt/client/ui/RootConnector.java
index 8af9b39825..392230aa7f 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/RootConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/RootConnector.java
@@ -166,7 +166,6 @@ public class RootConnector extends AbstractComponentContainerConnector
         if (getWidget().layout != null) {
             if (layoutChanged) {
                 // remove old
-                client.unregisterPaintable(getWidget().layout);
                 if (childStateChangeHandlerRegistration != null) {
                     childStateChangeHandlerRegistration.removeHandler();
                     childStateChangeHandlerRegistration = null;
@@ -227,8 +226,6 @@ public class RootConnector extends AbstractComponentContainerConnector
         for (final Iterator<VWindow> rem = removedSubWindows.iterator(); rem
                 .hasNext();) {
             final VWindow w = rem.next();
-            client.unregisterPaintable(ConnectorMap.get(getConnection())
-                    .getConnector(w));
             getWidget().subWindows.remove(w);
             w.hide();
         }
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java b/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java
index e6ca747b7c..c13c4339a5 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java
@@ -228,7 +228,6 @@ public class VPopupView extends HTML {
         public void hide(boolean autoClosed) {
             hiding = true;
             syncChildren();
-            unregisterPaintables();
             if (popupComponentWidget != null && popupComponentWidget != loading) {
                 remove(popupComponentWidget);
             }
@@ -301,12 +300,6 @@ public class VPopupView extends HTML {
 
         }
 
-        public void unregisterPaintables() {
-            if (popupComponentPaintable != null) {
-                client.unregisterPaintable(popupComponentPaintable);
-            }
-        }
-
         public void setHideOnMouseOut(boolean hideOnMouseOut) {
             this.hideOnMouseOut = hideOnMouseOut;
         }
diff --git a/src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java b/src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java
index 58ae583fa6..7c50b0f34f 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java
@@ -194,7 +194,6 @@ public class WindowConnector extends AbstractComponentContainerConnector
         if (getWidget().layout != null) {
             if (getWidget().layout != lo) {
                 // remove old
-                client.unregisterPaintable(getWidget().layout);
                 getWidget().contentPanel.remove(getWidget().layout.getWidget());
                 // add new
                 if (!showingUrl) {
-- 
2.39.5