Fixed BoxLayout after master merge. Fixed on bug related to relative width slot.

3 files changed, 10 insertions, 5 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/LayoutManager.java b/src/com/vaadin/terminal/gwt/client/LayoutManager.java
index 79a0030140..a3cad5657b 100644
--- a/src/com/vaadin/terminal/gwt/client/LayoutManager.java
+++ b/src/com/vaadin/terminal/gwt/client/LayoutManager.java
@@ -220,6 +220,7 @@ public class LayoutManager {
         Map<ManagedLayout, Integer> layoutCounts = new HashMap<ManagedLayout, Integer>();
 
         int passes = 0;
+        Duration totalDuration = new Duration();
 
         for (ManagedLayout layout : needsHorizontalLayout) {
             currentDependencyTree.setNeedsHorizontalLayout(layout, true);
diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractBoxLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractBoxLayoutConnector.java
index ab0168b39b..09988a33a2 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/AbstractBoxLayoutConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/AbstractBoxLayoutConnector.java
@@ -26,14 +26,14 @@ import com.vaadin.terminal.gwt.client.ui.VBoxLayout.CaptionPosition;
 import com.vaadin.terminal.gwt.client.ui.VBoxLayout.Slot;
 import com.vaadin.terminal.gwt.client.ui.layout.ElementResizeEvent;
 import com.vaadin.terminal.gwt.client.ui.layout.ElementResizeListener;
-import com.vaadin.terminal.gwt.client.ui.orderedlayout.AbstractOrderedLayoutServerRPC;
+import com.vaadin.terminal.gwt.client.ui.orderedlayout.AbstractOrderedLayoutServerRpc;
 import com.vaadin.terminal.gwt.client.ui.orderedlayout.AbstractOrderedLayoutState;
 
 public abstract class AbstractBoxLayoutConnector extends
         AbstractLayoutConnector implements Paintable, /* PreLayoutListener, */
 PostLayoutListener {
 
-    AbstractOrderedLayoutServerRPC rpc;
+    AbstractOrderedLayoutServerRpc rpc;
 
     private LayoutClickEventHandler clickEventHandler = new LayoutClickEventHandler(
             this) {
@@ -45,7 +45,7 @@ PostLayoutListener {
         }
 
         @Override
-        protected LayoutClickRPC getLayoutClickRPC() {
+        protected LayoutClickRpc getLayoutClickRPC() {
             return rpc;
         };
 
@@ -53,7 +53,7 @@ PostLayoutListener {
 
     @Override
     public void init() {
-        rpc = RpcProxy.create(AbstractOrderedLayoutServerRPC.class, this);
+        rpc = RpcProxy.create(AbstractOrderedLayoutServerRpc.class, this);
         getWidget().setLayoutManager(getLayoutManager());
     }
 
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VBoxLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VBoxLayout.java
index e2f09d354e..3a6beaa48a 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VBoxLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VBoxLayout.java
@@ -368,7 +368,11 @@ public class VBoxLayout extends FlowPanel {
                                 .getProperty(direction));
                 captionWrap.addClassName("v-has-" + direction);
             } else if (hasCaption()) {
-                captionWrap.getStyle().clearHeight();
+                if (direction.equals("height")) {
+                    captionWrap.getStyle().clearHeight();
+                } else {
+                    captionWrap.getStyle().clearWidth();
+                }
                 captionWrap.removeClassName("v-has-" + direction);
                 captionWrap.getStyle().clearPaddingTop();
                 captionWrap.getStyle().clearPaddingRight();