From: Leif Åstrand <leif@vaadin.com>
Date: Tue, 17 Apr 2012 11:18:05 +0000 (+0300)
Subject: Merge remote branch 'origin/master' into layoutgraph
X-Git-Tag: 7.0.0.beta1~273
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a5f128853ac604983270175b0a5c971f5d951a5d;p=vaadin-framework.git

Merge remote branch 'origin/master' into layoutgraph

Conflicts:
	WebContent/VAADIN/themes/base/paintable/paintable.css
---

a5f128853ac604983270175b0a5c971f5d951a5d
diff --cc WebContent/VAADIN/themes/base/paintable/paintable.css
index c42da19e4f,36a3fe3455..fbe7275113
--- a/WebContent/VAADIN/themes/base/paintable/paintable.css
+++ b/WebContent/VAADIN/themes/base/paintable/paintable.css
@@@ -1,6 -1,4 +1,6 @@@
- .v-paintable {
+ .v-connector {
 -	box-sizing: border-box;
 +	-webkit-box-sizing: border-box;
  	-moz-box-sizing: border-box;
 -}
 +	box-sizing: border-box;
 +	text-align: left;
- }
++}
diff --cc src/com/vaadin/terminal/gwt/client/LayoutManager.java
index 22d5286714,b182429902..a40a2e841f
--- a/src/com/vaadin/terminal/gwt/client/LayoutManager.java
+++ b/src/com/vaadin/terminal/gwt/client/LayoutManager.java
@@@ -718,9 -718,9 +738,9 @@@ public class LayoutManager 
          }
      }
  
 -    private void stopMeasuringIfUnecessary(Element element) {
 +    private void stopMeasuringIfUnnecessary(Element element) {
          if (!needsMeasure(element)) {
-             measuredNonPaintableElements.remove(element);
+             measuredNonConnectorElements.remove(element);
              setMeasuredSize(element, null);
          }
      }
diff --cc src/com/vaadin/terminal/gwt/client/ui/HorizontalBoxLayoutConnector.java
index bdd856537b,0000000000..20d9ca9d30
mode 100644,000000..100644
--- a/src/com/vaadin/terminal/gwt/client/ui/HorizontalBoxLayoutConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/HorizontalBoxLayoutConnector.java
@@@ -1,26 -1,0 +1,26 @@@
 +package com.vaadin.terminal.gwt.client.ui;
 +
 +import com.vaadin.terminal.gwt.client.ApplicationConnection;
 +import com.vaadin.terminal.gwt.client.UIDL;
- import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
++import com.vaadin.terminal.gwt.client.ui.Connect.LoadStyle;
 +import com.vaadin.ui.HorizontalLayout;
 +
- @Component(value = HorizontalLayout.class, loadStyle = LoadStyle.EAGER)
++@Connect(value = HorizontalLayout.class, loadStyle = LoadStyle.EAGER)
 +public class HorizontalBoxLayoutConnector extends AbstractBoxLayoutConnector {
 +
 +    @Override
 +    public void init() {
 +        super.init();
 +        getWidget().setVertical(false);
 +    }
 +
 +    @Override
 +    public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
 +        // TODO remove when Vaadin style name handling is improved so that it
 +        // won't override extra client side style names
 +        getWidget().setVertical(false);
 +        super.updateFromUIDL(uidl, client);
 +        getWidget().setVertical(false);
 +    }
 +
 +}
diff --cc src/com/vaadin/terminal/gwt/client/ui/VerticalBoxLayoutConnector.java
index 80100fc0c7,0000000000..369afb9e2f
mode 100644,000000..100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VerticalBoxLayoutConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VerticalBoxLayoutConnector.java
@@@ -1,26 -1,0 +1,26 @@@
 +package com.vaadin.terminal.gwt.client.ui;
 +
 +import com.vaadin.terminal.gwt.client.ApplicationConnection;
 +import com.vaadin.terminal.gwt.client.UIDL;
- import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
++import com.vaadin.terminal.gwt.client.ui.Connect.LoadStyle;
 +import com.vaadin.ui.VerticalLayout;
 +
- @Component(value = VerticalLayout.class, loadStyle = LoadStyle.EAGER)
++@Connect(value = VerticalLayout.class, loadStyle = LoadStyle.EAGER)
 +public class VerticalBoxLayoutConnector extends AbstractBoxLayoutConnector {
 +
 +    @Override
 +    public void init() {
 +        super.init();
 +        getWidget().setVertical(true);
 +    }
 +
 +    @Override
 +    public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
 +        // TODO fix when Vaadin style name handling is improved so that it won't
 +        // override extra client side style names
 +        getWidget().setVertical(true);
 +        super.updateFromUIDL(uidl, client);
 +        getWidget().setVertical(true);
 +    }
 +
 +}