aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--client/src/com/vaadin/client/ui/layout/LayoutDependencyTree.java17
1 files changed, 4 insertions, 13 deletions
diff --git a/client/src/com/vaadin/client/ui/layout/LayoutDependencyTree.java b/client/src/com/vaadin/client/ui/layout/LayoutDependencyTree.java
index da3aed4bbc..af261c0208 100644
--- a/client/src/com/vaadin/client/ui/layout/LayoutDependencyTree.java
+++ b/client/src/com/vaadin/client/ui/layout/LayoutDependencyTree.java
@@ -690,19 +690,10 @@ public class LayoutDependencyTree {
}
public JsArrayString getMeasureTargetsJsArray() {
- FastStringSet horizontalQueue = getMeasureQueue(HORIZONTAL);
- JsArrayString measureTargets = horizontalQueue.dump();
-
- JsArrayString verticalDump = getMeasureQueue(VERTICAL).dump();
- int length = verticalDump.length();
- for (int i = 0; i < length; i++) {
- String connectorId = verticalDump.get(i);
- if (!horizontalQueue.contains(connectorId)) {
- measureTargets.push(connectorId);
- }
- }
-
- return measureTargets;
+ FastStringSet allMeasuredTargets = FastStringSet.create();
+ allMeasuredTargets.addAll(getMeasureQueue(HORIZONTAL));
+ allMeasuredTargets.addAll(getMeasureQueue(VERTICAL));
+ return allMeasuredTargets.dump();
}
public void logDependencyStatus(ComponentConnector connector) {