diff options
19 files changed, 58 insertions, 52 deletions
diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java index 943c826b4f..05ee63a7d5 100644 --- 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 8a2e63735a..20afb3de4b 100644 --- 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 be29f5f512..599f52dc2a 100644 --- 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 3cee786b06..ec33ed72fd 100644 --- 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 4fdd10de34..12ebb6a375 100644 --- 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 5ad7bb715a..d14337afe4 100644 --- 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 0049a4dd3d..21b32ae7b0 100644 --- 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 25b4a76a09..0c2e4a8ecd 100644 --- 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 c78137345f..6379ae47be 100644 --- 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 e6c293d217..d235413d8c 100644 --- 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 e0863512b4..7da2e17cbe 100644 --- 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 16e6babfa6..695e06e0f2 100644 --- 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 8def4d244d..eba09b6a19 100644 --- 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 eaf82ff557..501752ed18 100644 --- 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 e5e8cbb9ad..b79cc39297 100644 --- 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 aff5af2a95..fd09b03160 100644 --- 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 a6c3b4cf2b..f2c54c0a21 100644 --- 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 f26592350a..b975ab8e88 100644 --- 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 68af02d6ce..62686dfded 100644 --- 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 |