Browse Source

Temporary fix to make AbstractOrderedLayout work again

tags/7.0.0.alpha2
Artur Signell 12 years ago
parent
commit
b47a7d5cde

+ 10
- 4
src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java View File

@@ -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();
};

}

Loading…
Cancel
Save