From: Leif Åstrand <leif@vaadin.com>
Date: Thu, 5 Apr 2012 06:03:35 +0000 (+0300)
Subject: Merge branch 'master' into layoutgraph
X-Git-Tag: 7.0.0.alpha2~65^2~20
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=30cfcbe674dcf7a99089794b7c32cc0255f6e2d9;p=vaadin-framework.git

Merge branch 'master' into layoutgraph

Conflicts:
	src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java
	src/com/vaadin/terminal/gwt/client/ui/AbstractSplitPanelConnector.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/WindowConnector.java
---

30cfcbe674dcf7a99089794b7c32cc0255f6e2d9
diff --cc src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java
index d98f10c419,188b66e10f..f6273d2694
--- a/src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java
@@@ -5,9 -5,7 +5,8 @@@ package com.vaadin.terminal.gwt.client.
  
  import java.util.List;
  
- import com.google.gwt.core.client.GWT;
  import com.google.gwt.dom.client.Style;
 +import com.google.gwt.dom.client.Style.Unit;
  import com.google.gwt.user.client.Element;
  import com.google.gwt.user.client.ui.Widget;
  import com.vaadin.terminal.gwt.client.ApplicationConnection;
diff --cc src/com/vaadin/terminal/gwt/client/ui/AbstractSplitPanelConnector.java
index 48096f8218,3942cc2471..823d05d50b
--- a/src/com/vaadin/terminal/gwt/client/ui/AbstractSplitPanelConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/AbstractSplitPanelConnector.java
@@@ -17,9 -16,9 +16,10 @@@ import com.google.gwt.user.client.ui.Wi
  import com.vaadin.terminal.gwt.client.ComponentConnector;
  import com.vaadin.terminal.gwt.client.ComponentState;
  import com.vaadin.terminal.gwt.client.Connector;
- import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangedEvent;
 +import com.vaadin.terminal.gwt.client.LayoutManager;
+ import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent;
  import com.vaadin.terminal.gwt.client.MouseEventDetails;
+ import com.vaadin.terminal.gwt.client.communication.RpcProxy;
  import com.vaadin.terminal.gwt.client.communication.ServerRpc;
  import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
  import com.vaadin.terminal.gwt.client.ui.VAbstractSplitPanel.SplitterMoveHandler;
diff --cc src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java
index 3d0b97a5b7,19470da73a..65a8f8d5b5
--- a/src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java
@@@ -11,18 -11,19 +11,21 @@@ 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.ComponentState;
- import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangedEvent;
+ import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent;
  import com.vaadin.terminal.gwt.client.LayoutManager;
  import com.vaadin.terminal.gwt.client.MouseEventDetails;
+ import com.vaadin.terminal.gwt.client.Paintable;
  import com.vaadin.terminal.gwt.client.UIDL;
+ import com.vaadin.terminal.gwt.client.Util;
+ import com.vaadin.terminal.gwt.client.communication.RpcProxy;
  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 Paintable, SimpleManagedLayout, PostLayoutListener {
++        implements Paintable, SimpleManagedLayout, PostLayoutListener,
 +        RequiresOverflowAutoFix {
  
      public interface PanelServerRPC extends ClickRPC, ServerRpc {
  
diff --cc src/com/vaadin/terminal/gwt/client/ui/RootConnector.java
index 8a8dcec3a1,392230aa7f..c433afcc37
--- a/src/com/vaadin/terminal/gwt/client/ui/RootConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/RootConnector.java
@@@ -26,8 -26,11 +26,10 @@@ import com.vaadin.terminal.gwt.client.C
  import com.vaadin.terminal.gwt.client.ConnectorMap;
  import com.vaadin.terminal.gwt.client.Focusable;
  import com.vaadin.terminal.gwt.client.MouseEventDetails;
+ import com.vaadin.terminal.gwt.client.Paintable;
  import com.vaadin.terminal.gwt.client.UIDL;
 -import com.vaadin.terminal.gwt.client.Util;
  import com.vaadin.terminal.gwt.client.VConsole;
+ import com.vaadin.terminal.gwt.client.communication.RpcProxy;
  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;
@@@ -37,7 -39,7 +39,7 @@@ import com.vaadin.ui.Root
  
  @Component(value = Root.class, loadStyle = LoadStyle.EAGER)
  public class RootConnector extends AbstractComponentContainerConnector
-         implements RequiresOverflowAutoFix {
 -        implements Paintable {
++        implements Paintable, RequiresOverflowAutoFix {
  
      public interface RootServerRPC extends ClickRPC, ServerRpc {
  
diff --cc src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java
index 58eadf41d5,7c50b0f34f..7c80a37a84
--- a/src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java
@@@ -27,8 -28,8 +29,8 @@@ import com.vaadin.terminal.gwt.client.u
  
  @Component(value = com.vaadin.ui.Window.class)
  public class WindowConnector extends AbstractComponentContainerConnector
-         implements BeforeShortcutActionListener, SimpleManagedLayout,
 -        implements Paintable, BeforeShortcutActionListener,
 -        SimpleManagedLayout, PostLayoutListener {
++        implements Paintable, BeforeShortcutActionListener, SimpleManagedLayout,
 +        PostLayoutListener, RequiresOverflowAutoFix {
  
      public interface WindowServerRPC extends ClickRPC, ServerRpc {
      }