ACCC no longer has a default implementation of onConnectorHierarchyChange (#9298)

Change-Id: I6c358b8b8fdbad2c058cf6915d7d6026412b7999

diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java
index 943c826b4f5f170bb67c14d36df5362eaa84f6a9..05ee63a7d55bd1ded797df7fe4cc4846e1d30a55 100644 (file)
--- a/client/src/com/vaadin/client/ApplicationConnection.java
+++ b/client/src/com/vaadin/client/ApplicationConnection.java
@@ -1606,6 +1606,7 @@ public class ApplicationConnection {
                 VConsole.log(" * Sending hierarchy change events");
                 for (ConnectorHierarchyChangeEvent event : pendingHierarchyChangeEvents) {
                     try {
+                        logHierarchyChange(event);
                         event.getConnector().fireEvent(event);
                     } catch (final Throwable e) {
                         VConsole.error(e);
@@ -1614,6 +1615,29 @@ public class ApplicationConnection {
 
             }
 
+            private void logHierarchyChange(ConnectorHierarchyChangeEvent event) {
+                if (true) {
+                    // Always disabled for now. Can be enabled manually
+                    return;
+                }
+
+                VConsole.log("Hierarchy changed for "
+                        + Util.getConnectorString(event.getConnector()));
+                String oldChildren = "* Old children: ";
+                for (ComponentConnector child : event.getOldChildren()) {
+                    oldChildren += Util.getConnectorString(child) + " ";
+                }
+                VConsole.log(oldChildren);
+
+                String newChildren = "* New children: ";
+                ComponentContainerConnector parent = (ComponentContainerConnector) event
+                        .getConnector();
+                for (ComponentConnector child : parent.getChildComponents()) {
+                    newChildren += Util.getConnectorString(child) + " ";
+                }
+                VConsole.log(newChildren);
+            }
+
             private Collection<StateChangeEvent> updateConnectorState(
                     ValueMap json, Set<ServerConnector> newConnectors) {
                 ArrayList<StateChangeEvent> events = new ArrayList<StateChangeEvent>();

diff --git a/client/src/com/vaadin/client/ui/AbstractComponentContainerConnector.java b/client/src/com/vaadin/client/ui/AbstractComponentContainerConnector.java
index 8a2e63735a9cd8603174643d78e67073c2e0a8d0..20afb3de4b72f1c94b1440ab9c8f089f8eafcf6e 100644 (file)
--- a/client/src/com/vaadin/client/ui/AbstractComponentContainerConnector.java
+++ b/client/src/com/vaadin/client/ui/AbstractComponentContainerConnector.java
@@ -23,8 +23,6 @@ import com.vaadin.client.ComponentConnector;
 import com.vaadin.client.ComponentContainerConnector;
 import com.vaadin.client.ConnectorHierarchyChangeEvent;
 import com.vaadin.client.ConnectorHierarchyChangeEvent.ConnectorHierarchyChangeHandler;
-import com.vaadin.client.Util;
-import com.vaadin.client.VConsole;
 
 public abstract class AbstractComponentContainerConnector extends
         AbstractComponentConnector implements ComponentContainerConnector,
@@ -66,32 +64,6 @@ public abstract class AbstractComponentContainerConnector extends
         this.childComponents = childComponents;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.vaadin.client.ComponentContainerConnector#
-     * connectorHierarchyChanged
-     * (com.vaadin.client.ConnectorHierarchyChangedEvent)
-     */
-    @Override
-    public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) {
-        if (debugLogging) {
-            VConsole.log("Hierarchy changed for "
-                    + Util.getConnectorString(this));
-            String oldChildren = "* Old children: ";
-            for (ComponentConnector child : event.getOldChildren()) {
-                oldChildren += Util.getConnectorString(child) + " ";
-            }
-            VConsole.log(oldChildren);
-
-            String newChildren = "* New children: ";
-            for (ComponentConnector child : getChildComponents()) {
-                newChildren += Util.getConnectorString(child) + " ";
-            }
-            VConsole.log(newChildren);
-        }
-    }
-
     @Override
     public HandlerRegistration addConnectorHierarchyChangeHandler(
             ConnectorHierarchyChangeHandler handler) {

diff --git a/client/src/com/vaadin/client/ui/absolutelayout/AbsoluteLayoutConnector.java b/client/src/com/vaadin/client/ui/absolutelayout/AbsoluteLayoutConnector.java
index be29f5f51211a4161e24f9addd74b7d485e07026..599f52dc2aacdc0bce87460f3180ac6bbf4b1dc4 100644 (file)
--- a/client/src/com/vaadin/client/ui/absolutelayout/AbsoluteLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/absolutelayout/AbsoluteLayoutConnector.java
@@ -147,7 +147,6 @@ public class AbsoluteLayoutConnector extends
 
     @Override
     public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) {
-        super.onConnectorHierarchyChange(event);
 
         for (ComponentConnector child : getChildComponents()) {
             getWrapper(child);

diff --git a/client/src/com/vaadin/client/ui/accordion/AccordionConnector.java b/client/src/com/vaadin/client/ui/accordion/AccordionConnector.java
index 3cee786b068429a5d3697e2474ddae459f0f59e7..ec33ed72fdc3ce79ab39386201238dc79693fbbc 100644 (file)
--- a/client/src/com/vaadin/client/ui/accordion/AccordionConnector.java
+++ b/client/src/com/vaadin/client/ui/accordion/AccordionConnector.java
@@ -19,6 +19,7 @@ import java.util.Iterator;
 
 import com.vaadin.client.ApplicationConnection;
 import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorHierarchyChangeEvent;
 import com.vaadin.client.UIDL;
 import com.vaadin.client.ui.SimpleManagedLayout;
 import com.vaadin.client.ui.accordion.VAccordion.StackItem;
@@ -87,4 +88,9 @@ public class AccordionConnector extends TabsheetBaseConnector implements
 
     }
 
+    @Override
+    public void onConnectorHierarchyChange(
+            ConnectorHierarchyChangeEvent connectorHierarchyChangeEvent) {
+        // TODO Move code from updateFromUIDL to this method
+    }
 }

diff --git a/client/src/com/vaadin/client/ui/csslayout/CssLayoutConnector.java b/client/src/com/vaadin/client/ui/csslayout/CssLayoutConnector.java
index 4fdd10de3433313180721326c42d12caac5d9159..12ebb6a375c7f9eeec37a33bc8cd2a0636605ea9 100644 (file)
--- a/client/src/com/vaadin/client/ui/csslayout/CssLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/csslayout/CssLayoutConnector.java
@@ -123,8 +123,6 @@ public class CssLayoutConnector extends AbstractLayoutConnector {
      */
     @Override
     public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) {
-        super.onConnectorHierarchyChange(event);
-
         clickEventHandler.handleEventHandlerRegistration();
 
         int index = 0;

diff --git a/client/src/com/vaadin/client/ui/customcomponent/CustomComponentConnector.java b/client/src/com/vaadin/client/ui/customcomponent/CustomComponentConnector.java
index 5ad7bb715aca834b783e7a19c2647aac21f04080..d14337afe4c6d6365a25f4d1d663cb99685d6627 100644 (file)
--- a/client/src/com/vaadin/client/ui/customcomponent/CustomComponentConnector.java
+++ b/client/src/com/vaadin/client/ui/customcomponent/CustomComponentConnector.java
@@ -38,8 +38,6 @@ public class CustomComponentConnector extends
 
     @Override
     public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) {
-        super.onConnectorHierarchyChange(event);
-
         ComponentConnector newChild = null;
         if (getChildComponents().size() == 1) {
             newChild = getChildComponents().get(0);

diff --git a/client/src/com/vaadin/client/ui/customlayout/CustomLayoutConnector.java b/client/src/com/vaadin/client/ui/customlayout/CustomLayoutConnector.java
index 0049a4dd3de086a0e20e32125a4a4a1751f7bb66..21b32ae7b0bd23187f4050f34ce4ee3bce1308c0 100644 (file)
--- a/client/src/com/vaadin/client/ui/customlayout/CustomLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/customlayout/CustomLayoutConnector.java
@@ -83,8 +83,6 @@ public class CustomLayoutConnector extends AbstractLayoutConnector implements
 
     @Override
     public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) {
-        super.onConnectorHierarchyChange(event);
-
         // Must do this once here so the HTML has been set up before we start
         // adding child widgets.
 

diff --git a/client/src/com/vaadin/client/ui/form/FormConnector.java b/client/src/com/vaadin/client/ui/form/FormConnector.java
index 25b4a76a0914eb8309c1c7315ded1d8881e3b983..0c2e4a8ecd5f69d6ec5e8637414b83a1797eb981 100644 (file)
--- a/client/src/com/vaadin/client/ui/form/FormConnector.java
+++ b/client/src/com/vaadin/client/ui/form/FormConnector.java
@@ -20,6 +20,7 @@ import com.google.gwt.event.dom.client.KeyDownEvent;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.client.ApplicationConnection;
 import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorHierarchyChangeEvent;
 import com.vaadin.client.LayoutManager;
 import com.vaadin.client.Paintable;
 import com.vaadin.client.UIDL;
@@ -214,4 +215,9 @@ public class FormConnector extends AbstractComponentContainerConnector
         return (FormState) super.getState();
     }
 
+    @Override
+    public void onConnectorHierarchyChange(
+            ConnectorHierarchyChangeEvent connectorHierarchyChangeEvent) {
+        // TODO Move code from updateFromUIDL to this method
+    }
 }

diff --git a/client/src/com/vaadin/client/ui/formlayout/FormLayoutConnector.java b/client/src/com/vaadin/client/ui/formlayout/FormLayoutConnector.java
index c78137345f5e6c24798b2b7089e8f5f7b0d86d4f..6379ae47be61b3ff75ab3ba7f5b0ce60031aba40 100644 (file)
--- a/client/src/com/vaadin/client/ui/formlayout/FormLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/formlayout/FormLayoutConnector.java
@@ -53,8 +53,6 @@ public class FormLayoutConnector extends AbstractLayoutConnector {
 
     @Override
     public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) {
-        super.onConnectorHierarchyChange(event);
-
         VFormLayout formLayout = getWidget();
         VFormLayoutTable formLayoutTable = getWidget().table;
 

diff --git a/client/src/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java b/client/src/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java
index e6c293d2178b271ef63809cfe65018c1441667d6..d235413d8cc8e34311044de5e1a6f9d7c33722c1 100644 (file)
--- a/client/src/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java
@@ -179,8 +179,6 @@ public class GridLayoutConnector extends AbstractComponentContainerConnector
 
     @Override
     public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) {
-        super.onConnectorHierarchyChange(event);
-
         VGridLayout layout = getWidget();
 
         // clean non rendered components

diff --git a/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java b/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
index e0863512b474c48fa26687f56f4cd3df23c1af0d..7da2e17cbe08eabb7a9c94e423d94c6001d5031a 100644 (file)
--- a/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
@@ -288,7 +288,6 @@ public abstract class AbstractOrderedLayoutConnector extends
      */
     @Override
     public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) {
-        super.onConnectorHierarchyChange(event);
 
         List<ComponentConnector> previousChildren = event.getOldChildren();
         int currentIndex = 0;

diff --git a/client/src/com/vaadin/client/ui/panel/PanelConnector.java b/client/src/com/vaadin/client/ui/panel/PanelConnector.java
index 16e6babfa6304f85bf6de67b8fc86b7d123aacea..695e06e0f2c3b85e19a9ec3ded3a9556c8a73bf1 100644 (file)
--- a/client/src/com/vaadin/client/ui/panel/PanelConnector.java
+++ b/client/src/com/vaadin/client/ui/panel/PanelConnector.java
@@ -243,7 +243,6 @@ public class PanelConnector extends AbstractComponentContainerConnector
 
     @Override
     public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) {
-        super.onConnectorHierarchyChange(event);
         // We always have 1 child, unless the child is hidden
         Widget newChildWidget = null;
         if (getChildComponents().size() == 1) {

diff --git a/client/src/com/vaadin/client/ui/popupview/PopupViewConnector.java b/client/src/com/vaadin/client/ui/popupview/PopupViewConnector.java
index 8def4d244d2fdaeb0c4810366670eb3784032650..eba09b6a19c1beb884633e53ab410c9d471ed527 100644 (file)
--- a/client/src/com/vaadin/client/ui/popupview/PopupViewConnector.java
+++ b/client/src/com/vaadin/client/ui/popupview/PopupViewConnector.java
@@ -17,6 +17,7 @@ package com.vaadin.client.ui.popupview;
 
 import com.vaadin.client.ApplicationConnection;
 import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorHierarchyChangeEvent;
 import com.vaadin.client.Paintable;
 import com.vaadin.client.UIDL;
 import com.vaadin.client.VCaption;
@@ -127,4 +128,10 @@ public class PopupViewConnector extends AbstractComponentContainerConnector
         }
     }
 
+    @Override
+    public void onConnectorHierarchyChange(
+            ConnectorHierarchyChangeEvent connectorHierarchyChangeEvent) {
+        // TODO Move code from updateFromUIDL to this method
+    }
+
 }

diff --git a/client/src/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java b/client/src/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java
index eaf82ff557ae19728fdedc25532f2f597dc7042c..501752ed1800c0b905056a4748beddecf159b1cd 100644 (file)
--- a/client/src/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java
+++ b/client/src/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java
@@ -212,8 +212,6 @@ public abstract class AbstractSplitPanelConnector extends
 
     @Override
     public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) {
-        super.onConnectorHierarchyChange(event);
-
         Widget newFirstChildWidget = null;
         if (getFirstChild() != null) {
             newFirstChildWidget = getFirstChild().getWidget();

diff --git a/client/src/com/vaadin/client/ui/table/TableConnector.java b/client/src/com/vaadin/client/ui/table/TableConnector.java
index e5e8cbb9adeb83e2551bc3fba85e72ef4eaa40a7..b79cc39297d972632a1f6330a70aafb6dd968fe4 100644 (file)
--- a/client/src/com/vaadin/client/ui/table/TableConnector.java
+++ b/client/src/com/vaadin/client/ui/table/TableConnector.java
@@ -26,6 +26,7 @@ import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.client.ApplicationConnection;
 import com.vaadin.client.BrowserInfo;
 import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorHierarchyChangeEvent;
 import com.vaadin.client.DirectionalManagedLayout;
 import com.vaadin.client.Paintable;
 import com.vaadin.client.ServerConnector;
@@ -213,12 +214,10 @@ public class TableConnector extends AbstractComponentContainerConnector
 
         if (!getWidget().isSelectable()) {
             getWidget().scrollBody.addStyleName(getWidget()
-                    .getStylePrimaryName()
-                    + "-body-noselection");
+                    .getStylePrimaryName() + "-body-noselection");
         } else {
             getWidget().scrollBody.removeStyleName(getWidget()
-                    .getStylePrimaryName()
-                    + "-body-noselection");
+                    .getStylePrimaryName() + "-body-noselection");
         }
 
         getWidget().hideScrollPositionAnnotation();
@@ -388,4 +387,10 @@ public class TableConnector extends AbstractComponentContainerConnector
         return info;
     }
 
+    @Override
+    public void onConnectorHierarchyChange(
+            ConnectorHierarchyChangeEvent connectorHierarchyChangeEvent) {
+        // TODO Move code from updateFromUIDL to this method
+    }
+
 }

diff --git a/client/src/com/vaadin/client/ui/tabsheet/TabsheetConnector.java b/client/src/com/vaadin/client/ui/tabsheet/TabsheetConnector.java
index aff5af2a9598d21aedb5fd634f4896503455e217..fd09b0316056f17f62345c5709f023dd851ea70c 100644 (file)
--- a/client/src/com/vaadin/client/ui/tabsheet/TabsheetConnector.java
+++ b/client/src/com/vaadin/client/ui/tabsheet/TabsheetConnector.java
@@ -19,6 +19,7 @@ import com.google.gwt.dom.client.Element;
 import com.google.gwt.user.client.DOM;
 import com.vaadin.client.ApplicationConnection;
 import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorHierarchyChangeEvent;
 import com.vaadin.client.TooltipInfo;
 import com.vaadin.client.UIDL;
 import com.vaadin.client.Util;
@@ -144,4 +145,9 @@ public class TabsheetConnector extends TabsheetBaseConnector implements
         return info;
     }
 
+    @Override
+    public void onConnectorHierarchyChange(
+            ConnectorHierarchyChangeEvent connectorHierarchyChangeEvent) {
+        // TODO Move code from updateFromUIDL to this method
+    }
 }

diff --git a/client/src/com/vaadin/client/ui/ui/UIConnector.java b/client/src/com/vaadin/client/ui/ui/UIConnector.java
index a6c3b4cf2b87d6f7e109524f1da5ad4bee5f7eb8..f2c54c0a21da7ef8370f3bc0e85012b7f8baf8b8 100644 (file)
--- a/client/src/com/vaadin/client/ui/ui/UIConnector.java
+++ b/client/src/com/vaadin/client/ui/ui/UIConnector.java
@@ -394,8 +394,6 @@ public class UIConnector extends AbstractComponentContainerConnector implements
 
     @Override
     public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) {
-        super.onConnectorHierarchyChange(event);
-
         ComponentConnector oldChild = null;
         ComponentConnector newChild = getContent();
 

diff --git a/client/src/com/vaadin/client/ui/window/WindowConnector.java b/client/src/com/vaadin/client/ui/window/WindowConnector.java
index f26592350af5e612780615615c6b6d75876fcdc9..b975ab8e88f6b38bd1fad26e3fc10b45117f87b6 100644 (file)
--- a/client/src/com/vaadin/client/ui/window/WindowConnector.java
+++ b/client/src/com/vaadin/client/ui/window/WindowConnector.java
@@ -213,8 +213,6 @@ public class WindowConnector extends AbstractComponentContainerConnector
 
     @Override
     public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) {
-        super.onConnectorHierarchyChange(event);
-
         // We always have 1 child, unless the child is hidden
         Widget newChildWidget = null;
         ComponentConnector newChild = null;

diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java
index 68af02d6ce92b876629397ba1cb610a610929737..62686dfdedc3ab620ea51d8661c3cb4617bf0098 100644 (file)
--- a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java
@@ -20,7 +20,6 @@ public class WidgetContainerConnector extends
         for (ComponentConnector connector : children) {
             widget.add(connector.getWidget());
         }
-        super.onConnectorHierarchyChange(event);
     }
 
     @Override