1 files changed, 7 insertions, 12 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
index 2cb1b1fcd0..24683b0c9c 100644
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
@@ -162,7 +162,7 @@ public class ApplicationConnection {
 
     private Set<VPaintableWidget> zeroHeightComponents = null;
 
-    private final MeasureManager measureManager = new MeasureManager();
+    private final LayoutManager layoutManager = new LayoutManager(this);
 
     public ApplicationConnection() {
         view = GWT.create(VViewPaintable.class);
@@ -1594,16 +1594,7 @@ public class ApplicationConnection {
     public void forceLayout() {
         Duration duration = new Duration();
 
-        VPaintableMap paintableMap = getPaintableMap();
-        VPaintableWidget[] paintableWidgets = paintableMap
-                .getRegisteredPaintableWidgets();
-        for (VPaintableWidget vPaintableWidget : paintableWidgets) {
-            MeasuredSize measuredSize = vPaintableWidget.getMeasuredSize();
-            measuredSize.setHeightNeedsUpdate();
-            measuredSize.setWidthNeedsUpdate();
-        }
-
-        doLayout(false);
+        layoutManager.foceLayout();
 
         VConsole.log("forceLayout in " + duration.elapsedMillis() + " ms");
     }
@@ -2015,7 +2006,7 @@ public class ApplicationConnection {
         public void execute() {
             layoutScheduled = false;
 
-            measureManager.doLayout(ApplicationConnection.this);
+            layoutManager.doLayout();
         }
     };
 
@@ -2027,4 +2018,8 @@ public class ApplicationConnection {
             Scheduler.get().scheduleDeferred(layoutCommand);
         }
     }
+
+    LayoutManager getLayoutManager() {
+        return layoutManager;
+    }
 }