From: Leif Åstrand <leif@vaadin.com>
Date: Wed, 4 Apr 2012 15:23:09 +0000 (+0300)
Subject: Merge branch 'master' into layoutgraph_merged
X-Git-Tag: 7.0.0.alpha2~65^2~21
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=14746d4903b7785837d4eba60311610c32748512;p=vaadin-framework.git

Merge branch 'master' into layoutgraph_merged

Conflicts:
	src/com/vaadin/terminal/gwt/client/ui/AccordionConnector.java
	src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java
	src/com/vaadin/terminal/gwt/client/ui/RootConnector.java
	src/com/vaadin/terminal/gwt/client/ui/TabsheetConnector.java
---

14746d4903b7785837d4eba60311610c32748512
diff --cc src/com/vaadin/terminal/gwt/client/ui/AccordionConnector.java
index 488b07b4c1,e54f078a94..454e698ef1
--- a/src/com/vaadin/terminal/gwt/client/ui/AccordionConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/AccordionConnector.java
@@@ -11,10 -11,11 +11,12 @@@ import com.vaadin.terminal.gwt.client.A
  import com.vaadin.terminal.gwt.client.ComponentConnector;
  import com.vaadin.terminal.gwt.client.UIDL;
  import com.vaadin.terminal.gwt.client.ui.VAccordion.StackItem;
 +import com.vaadin.terminal.gwt.client.ui.layout.RequiresOverflowAutoFix;
+ import com.vaadin.ui.Accordion;
  
+ @Component(Accordion.class)
  public class AccordionConnector extends TabsheetBaseConnector implements
 -        SimpleManagedLayout {
 +        SimpleManagedLayout, RequiresOverflowAutoFix {
  
      @Override
      public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
diff --cc src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java
index 03e30071a3,4dc4098c14..3d0b97a5b7
--- a/src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java
@@@ -15,12 -15,13 +15,14 @@@ import com.vaadin.terminal.gwt.client.C
  import com.vaadin.terminal.gwt.client.LayoutManager;
  import com.vaadin.terminal.gwt.client.MouseEventDetails;
  import com.vaadin.terminal.gwt.client.UIDL;
 -import com.vaadin.terminal.gwt.client.Util;
  import com.vaadin.terminal.gwt.client.communication.ServerRpc;
 +import com.vaadin.terminal.gwt.client.ui.layout.RequiresOverflowAutoFix;
+ import com.vaadin.ui.Panel;
  
+ @Component(Panel.class)
  public class PanelConnector extends AbstractComponentContainerConnector
 -        implements SimpleManagedLayout, PostLayoutListener {
 +        implements SimpleManagedLayout, PostLayoutListener,
 +        RequiresOverflowAutoFix {
  
      public interface PanelServerRPC extends ClickRPC, ServerRpc {
  
diff --cc src/com/vaadin/terminal/gwt/client/ui/RootConnector.java
index bfab87f90f,7db14d73f0..8a8dcec3a1
--- a/src/com/vaadin/terminal/gwt/client/ui/RootConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/RootConnector.java
@@@ -31,10 -32,11 +31,13 @@@ import com.vaadin.terminal.gwt.client.V
  import com.vaadin.terminal.gwt.client.communication.ServerRpc;
  import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
  import com.vaadin.terminal.gwt.client.communication.StateChangeEvent.StateChangeHandler;
 +import com.vaadin.terminal.gwt.client.ui.layout.RequiresOverflowAutoFix;
+ import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
+ import com.vaadin.ui.Root;
  
+ @Component(value = Root.class, loadStyle = LoadStyle.EAGER)
 -public class RootConnector extends AbstractComponentContainerConnector {
 +public class RootConnector extends AbstractComponentContainerConnector
 +        implements RequiresOverflowAutoFix {
  
      public interface RootServerRPC extends ClickRPC, ServerRpc {
  
diff --cc src/com/vaadin/terminal/gwt/client/ui/TabsheetConnector.java
index dc6793a0be,297bb06400..527b3fa847
--- a/src/com/vaadin/terminal/gwt/client/ui/TabsheetConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/TabsheetConnector.java
@@@ -9,10 -9,11 +9,12 @@@ import com.google.gwt.user.client.ui.Wi
  import com.vaadin.terminal.gwt.client.ApplicationConnection;
  import com.vaadin.terminal.gwt.client.ComponentConnector;
  import com.vaadin.terminal.gwt.client.UIDL;
 +import com.vaadin.terminal.gwt.client.ui.layout.RequiresOverflowAutoFix;
+ import com.vaadin.ui.TabSheet;
  
+ @Component(TabSheet.class)
  public class TabsheetConnector extends TabsheetBaseConnector implements
 -        SimpleManagedLayout {
 +        SimpleManagedLayout, RequiresOverflowAutoFix {
  
      @Override
      public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
diff --cc src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java
index c61ae93d86,8c824b89a9..58eadf41d5
--- a/src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java
@@@ -23,11 -23,12 +23,12 @@@ import com.vaadin.terminal.gwt.client.U
  import com.vaadin.terminal.gwt.client.communication.ServerRpc;
  import com.vaadin.terminal.gwt.client.ui.PanelConnector.PanelState;
  import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.BeforeShortcutActionListener;
 +import com.vaadin.terminal.gwt.client.ui.layout.RequiresOverflowAutoFix;
  
+ @Component(value = com.vaadin.ui.Window.class)
  public class WindowConnector extends AbstractComponentContainerConnector
          implements BeforeShortcutActionListener, SimpleManagedLayout,
 -        PostLayoutListener {
 +        PostLayoutListener, RequiresOverflowAutoFix {
  
      public interface WindowServerRPC extends ClickRPC, ServerRpc {
      }