diff options
author | Artur Signell <artur@vaadin.com> | 2012-03-12 12:13:16 +0200 |
---|---|---|
committer | Artur Signell <artur@vaadin.com> | 2012-03-14 16:00:19 +0200 |
commit | b47a7d5cdeb51cd7c536d2cfe4ce17b06954d51c (patch) | |
tree | 347c58279b1759f346404e97790a1ad36e502f27 /src | |
parent | ae3478bc2eb2abec316996b4fd54664ef0e4ad11 (diff) | |
download | vaadin-framework-b47a7d5cdeb51cd7c536d2cfe4ce17b06954d51c.tar.gz vaadin-framework-b47a7d5cdeb51cd7c536d2cfe4ce17b06954d51c.zip |
Temporary fix to make AbstractOrderedLayout work again
Diffstat (limited to 'src')
-rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java index aec7f5cd3c..c49b55eef7 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java @@ -3,8 +3,8 @@ */ package com.vaadin.terminal.gwt.client.ui; -import java.util.HashSet; import java.util.Iterator; +import java.util.List; import com.google.gwt.dom.client.Node; import com.google.gwt.dom.client.Style; @@ -24,6 +24,8 @@ import com.vaadin.terminal.gwt.client.ui.layout.VLayoutSlot; public abstract class AbstractOrderedLayoutConnector extends AbstractComponentContainerConnector implements DirectionalManagedLayout { + private List<ComponentConnector> previousChildren; + @Override public void init() { getLayoutManager().registerDependency(this, @@ -62,9 +64,6 @@ public abstract class AbstractOrderedLayoutConnector extends return; } - HashSet<ComponentConnector> previousChildren = new HashSet<ComponentConnector>( - getChildren()); - VMeasuringOrderedLayout layout = getWidget(); ValueMap expandRatios = uidl.getMapAttribute("expandRatios"); @@ -72,6 +71,7 @@ public abstract class AbstractOrderedLayoutConnector extends int currentIndex = 0; // TODO Support reordering elements! + // FIXME: move to connectorHierarchyChanged!! for (final Iterator<Object> it = uidl.getChildIterator(); it.hasNext();) { final UIDL childUIDL = (UIDL) it.next(); final ComponentConnector child = client.getPaintable(childUIDL); @@ -281,4 +281,10 @@ public abstract class AbstractOrderedLayoutConnector extends } } + @Override + public void connectorHierarchyChanged( + com.vaadin.terminal.gwt.client.ConnectorHierarchyChangedEvent event) { + previousChildren = event.getOldChildren(); + }; + } |