]> source.dussan.org Git - vaadin-framework.git/commitdiff
Merge branch 'master' into layoutgraph_merged
authorLeif Åstrand <leif@vaadin.com>
Wed, 4 Apr 2012 15:23:09 +0000 (18:23 +0300)
committerLeif Åstrand <leif@vaadin.com>
Wed, 4 Apr 2012 15:23:09 +0000 (18:23 +0300)
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

1  2 
src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
src/com/vaadin/terminal/gwt/client/ui/AbsoluteLayoutConnector.java
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
src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java

index 488b07b4c1e1a167646ff7b34dc43c658efed3f1,e54f078a9420fe06d2e1bdd09aada9abaae2d8db..454e698ef1dcd93ba800de4d0b59bf065c0dab1c
@@@ -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) {
index 03e30071a3d3b43f6231a74bb497a9aabf3e76b5,4dc4098c14f335cc49c8bb6b5e2f3548ed030c4a..3d0b97a5b7865510d8221454a1d3307084bb50f5
@@@ -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 {
  
index bfab87f90f1b938632cb579b10081ad93f1654ec,7db14d73f01a956e6010ebcb72dc91237ab157fb..8a8dcec3a1eb32003ff6573a0fe658548f17b7a0
@@@ -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;
  
 -public class RootConnector extends AbstractComponentContainerConnector {
+ @Component(value = Root.class, loadStyle = LoadStyle.EAGER)
 +public class RootConnector extends AbstractComponentContainerConnector
 +        implements RequiresOverflowAutoFix {
  
      public interface RootServerRPC extends ClickRPC, ServerRpc {
  
index dc6793a0be06fdc42955a7f9a22d0d10052ff7cc,297bb0640032ad4a547fd9957a90dd80f165209b..527b3fa8473251aec56945119c7f9636cb525a31
@@@ -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) {
index c61ae93d8631e8300da4a243bde2b762f05f2de2,8c824b89a97ce8566741402672d6537acc790bec..58eadf41d5ae66bf1b5ee949771e724f03d3dd22
@@@ -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 {
      }