]> source.dussan.org Git - vaadin-framework.git/commitdiff
Move SharedState and ServerRpc classes out from Connector classes
authorArtur Signell <artur@vaadin.com>
Wed, 11 Apr 2012 17:07:00 +0000 (20:07 +0300)
committerArtur Signell <artur@vaadin.com>
Thu, 12 Apr 2012 06:58:22 +0000 (09:58 +0300)
49 files changed:
src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java
src/com/vaadin/terminal/gwt/client/ui/AbstractComponentContainerConnector.java
src/com/vaadin/terminal/gwt/client/ui/AbstractLayoutConnector.java
src/com/vaadin/terminal/gwt/client/ui/AbstractLayoutState.java [new file with mode: 0644]
src/com/vaadin/terminal/gwt/client/ui/ClickRPC.java [new file with mode: 0644]
src/com/vaadin/terminal/gwt/client/ui/LayoutClickEventHandler.java
src/com/vaadin/terminal/gwt/client/ui/LayoutClickRPC.java [new file with mode: 0644]
src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutConnector.java
src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutServerRPC.java
src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutState.java
src/com/vaadin/terminal/gwt/client/ui/button/ButtonConnector.java
src/com/vaadin/terminal/gwt/client/ui/button/ButtonServerRpc.java [new file with mode: 0644]
src/com/vaadin/terminal/gwt/client/ui/button/VButton.java
src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutConnector.java
src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutServerRPC.java [new file with mode: 0644]
src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutState.java [new file with mode: 0644]
src/com/vaadin/terminal/gwt/client/ui/customlayout/CustomLayoutConnector.java
src/com/vaadin/terminal/gwt/client/ui/customlayout/CustomLayoutState.java [new file with mode: 0644]
src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java
src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedServerRPC.java [new file with mode: 0644]
src/com/vaadin/terminal/gwt/client/ui/formlayout/FormLayoutConnector.java
src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutConnector.java
src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutServerRPC.java [new file with mode: 0644]
src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutState.java [new file with mode: 0644]
src/com/vaadin/terminal/gwt/client/ui/nativebutton/NativeButtonConnector.java
src/com/vaadin/terminal/gwt/client/ui/nativebutton/VNativeButton.java
src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutServerRPC.java [new file with mode: 0644]
src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutState.java [new file with mode: 0644]
src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java
src/com/vaadin/terminal/gwt/client/ui/panel/PanelServerRPC.java [new file with mode: 0644]
src/com/vaadin/terminal/gwt/client/ui/panel/PanelState.java [new file with mode: 0644]
src/com/vaadin/terminal/gwt/client/ui/root/RootServerRPC.java
src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelConnector.java
src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelRPC.java [new file with mode: 0644]
src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelState.java [new file with mode: 0644]
src/com/vaadin/terminal/gwt/client/ui/window/WindowConnector.java
src/com/vaadin/terminal/gwt/client/ui/window/WindowServerRPC.java [new file with mode: 0644]
src/com/vaadin/terminal/gwt/client/ui/window/WindowState.java [new file with mode: 0644]
src/com/vaadin/ui/AbstractLayout.java
src/com/vaadin/ui/AbstractOrderedLayout.java
src/com/vaadin/ui/AbstractSplitPanel.java
src/com/vaadin/ui/Button.java
src/com/vaadin/ui/CssLayout.java
src/com/vaadin/ui/CustomLayout.java
src/com/vaadin/ui/Embedded.java
src/com/vaadin/ui/GridLayout.java
src/com/vaadin/ui/Panel.java
src/com/vaadin/ui/Window.java

index 57ee8a0bce3560c16d8f09618b863190a89606a4..f5f177b5d100e2d848ecab46ab96468e2481f7c4 100644 (file)
@@ -14,12 +14,10 @@ import com.vaadin.terminal.gwt.client.ComponentContainerConnector;
 import com.vaadin.terminal.gwt.client.ComponentState;
 import com.vaadin.terminal.gwt.client.ConnectorMap;
 import com.vaadin.terminal.gwt.client.LayoutManager;
-import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.TooltipInfo;
 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.ServerRpc;
 import com.vaadin.terminal.gwt.client.communication.SharedState;
 import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
 import com.vaadin.terminal.gwt.client.ui.root.RootConnector;
@@ -27,17 +25,6 @@ import com.vaadin.terminal.gwt.client.ui.root.RootConnector;
 public abstract class AbstractComponentConnector extends AbstractConnector
         implements ComponentConnector {
 
-    public interface ClickRPC extends ServerRpc {
-        /**
-         * Called when a click event has occurred and there are server side
-         * listeners for the event.
-         * 
-         * @param mouseDetails
-         *            Details about the mouse when the event took place
-         */
-        public void click(MouseEventDetails mouseDetails);
-    }
-
     private ComponentContainerConnector parent;
 
     private Widget widget;
index acf525bffba8cce0b663d2e24318b5da7cc8288f..d6ffc0f0915e605d752384169fbf9d2d03e87500 100644 (file)
@@ -9,32 +9,15 @@ import java.util.List;
 import com.google.gwt.event.shared.HandlerRegistration;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
 import com.vaadin.terminal.gwt.client.ComponentContainerConnector;
-import com.vaadin.terminal.gwt.client.Connector;
 import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent;
 import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent.ConnectorHierarchyChangeHandler;
-import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.VConsole;
-import com.vaadin.terminal.gwt.client.communication.ServerRpc;
 
 public abstract class AbstractComponentContainerConnector extends
         AbstractComponentConnector implements ComponentContainerConnector,
         ConnectorHierarchyChangeHandler {
 
-    public interface LayoutClickRPC extends ServerRpc {
-        /**
-         * Called when a layout click event has occurred and there are server
-         * side listeners for the event.
-         * 
-         * @param mouseDetails
-         *            Details about the mouse when the event took place
-         * @param clickedConnector
-         *            The child component that was the target of the event
-         */
-        public void layoutClick(MouseEventDetails mouseDetails,
-                Connector clickedConnector);
-    }
-
     List<ComponentConnector> children;
 
     private final boolean debugLogging = false;
index c33a913df98250676e1dfcc64c42efde13b3dc23..ec9d60d0a0f9a4d38d0fd2cc1ce28891f50e2d05 100644 (file)
@@ -3,24 +3,10 @@
  */
 package com.vaadin.terminal.gwt.client.ui;
 
-import com.vaadin.terminal.gwt.client.ComponentState;
 
 public abstract class AbstractLayoutConnector extends
         AbstractComponentContainerConnector {
 
-    public static class AbstractLayoutState extends ComponentState {
-        private int marginsBitmask;
-
-        public int getMarginsBitmask() {
-            return marginsBitmask;
-        }
-
-        public void setMarginsBitmask(int marginsBitmask) {
-            this.marginsBitmask = marginsBitmask;
-        }
-
-    }
-
     @Override
     public AbstractLayoutState getState() {
         return (AbstractLayoutState) super.getState();
diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractLayoutState.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractLayoutState.java
new file mode 100644 (file)
index 0000000..de917fc
--- /dev/null
@@ -0,0 +1,16 @@
+package com.vaadin.terminal.gwt.client.ui;
+
+import com.vaadin.terminal.gwt.client.ComponentState;
+
+public class AbstractLayoutState extends ComponentState {
+    private int marginsBitmask;
+
+    public int getMarginsBitmask() {
+        return marginsBitmask;
+    }
+
+    public void setMarginsBitmask(int marginsBitmask) {
+        this.marginsBitmask = marginsBitmask;
+    }
+
+}
\ No newline at end of file
diff --git a/src/com/vaadin/terminal/gwt/client/ui/ClickRPC.java b/src/com/vaadin/terminal/gwt/client/ui/ClickRPC.java
new file mode 100644 (file)
index 0000000..5a18f26
--- /dev/null
@@ -0,0 +1,15 @@
+package com.vaadin.terminal.gwt.client.ui;
+
+import com.vaadin.terminal.gwt.client.MouseEventDetails;
+import com.vaadin.terminal.gwt.client.communication.ServerRpc;
+
+public interface ClickRPC extends ServerRpc {
+    /**
+     * Called when a click event has occurred and there are server side
+     * listeners for the event.
+     * 
+     * @param mouseDetails
+     *            Details about the mouse when the event took place
+     */
+    public void click(MouseEventDetails mouseDetails);
+}
\ No newline at end of file
index 4686a4205b440ffe30aa061d1b9a5a03ade88356..09caa9ad82814fdaeff699186ff1ad5a18326ec7 100644 (file)
@@ -8,7 +8,6 @@ import com.google.gwt.user.client.Element;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.MouseEventDetailsBuilder;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector.LayoutClickRPC;
 
 public abstract class LayoutClickEventHandler extends AbstractClickEventHandler {
 
diff --git a/src/com/vaadin/terminal/gwt/client/ui/LayoutClickRPC.java b/src/com/vaadin/terminal/gwt/client/ui/LayoutClickRPC.java
new file mode 100644 (file)
index 0000000..2956edb
--- /dev/null
@@ -0,0 +1,19 @@
+package com.vaadin.terminal.gwt.client.ui;
+
+import com.vaadin.terminal.gwt.client.Connector;
+import com.vaadin.terminal.gwt.client.MouseEventDetails;
+import com.vaadin.terminal.gwt.client.communication.ServerRpc;
+
+public interface LayoutClickRPC extends ServerRpc {
+    /**
+     * Called when a layout click event has occurred and there are server
+     * side listeners for the event.
+     * 
+     * @param mouseDetails
+     *            Details about the mouse when the event took place
+     * @param clickedConnector
+     *            The child component that was the target of the event
+     */
+    public void layoutClick(MouseEventDetails mouseDetails,
+            Connector clickedConnector);
+}
\ No newline at end of file
index d4cf189d7a177ebf4f8c5b2765da669e287406f6..a893657c4082257134f0e7bc6cc3855424acb444 100644 (file)
@@ -21,6 +21,7 @@ import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
 import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector;
 import com.vaadin.terminal.gwt.client.ui.Component;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
+import com.vaadin.terminal.gwt.client.ui.LayoutClickRPC;
 import com.vaadin.terminal.gwt.client.ui.absolutelayout.VAbsoluteLayout.AbsoluteWrapper;
 import com.vaadin.ui.AbsoluteLayout;
 
index 4dea26ddc9a91285e9683c7ad07df41c476036cf..d8b7ee2e9a89ffdc27cc7ab754ae2a4bbe4573d5 100644 (file)
@@ -1,7 +1,7 @@
 package com.vaadin.terminal.gwt.client.ui.absolutelayout;
 
 import com.vaadin.terminal.gwt.client.communication.ServerRpc;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector.LayoutClickRPC;
+import com.vaadin.terminal.gwt.client.ui.LayoutClickRPC;
 
 public interface AbsoluteLayoutServerRPC extends LayoutClickRPC, ServerRpc {
 
index 6dd2bcd28f0efce23ed52ae1028752116f3ad0a1..1ba919fdfe42dd79ec3233abe3b867219aad7f45 100644 (file)
@@ -4,7 +4,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.vaadin.terminal.gwt.client.Connector;
-import com.vaadin.terminal.gwt.client.ui.AbstractLayoutConnector.AbstractLayoutState;
+import com.vaadin.terminal.gwt.client.ui.AbstractLayoutState;
 
 public class AbsoluteLayoutState extends AbstractLayoutState {
     // Maps each component to a position
index 3c506571bd8d65f0b198ffdc86d6224e3bb35bc5..1a93859429ecc2c8e33d19234f20ef9eb89e82b4 100644 (file)
@@ -13,10 +13,8 @@ import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.EventHelper;
-import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.communication.FieldRpc.FocusAndBlurServerRpc;
 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.AbstractComponentConnector;
 import com.vaadin.terminal.gwt.client.ui.Component;
@@ -28,27 +26,6 @@ import com.vaadin.ui.Button;
 public class ButtonConnector extends AbstractComponentConnector implements
         BlurHandler, FocusHandler {
 
-    /**
-     * RPC interface for calls from client to server.
-     * 
-     * @since 7.0
-     */
-    public interface ButtonServerRpc extends ServerRpc {
-        /**
-         * Button click event.
-         * 
-         * @param mouseEventDetails
-         *            serialized mouse event details
-         */
-        public void click(MouseEventDetails mouseEventDetails);
-
-        /**
-         * Indicate to the server that the client has disabled the button as a
-         * result of a click.
-         */
-        public void disableOnClick();
-    }
-
     private ButtonServerRpc rpc = RpcProxy.create(ButtonServerRpc.class, this);
     private FocusAndBlurServerRpc focusBlurProxy = RpcProxy.create(
             FocusAndBlurServerRpc.class, this);
diff --git a/src/com/vaadin/terminal/gwt/client/ui/button/ButtonServerRpc.java b/src/com/vaadin/terminal/gwt/client/ui/button/ButtonServerRpc.java
new file mode 100644 (file)
index 0000000..956a967
--- /dev/null
@@ -0,0 +1,25 @@
+package com.vaadin.terminal.gwt.client.ui.button;
+
+import com.vaadin.terminal.gwt.client.MouseEventDetails;
+import com.vaadin.terminal.gwt.client.communication.ServerRpc;
+
+/**
+ * RPC interface for calls from client to server.
+ * 
+ * @since 7.0
+ */
+public interface ButtonServerRpc extends ServerRpc {
+    /**
+     * Button click event.
+     * 
+     * @param mouseEventDetails
+     *            serialized mouse event details
+     */
+    public void click(MouseEventDetails mouseEventDetails);
+
+    /**
+     * Indicate to the server that the client has disabled the button as a
+     * result of a click.
+     */
+    public void disableOnClick();
+}
\ No newline at end of file
index 71581f5a63bf14781ca0d57c743caf8d46bfd513..f42e36839d7458d6f63b529cce28bcea29e32ec4 100644 (file)
@@ -21,7 +21,6 @@ import com.vaadin.terminal.gwt.client.MouseEventDetailsBuilder;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.VTooltip;
 import com.vaadin.terminal.gwt.client.ui.Icon;
-import com.vaadin.terminal.gwt.client.ui.button.ButtonConnector.ButtonServerRpc;
 
 public class VButton extends FocusWidget implements ClickHandler {
 
index 064a05d367e0016e53cd9a64e8292659a29923fc..3d20e01b4b54c87a27b955c5e6bac6f3f02a4764 100644 (file)
@@ -12,16 +12,15 @@ import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.BrowserInfo;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.Connector;
 import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.VCaption;
 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.AbstractLayoutConnector;
 import com.vaadin.terminal.gwt.client.ui.Component;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
+import com.vaadin.terminal.gwt.client.ui.LayoutClickRPC;
 import com.vaadin.terminal.gwt.client.ui.VMarginInfo;
 import com.vaadin.terminal.gwt.client.ui.csslayout.VCssLayout.FlowPane;
 import com.vaadin.ui.CssLayout;
@@ -29,19 +28,6 @@ import com.vaadin.ui.CssLayout;
 @Component(CssLayout.class)
 public class CssLayoutConnector extends AbstractLayoutConnector {
 
-    public static class CssLayoutState extends AbstractLayoutState {
-        private Map<Connector, String> childCss = new HashMap<Connector, String>();
-
-        public Map<Connector, String> getChildCss() {
-            return childCss;
-        }
-
-        public void setChildCss(Map<Connector, String> childCss) {
-            this.childCss = childCss;
-        }
-
-    }
-
     private LayoutClickEventHandler clickEventHandler = new LayoutClickEventHandler(
             this) {
 
@@ -57,10 +43,6 @@ public class CssLayoutConnector extends AbstractLayoutConnector {
         };
     };
 
-    public interface CssLayoutServerRPC extends LayoutClickRPC, ServerRpc {
-
-    }
-
     private CssLayoutServerRPC rpc;
 
     private Map<ComponentConnector, VCaption> childToCaption = new HashMap<ComponentConnector, VCaption>();
diff --git a/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutServerRPC.java b/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutServerRPC.java
new file mode 100644 (file)
index 0000000..a6e3c0a
--- /dev/null
@@ -0,0 +1,8 @@
+package com.vaadin.terminal.gwt.client.ui.csslayout;
+
+import com.vaadin.terminal.gwt.client.communication.ServerRpc;
+import com.vaadin.terminal.gwt.client.ui.LayoutClickRPC;
+
+public interface CssLayoutServerRPC extends LayoutClickRPC, ServerRpc {
+
+}
\ No newline at end of file
diff --git a/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutState.java b/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutState.java
new file mode 100644 (file)
index 0000000..558e56a
--- /dev/null
@@ -0,0 +1,20 @@
+package com.vaadin.terminal.gwt.client.ui.csslayout;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.vaadin.terminal.gwt.client.Connector;
+import com.vaadin.terminal.gwt.client.ui.AbstractLayoutState;
+
+public class CssLayoutState extends AbstractLayoutState {
+    private Map<Connector, String> childCss = new HashMap<Connector, String>();
+
+    public Map<Connector, String> getChildCss() {
+        return childCss;
+    }
+
+    public void setChildCss(Map<Connector, String> childCss) {
+        this.childCss = childCss;
+    }
+
+}
\ No newline at end of file
index a09efef7edd84b100540442a2b340c7e6d593519..9d34859cb787ddd48e67de2addf7217deef42d29 100644 (file)
@@ -3,14 +3,11 @@
  */
 package com.vaadin.terminal.gwt.client.ui.customlayout;
 
-import java.util.HashMap;
-import java.util.Map;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.Connector;
 import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent;
 import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
 import com.vaadin.terminal.gwt.client.ui.AbstractLayoutConnector;
@@ -22,37 +19,6 @@ import com.vaadin.ui.CustomLayout;
 public class CustomLayoutConnector extends AbstractLayoutConnector implements
         SimpleManagedLayout {
 
-    public static class CustomLayoutState extends AbstractLayoutState {
-        Map<Connector, String> childLocations = new HashMap<Connector, String>();
-        private String templateContents;
-        private String templateName;
-
-        public String getTemplateContents() {
-            return templateContents;
-        }
-
-        public void setTemplateContents(String templateContents) {
-            this.templateContents = templateContents;
-        }
-
-        public String getTemplateName() {
-            return templateName;
-        }
-
-        public void setTemplateName(String templateName) {
-            this.templateName = templateName;
-        }
-
-        public Map<Connector, String> getChildLocations() {
-            return childLocations;
-        }
-
-        public void setChildLocations(Map<Connector, String> childLocations) {
-            this.childLocations = childLocations;
-        }
-
-    }
-
     @Override
     public CustomLayoutState getState() {
         return (CustomLayoutState) super.getState();
diff --git a/src/com/vaadin/terminal/gwt/client/ui/customlayout/CustomLayoutState.java b/src/com/vaadin/terminal/gwt/client/ui/customlayout/CustomLayoutState.java
new file mode 100644 (file)
index 0000000..84a1050
--- /dev/null
@@ -0,0 +1,38 @@
+package com.vaadin.terminal.gwt.client.ui.customlayout;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.vaadin.terminal.gwt.client.Connector;
+import com.vaadin.terminal.gwt.client.ui.AbstractLayoutState;
+
+public class CustomLayoutState extends AbstractLayoutState {
+    Map<Connector, String> childLocations = new HashMap<Connector, String>();
+    private String templateContents;
+    private String templateName;
+
+    public String getTemplateContents() {
+        return templateContents;
+    }
+
+    public void setTemplateContents(String templateContents) {
+        this.templateContents = templateContents;
+    }
+
+    public String getTemplateName() {
+        return templateName;
+    }
+
+    public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
+    public Map<Connector, String> getChildLocations() {
+        return childLocations;
+    }
+
+    public void setChildLocations(Map<Connector, String> childLocations) {
+        this.childLocations = childLocations;
+    }
+
+}
\ No newline at end of file
index 9aa0458b017f9ae23a8a27ddaac2867df206d311..1a8a54e99d3edd79c9c6cf55fcfac5409b72ce37 100644 (file)
@@ -24,7 +24,6 @@ import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.VConsole;
 import com.vaadin.terminal.gwt.client.VTooltip;
 import com.vaadin.terminal.gwt.client.communication.RpcProxy;
-import com.vaadin.terminal.gwt.client.communication.ServerRpc;
 import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
 import com.vaadin.terminal.gwt.client.ui.ClickEventHandler;
 import com.vaadin.terminal.gwt.client.ui.Component;
@@ -34,9 +33,6 @@ import com.vaadin.ui.Embedded;
 public class EmbeddedConnector extends AbstractComponentConnector implements
         Paintable {
 
-    public interface EmbeddedServerRPC extends ClickRPC, ServerRpc {
-    }
-
     public static final String ALTERNATE_TEXT = "alt";
 
     EmbeddedServerRPC rpc;
diff --git a/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedServerRPC.java b/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedServerRPC.java
new file mode 100644 (file)
index 0000000..0796300
--- /dev/null
@@ -0,0 +1,7 @@
+package com.vaadin.terminal.gwt.client.ui.embedded;
+
+import com.vaadin.terminal.gwt.client.communication.ServerRpc;
+import com.vaadin.terminal.gwt.client.ui.ClickRPC;
+
+public interface EmbeddedServerRPC extends ClickRPC, ServerRpc {
+}
\ No newline at end of file
index aa076784e1634faf6c1518b4060f636ab8339a9b..258a280ea7f8fea4b3c77797220ebfe3a615e142 100644 (file)
@@ -15,7 +15,7 @@ import com.vaadin.terminal.gwt.client.ui.VMarginInfo;
 import com.vaadin.terminal.gwt.client.ui.formlayout.VFormLayout.Caption;
 import com.vaadin.terminal.gwt.client.ui.formlayout.VFormLayout.ErrorFlag;
 import com.vaadin.terminal.gwt.client.ui.formlayout.VFormLayout.VFormLayoutTable;
-import com.vaadin.terminal.gwt.client.ui.orderedlayout.AbstractOrderedLayoutConnector.AbstractOrderedLayoutState;
+import com.vaadin.terminal.gwt.client.ui.orderedlayout.AbstractOrderedLayoutState;
 import com.vaadin.ui.FormLayout;
 
 @Component(FormLayout.class)
index c96c2f7b6349ef93be6f3f129786b98882822865..9858ed362a02adb1c7520ab343d6bda88b64e6c6 100644 (file)
@@ -17,13 +17,12 @@ import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.VCaption;
 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.AbstractComponentContainerConnector;
-import com.vaadin.terminal.gwt.client.ui.AbstractLayoutConnector.AbstractLayoutState;
 import com.vaadin.terminal.gwt.client.ui.AlignmentInfo;
 import com.vaadin.terminal.gwt.client.ui.Component;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
+import com.vaadin.terminal.gwt.client.ui.LayoutClickRPC;
 import com.vaadin.terminal.gwt.client.ui.VMarginInfo;
 import com.vaadin.terminal.gwt.client.ui.gridlayout.VGridLayout.Cell;
 import com.vaadin.terminal.gwt.client.ui.layout.VLayoutSlot;
@@ -33,37 +32,6 @@ import com.vaadin.ui.GridLayout;
 public class GridLayoutConnector extends AbstractComponentContainerConnector
         implements Paintable, DirectionalManagedLayout {
 
-    public static class GridLayoutState extends AbstractLayoutState {
-        private boolean spacing = false;
-        private int rows = 0;
-        private int columns = 0;
-
-        public boolean isSpacing() {
-            return spacing;
-        }
-
-        public void setSpacing(boolean spacing) {
-            this.spacing = spacing;
-        }
-
-        public int getRows() {
-            return rows;
-        }
-
-        public void setRows(int rows) {
-            this.rows = rows;
-        }
-
-        public int getColumns() {
-            return columns;
-        }
-
-        public void setColumns(int cols) {
-            columns = cols;
-        }
-
-    }
-
     private LayoutClickEventHandler clickEventHandler = new LayoutClickEventHandler(
             this) {
 
@@ -79,10 +47,6 @@ public class GridLayoutConnector extends AbstractComponentContainerConnector
 
     };
 
-    public interface GridLayoutServerRPC extends LayoutClickRPC, ServerRpc {
-
-    }
-
     private GridLayoutServerRPC rpc;
     private boolean needCaptionUpdate = false;
 
diff --git a/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutServerRPC.java b/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutServerRPC.java
new file mode 100644 (file)
index 0000000..f771d73
--- /dev/null
@@ -0,0 +1,8 @@
+package com.vaadin.terminal.gwt.client.ui.gridlayout;
+
+import com.vaadin.terminal.gwt.client.communication.ServerRpc;
+import com.vaadin.terminal.gwt.client.ui.LayoutClickRPC;
+
+public interface GridLayoutServerRPC extends LayoutClickRPC, ServerRpc {
+
+}
\ No newline at end of file
diff --git a/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutState.java b/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutState.java
new file mode 100644 (file)
index 0000000..ff63177
--- /dev/null
@@ -0,0 +1,34 @@
+package com.vaadin.terminal.gwt.client.ui.gridlayout;
+
+import com.vaadin.terminal.gwt.client.ui.AbstractLayoutState;
+
+public class GridLayoutState extends AbstractLayoutState {
+    private boolean spacing = false;
+    private int rows = 0;
+    private int columns = 0;
+
+    public boolean isSpacing() {
+        return spacing;
+    }
+
+    public void setSpacing(boolean spacing) {
+        this.spacing = spacing;
+    }
+
+    public int getRows() {
+        return rows;
+    }
+
+    public void setRows(int rows) {
+        this.rows = rows;
+    }
+
+    public int getColumns() {
+        return columns;
+    }
+
+    public void setColumns(int cols) {
+        columns = cols;
+    }
+
+}
\ No newline at end of file
index 93e1172369ab9ec5884cc0943cc63f6a7dee5d43..042458d701ae35dea18d1efad6083d154f34e9a8 100644 (file)
@@ -18,7 +18,7 @@ import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
 import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
 import com.vaadin.terminal.gwt.client.ui.Component;
 import com.vaadin.terminal.gwt.client.ui.Icon;
-import com.vaadin.terminal.gwt.client.ui.button.ButtonConnector.ButtonServerRpc;
+import com.vaadin.terminal.gwt.client.ui.button.ButtonServerRpc;
 import com.vaadin.terminal.gwt.client.ui.button.ButtonState;
 import com.vaadin.ui.NativeButton;
 
index cca8fc14bf6e09c269af97a6230400b40479dc4c..d0b8f73eb15f5bed2f2464203b64ffc2c8b83eb6 100644 (file)
@@ -17,7 +17,7 @@ import com.vaadin.terminal.gwt.client.MouseEventDetailsBuilder;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.VTooltip;
 import com.vaadin.terminal.gwt.client.ui.Icon;
-import com.vaadin.terminal.gwt.client.ui.button.ButtonConnector.ButtonServerRpc;
+import com.vaadin.terminal.gwt.client.ui.button.ButtonServerRpc;
 
 public class VNativeButton extends Button implements ClickHandler {
 
index f3d817b586e58350198ccaac09a46ce7104b70b1..486621fae29129194edd51def50601dfce172a29 100644 (file)
@@ -19,10 +19,10 @@ import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.VCaption;
 import com.vaadin.terminal.gwt.client.ValueMap;
 import com.vaadin.terminal.gwt.client.communication.RpcProxy;
-import com.vaadin.terminal.gwt.client.communication.ServerRpc;
 import com.vaadin.terminal.gwt.client.ui.AbstractLayoutConnector;
 import com.vaadin.terminal.gwt.client.ui.AlignmentInfo;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
+import com.vaadin.terminal.gwt.client.ui.LayoutClickRPC;
 import com.vaadin.terminal.gwt.client.ui.VMarginInfo;
 import com.vaadin.terminal.gwt.client.ui.layout.ComponentConnectorLayoutSlot;
 import com.vaadin.terminal.gwt.client.ui.layout.VLayoutSlot;
@@ -30,24 +30,6 @@ import com.vaadin.terminal.gwt.client.ui.layout.VLayoutSlot;
 public abstract class AbstractOrderedLayoutConnector extends
         AbstractLayoutConnector implements Paintable, DirectionalManagedLayout {
 
-    public static class AbstractOrderedLayoutState extends AbstractLayoutState {
-        private boolean spacing = false;
-
-        public boolean isSpacing() {
-            return spacing;
-        }
-
-        public void setSpacing(boolean spacing) {
-            this.spacing = spacing;
-        }
-
-    }
-
-    public interface AbstractOrderedLayoutServerRPC extends LayoutClickRPC,
-            ServerRpc {
-
-    }
-
     AbstractOrderedLayoutServerRPC rpc;
 
     private LayoutClickEventHandler clickEventHandler = new LayoutClickEventHandler(
diff --git a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutServerRPC.java b/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutServerRPC.java
new file mode 100644 (file)
index 0000000..0d6c5f9
--- /dev/null
@@ -0,0 +1,9 @@
+package com.vaadin.terminal.gwt.client.ui.orderedlayout;
+
+import com.vaadin.terminal.gwt.client.communication.ServerRpc;
+import com.vaadin.terminal.gwt.client.ui.LayoutClickRPC;
+
+public interface AbstractOrderedLayoutServerRPC extends LayoutClickRPC,
+        ServerRpc {
+
+}
\ No newline at end of file
diff --git a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutState.java b/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutState.java
new file mode 100644 (file)
index 0000000..26c2e0d
--- /dev/null
@@ -0,0 +1,16 @@
+package com.vaadin.terminal.gwt.client.ui.orderedlayout;
+
+import com.vaadin.terminal.gwt.client.ui.AbstractLayoutState;
+
+public class AbstractOrderedLayoutState extends AbstractLayoutState {
+    private boolean spacing = false;
+
+    public boolean isSpacing() {
+        return spacing;
+    }
+
+    public void setSpacing(boolean spacing) {
+        this.spacing = spacing;
+    }
+
+}
\ No newline at end of file
index 7f2afaeb7f9dc0a82359481a6b36f802733acfd4..5fe5c6890e447b2acaacb6719a7fcfc5f285c64a 100644 (file)
@@ -10,7 +10,6 @@ import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.user.client.ui.Widget;
 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.ConnectorHierarchyChangeEvent;
 import com.vaadin.terminal.gwt.client.LayoutManager;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
@@ -18,7 +17,6 @@ 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.AbstractComponentContainerConnector;
 import com.vaadin.terminal.gwt.client.ui.ClickEventHandler;
 import com.vaadin.terminal.gwt.client.ui.Component;
@@ -31,40 +29,6 @@ import com.vaadin.ui.Panel;
 public class PanelConnector extends AbstractComponentContainerConnector
         implements Paintable, SimpleManagedLayout, PostLayoutListener {
 
-    public interface PanelServerRPC extends ClickRPC, ServerRpc {
-
-    }
-
-    public static class PanelState extends ComponentState {
-        private int tabIndex;
-        private int scrollLeft, scrollTop;
-
-        public int getTabIndex() {
-            return tabIndex;
-        }
-
-        public void setTabIndex(int tabIndex) {
-            this.tabIndex = tabIndex;
-        }
-
-        public int getScrollLeft() {
-            return scrollLeft;
-        }
-
-        public void setScrollLeft(int scrollLeft) {
-            this.scrollLeft = scrollLeft;
-        }
-
-        public int getScrollTop() {
-            return scrollTop;
-        }
-
-        public void setScrollTop(int scrollTop) {
-            this.scrollTop = scrollTop;
-        }
-
-    }
-
     private Integer uidlScrollTop;
 
     private ClickEventHandler clickEventHandler = new ClickEventHandler(this) {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/panel/PanelServerRPC.java b/src/com/vaadin/terminal/gwt/client/ui/panel/PanelServerRPC.java
new file mode 100644 (file)
index 0000000..ad38fb1
--- /dev/null
@@ -0,0 +1,8 @@
+package com.vaadin.terminal.gwt.client.ui.panel;
+
+import com.vaadin.terminal.gwt.client.communication.ServerRpc;
+import com.vaadin.terminal.gwt.client.ui.ClickRPC;
+
+public interface PanelServerRPC extends ClickRPC, ServerRpc {
+
+}
\ No newline at end of file
diff --git a/src/com/vaadin/terminal/gwt/client/ui/panel/PanelState.java b/src/com/vaadin/terminal/gwt/client/ui/panel/PanelState.java
new file mode 100644 (file)
index 0000000..9452ad4
--- /dev/null
@@ -0,0 +1,33 @@
+package com.vaadin.terminal.gwt.client.ui.panel;
+
+import com.vaadin.terminal.gwt.client.ComponentState;
+
+public class PanelState extends ComponentState {
+    private int tabIndex;
+    private int scrollLeft, scrollTop;
+
+    public int getTabIndex() {
+        return tabIndex;
+    }
+
+    public void setTabIndex(int tabIndex) {
+        this.tabIndex = tabIndex;
+    }
+
+    public int getScrollLeft() {
+        return scrollLeft;
+    }
+
+    public void setScrollLeft(int scrollLeft) {
+        this.scrollLeft = scrollLeft;
+    }
+
+    public int getScrollTop() {
+        return scrollTop;
+    }
+
+    public void setScrollTop(int scrollTop) {
+        this.scrollTop = scrollTop;
+    }
+
+}
\ No newline at end of file
index 26cf619766675622c44b1e8c12f0c4d90eedc0d2..a02624453e7aa9fc6d3bf896e6d34f8ada4b7600 100644 (file)
@@ -1,7 +1,7 @@
 package com.vaadin.terminal.gwt.client.ui.root;
 
 import com.vaadin.terminal.gwt.client.communication.ServerRpc;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector.ClickRPC;
+import com.vaadin.terminal.gwt.client.ui.ClickRPC;
 
 public interface RootServerRPC extends ClickRPC, ServerRpc {
 
index c480e7fb703459e7efb84435381f34edf5ec2d3d..66416cf0ec50c1841658e52825413ed329754709 100644 (file)
@@ -14,122 +14,20 @@ import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.Widget;
 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.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.AbstractComponentContainerConnector;
 import com.vaadin.terminal.gwt.client.ui.ClickEventHandler;
 import com.vaadin.terminal.gwt.client.ui.SimpleManagedLayout;
+import com.vaadin.terminal.gwt.client.ui.splitpanel.AbstractSplitPanelState.SplitterState;
 import com.vaadin.terminal.gwt.client.ui.splitpanel.VAbstractSplitPanel.SplitterMoveHandler;
 import com.vaadin.terminal.gwt.client.ui.splitpanel.VAbstractSplitPanel.SplitterMoveHandler.SplitterMoveEvent;
 
 public abstract class AbstractSplitPanelConnector extends
         AbstractComponentContainerConnector implements SimpleManagedLayout {
 
-    public interface AbstractSplitPanelRPC extends ServerRpc {
-
-        /**
-         * Called when the position has been updated by the user.
-         * 
-         * @param position
-         *            The new position in % if the current unit is %, in px
-         *            otherwise
-         */
-        public void setSplitterPosition(float position);
-
-        /**
-         * Called when a click event has occurred on the splitter.
-         * 
-         * @param mouseDetails
-         *            Details about the mouse when the event took place
-         */
-        public void splitterClick(MouseEventDetails mouseDetails);
-
-    }
-
-    public static class SplitterState {
-        private float position;
-        private String positionUnit;
-        private boolean positionReversed = false;
-        private boolean locked = false;
-
-        public float getPosition() {
-            return position;
-        }
-
-        public void setPosition(float position) {
-            this.position = position;
-        }
-
-        public String getPositionUnit() {
-            return positionUnit;
-        }
-
-        public void setPositionUnit(String positionUnit) {
-            this.positionUnit = positionUnit;
-        }
-
-        public boolean isPositionReversed() {
-            return positionReversed;
-        }
-
-        public void setPositionReversed(boolean positionReversed) {
-            this.positionReversed = positionReversed;
-        }
-
-        public boolean isLocked() {
-            return locked;
-        }
-
-        public void setLocked(boolean locked) {
-            this.locked = locked;
-        }
-
-    }
-
-    public static class AbstractSplitPanelState extends ComponentState {
-        private Connector firstChild = null;
-        private Connector secondChild = null;
-        private SplitterState splitterState = new SplitterState();
-
-        public boolean hasFirstChild() {
-            return firstChild != null;
-        }
-
-        public boolean hasSecondChild() {
-            return secondChild != null;
-        }
-
-        public Connector getFirstChild() {
-            return firstChild;
-        }
-
-        public void setFirstChild(Connector firstChild) {
-            this.firstChild = firstChild;
-        }
-
-        public Connector getSecondChild() {
-            return secondChild;
-        }
-
-        public void setSecondChild(Connector secondChild) {
-            this.secondChild = secondChild;
-        }
-
-        public SplitterState getSplitterState() {
-            return splitterState;
-        }
-
-        public void setSplitterState(SplitterState splitterState) {
-            this.splitterState = splitterState;
-        }
-
-    }
-
     private AbstractSplitPanelRPC rpc;
 
     @Override
diff --git a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelRPC.java b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelRPC.java
new file mode 100644 (file)
index 0000000..e450fe4
--- /dev/null
@@ -0,0 +1,25 @@
+package com.vaadin.terminal.gwt.client.ui.splitpanel;
+
+import com.vaadin.terminal.gwt.client.MouseEventDetails;
+import com.vaadin.terminal.gwt.client.communication.ServerRpc;
+
+public interface AbstractSplitPanelRPC extends ServerRpc {
+
+    /**
+     * Called when the position has been updated by the user.
+     * 
+     * @param position
+     *            The new position in % if the current unit is %, in px
+     *            otherwise
+     */
+    public void setSplitterPosition(float position);
+
+    /**
+     * Called when a click event has occurred on the splitter.
+     * 
+     * @param mouseDetails
+     *            Details about the mouse when the event took place
+     */
+    public void splitterClick(MouseEventDetails mouseDetails);
+
+}
\ No newline at end of file
diff --git a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelState.java b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelState.java
new file mode 100644 (file)
index 0000000..0d2b47a
--- /dev/null
@@ -0,0 +1,83 @@
+package com.vaadin.terminal.gwt.client.ui.splitpanel;
+
+import com.vaadin.terminal.gwt.client.ComponentState;
+import com.vaadin.terminal.gwt.client.Connector;
+
+public class AbstractSplitPanelState extends ComponentState {
+
+    private Connector firstChild = null;
+    private Connector secondChild = null;
+    private SplitterState splitterState = new SplitterState();
+
+    public boolean hasFirstChild() {
+        return firstChild != null;
+    }
+
+    public boolean hasSecondChild() {
+        return secondChild != null;
+    }
+
+    public Connector getFirstChild() {
+        return firstChild;
+    }
+
+    public void setFirstChild(Connector firstChild) {
+        this.firstChild = firstChild;
+    }
+
+    public Connector getSecondChild() {
+        return secondChild;
+    }
+
+    public void setSecondChild(Connector secondChild) {
+        this.secondChild = secondChild;
+    }
+
+    public SplitterState getSplitterState() {
+        return splitterState;
+    }
+
+    public void setSplitterState(SplitterState splitterState) {
+        this.splitterState = splitterState;
+    }
+
+    public static class SplitterState {
+        private float position;
+        private String positionUnit;
+        private boolean positionReversed = false;
+        private boolean locked = false;
+
+        public float getPosition() {
+            return position;
+        }
+
+        public void setPosition(float position) {
+            this.position = position;
+        }
+
+        public String getPositionUnit() {
+            return positionUnit;
+        }
+
+        public void setPositionUnit(String positionUnit) {
+            this.positionUnit = positionUnit;
+        }
+
+        public boolean isPositionReversed() {
+            return positionReversed;
+        }
+
+        public void setPositionReversed(boolean positionReversed) {
+            this.positionReversed = positionReversed;
+        }
+
+        public boolean isLocked() {
+            return locked;
+        }
+
+        public void setLocked(boolean locked) {
+            this.locked = locked;
+        }
+
+    }
+}
\ No newline at end of file
index a4f1a884ec927d18e9ba74d4941c82fa19d062e2..4995441ce509f66aaa8b4ac1904e9dafb6a1d771 100644 (file)
@@ -22,7 +22,6 @@ 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.AbstractComponentContainerConnector;
 import com.vaadin.terminal.gwt.client.ui.ClickEventHandler;
 import com.vaadin.terminal.gwt.client.ui.Component;
@@ -30,83 +29,12 @@ import com.vaadin.terminal.gwt.client.ui.PostLayoutListener;
 import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler;
 import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.BeforeShortcutActionListener;
 import com.vaadin.terminal.gwt.client.ui.SimpleManagedLayout;
-import com.vaadin.terminal.gwt.client.ui.panel.PanelConnector.PanelState;
 
 @Component(value = com.vaadin.ui.Window.class)
 public class WindowConnector extends AbstractComponentContainerConnector
         implements Paintable, BeforeShortcutActionListener,
         SimpleManagedLayout, PostLayoutListener {
 
-    public interface WindowServerRPC extends ClickRPC, ServerRpc {
-    }
-
-    public static class WindowState extends PanelState {
-        private boolean modal = false;
-        private boolean resizable = true;
-        private boolean resizeLazy = false;
-        private boolean draggable = true;
-        private boolean centered = false;;
-        private int positionX = -1;
-        private int positionY = -1;
-
-        public boolean isModal() {
-            return modal;
-        }
-
-        public void setModal(boolean modal) {
-            this.modal = modal;
-        }
-
-        public boolean isResizable() {
-            return resizable;
-        }
-
-        public void setResizable(boolean resizable) {
-            this.resizable = resizable;
-        }
-
-        public boolean isResizeLazy() {
-            return resizeLazy;
-        }
-
-        public void setResizeLazy(boolean resizeLazy) {
-            this.resizeLazy = resizeLazy;
-        }
-
-        public boolean isDraggable() {
-            return draggable;
-        }
-
-        public void setDraggable(boolean draggable) {
-            this.draggable = draggable;
-        }
-
-        public boolean isCentered() {
-            return centered;
-        }
-
-        public void setCentered(boolean centered) {
-            this.centered = centered;
-        }
-
-        public int getPositionX() {
-            return positionX;
-        }
-
-        public void setPositionX(int positionX) {
-            this.positionX = positionX;
-        }
-
-        public int getPositionY() {
-            return positionY;
-        }
-
-        public void setPositionY(int positionY) {
-            this.positionY = positionY;
-        }
-
-    }
-
     private ClickEventHandler clickEventHandler = new ClickEventHandler(this) {
         @Override
         protected void fireClick(NativeEvent event,
diff --git a/src/com/vaadin/terminal/gwt/client/ui/window/WindowServerRPC.java b/src/com/vaadin/terminal/gwt/client/ui/window/WindowServerRPC.java
new file mode 100644 (file)
index 0000000..f8af015
--- /dev/null
@@ -0,0 +1,7 @@
+package com.vaadin.terminal.gwt.client.ui.window;
+
+import com.vaadin.terminal.gwt.client.communication.ServerRpc;
+import com.vaadin.terminal.gwt.client.ui.ClickRPC;
+
+public interface WindowServerRPC extends ClickRPC, ServerRpc {
+}
\ No newline at end of file
diff --git a/src/com/vaadin/terminal/gwt/client/ui/window/WindowState.java b/src/com/vaadin/terminal/gwt/client/ui/window/WindowState.java
new file mode 100644 (file)
index 0000000..887352b
--- /dev/null
@@ -0,0 +1,70 @@
+package com.vaadin.terminal.gwt.client.ui.window;
+
+import com.vaadin.terminal.gwt.client.ui.panel.PanelState;
+
+public class WindowState extends PanelState {
+    private boolean modal = false;
+    private boolean resizable = true;
+    private boolean resizeLazy = false;
+    private boolean draggable = true;
+    private boolean centered = false;;
+    private int positionX = -1;
+    private int positionY = -1;
+
+    public boolean isModal() {
+        return modal;
+    }
+
+    public void setModal(boolean modal) {
+        this.modal = modal;
+    }
+
+    public boolean isResizable() {
+        return resizable;
+    }
+
+    public void setResizable(boolean resizable) {
+        this.resizable = resizable;
+    }
+
+    public boolean isResizeLazy() {
+        return resizeLazy;
+    }
+
+    public void setResizeLazy(boolean resizeLazy) {
+        this.resizeLazy = resizeLazy;
+    }
+
+    public boolean isDraggable() {
+        return draggable;
+    }
+
+    public void setDraggable(boolean draggable) {
+        this.draggable = draggable;
+    }
+
+    public boolean isCentered() {
+        return centered;
+    }
+
+    public void setCentered(boolean centered) {
+        this.centered = centered;
+    }
+
+    public int getPositionX() {
+        return positionX;
+    }
+
+    public void setPositionX(int positionX) {
+        this.positionX = positionX;
+    }
+
+    public int getPositionY() {
+        return positionY;
+    }
+
+    public void setPositionY(int positionY) {
+        this.positionY = positionY;
+    }
+
+}
\ No newline at end of file
index 7d982964e2b4ffd3b0ad874c443cfc308b876fd9..4876b4026526a5c187c15184e5a43d05eed4538d 100644 (file)
@@ -4,7 +4,7 @@
 
 package com.vaadin.ui;
 
-import com.vaadin.terminal.gwt.client.ui.AbstractLayoutConnector.AbstractLayoutState;
+import com.vaadin.terminal.gwt.client.ui.AbstractLayoutState;
 import com.vaadin.ui.Layout.MarginHandler;
 
 /**
index f3540af62a43477c5c521c8d67b4a8c8e6e05271..9b21a00836080ea74df428bb801140d3e0625363 100644 (file)
@@ -18,8 +18,8 @@ import com.vaadin.terminal.Sizeable;
 import com.vaadin.terminal.Vaadin6Component;
 import com.vaadin.terminal.gwt.client.Connector;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
-import com.vaadin.terminal.gwt.client.ui.orderedlayout.AbstractOrderedLayoutConnector.AbstractOrderedLayoutServerRPC;
-import com.vaadin.terminal.gwt.client.ui.orderedlayout.AbstractOrderedLayoutConnector.AbstractOrderedLayoutState;
+import com.vaadin.terminal.gwt.client.ui.orderedlayout.AbstractOrderedLayoutServerRPC;
+import com.vaadin.terminal.gwt.client.ui.orderedlayout.AbstractOrderedLayoutState;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
 
 @SuppressWarnings("serial")
index 855bfc18b82a6012d84ac1f489bb1bed015fe341..5eb46b85a99d2511e3df04c831e3bdd642ad6db4 100644 (file)
@@ -12,10 +12,10 @@ import com.vaadin.event.ComponentEventListener;
 import com.vaadin.event.MouseEvents.ClickEvent;
 import com.vaadin.terminal.Sizeable;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
-import com.vaadin.terminal.gwt.client.ui.splitpanel.AbstractSplitPanelConnector.AbstractSplitPanelRPC;
-import com.vaadin.terminal.gwt.client.ui.splitpanel.AbstractSplitPanelConnector.AbstractSplitPanelState;
-import com.vaadin.terminal.gwt.client.ui.splitpanel.AbstractSplitPanelConnector.SplitterState;
 import com.vaadin.terminal.gwt.client.ui.ClickEventHandler;
+import com.vaadin.terminal.gwt.client.ui.splitpanel.AbstractSplitPanelRPC;
+import com.vaadin.terminal.gwt.client.ui.splitpanel.AbstractSplitPanelState;
+import com.vaadin.terminal.gwt.client.ui.splitpanel.AbstractSplitPanelState.SplitterState;
 import com.vaadin.tools.ReflectTools;
 
 /**
index 50559c4a22d11ba61251cb3ea1aca00029169ad4..f5e45ef3ef4eec0c003ca66f941d84b589b6dcd0 100644 (file)
@@ -19,8 +19,8 @@ import com.vaadin.event.ShortcutAction.KeyCode;
 import com.vaadin.event.ShortcutAction.ModifierKey;
 import com.vaadin.event.ShortcutListener;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
+import com.vaadin.terminal.gwt.client.ui.button.ButtonServerRpc;
 import com.vaadin.terminal.gwt.client.ui.button.ButtonState;
-import com.vaadin.terminal.gwt.client.ui.button.ButtonConnector.ButtonServerRpc;
 import com.vaadin.tools.ReflectTools;
 import com.vaadin.ui.Component.Focusable;
 
index ddacd4f3d0a1d438954b1aa83cc5679c2e347d92..ac4f4b31a9531a4e1cb28ad0157db8436de0779c 100644 (file)
@@ -11,8 +11,8 @@ import com.vaadin.event.LayoutEvents.LayoutClickListener;
 import com.vaadin.event.LayoutEvents.LayoutClickNotifier;
 import com.vaadin.terminal.gwt.client.Connector;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
-import com.vaadin.terminal.gwt.client.ui.csslayout.CssLayoutConnector.CssLayoutServerRPC;
-import com.vaadin.terminal.gwt.client.ui.csslayout.CssLayoutConnector.CssLayoutState;
+import com.vaadin.terminal.gwt.client.ui.csslayout.CssLayoutServerRPC;
+import com.vaadin.terminal.gwt.client.ui.csslayout.CssLayoutState;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
 
 /**
index 2327aac0a149daac4f42fb541fda93604076860d..0d74fe98785dfe64991b174c7f36b37d8c730c35 100644 (file)
@@ -10,7 +10,7 @@ import java.io.InputStreamReader;
 import java.util.HashMap;
 import java.util.Iterator;
 
-import com.vaadin.terminal.gwt.client.ui.customlayout.CustomLayoutConnector.CustomLayoutState;
+import com.vaadin.terminal.gwt.client.ui.customlayout.CustomLayoutState;
 
 /**
  * <p>
index 1f110ce40abf44e311edd53ca68e36cc09b7175a..052436cef7588ef9a30ebab11b0fca2bfb08b193 100644 (file)
@@ -17,7 +17,7 @@ import com.vaadin.terminal.Vaadin6Component;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.ui.ClickEventHandler;
 import com.vaadin.terminal.gwt.client.ui.embedded.EmbeddedConnector;
-import com.vaadin.terminal.gwt.client.ui.embedded.EmbeddedConnector.EmbeddedServerRPC;
+import com.vaadin.terminal.gwt.client.ui.embedded.EmbeddedServerRPC;
 
 /**
  * Component for embedding external objects.
index d1d8091affd4b271782f3737e7f49bfdb5cd84cf..3166baf321bbd48f5f69a8fec92592fe1c8972ff 100644 (file)
@@ -21,8 +21,8 @@ import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.Vaadin6Component;
 import com.vaadin.terminal.gwt.client.Connector;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
-import com.vaadin.terminal.gwt.client.ui.gridlayout.GridLayoutConnector.GridLayoutServerRPC;
-import com.vaadin.terminal.gwt.client.ui.gridlayout.GridLayoutConnector.GridLayoutState;
+import com.vaadin.terminal.gwt.client.ui.gridlayout.GridLayoutServerRPC;
+import com.vaadin.terminal.gwt.client.ui.gridlayout.GridLayoutState;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
 
 /**
index 54156307d5f3175be1f713649864cdc2f357afbe..c279870a89f0449319d2e5cf8478cc9fc856cccb 100644 (file)
@@ -18,8 +18,8 @@ import com.vaadin.terminal.Scrollable;
 import com.vaadin.terminal.Vaadin6Component;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.ui.ClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.panel.PanelConnector.PanelServerRPC;
-import com.vaadin.terminal.gwt.client.ui.panel.PanelConnector.PanelState;
+import com.vaadin.terminal.gwt.client.ui.panel.PanelServerRPC;
+import com.vaadin.terminal.gwt.client.ui.panel.PanelState;
 import com.vaadin.ui.Component.Focusable;
 
 /**
index 95c9ee16c53b00f3c2290d82a90e0ef5d634828f..6c3d75a9206cab4020d206035f9b5cc17371c1fe 100644 (file)
@@ -24,8 +24,8 @@ import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.Vaadin6Component;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
-import com.vaadin.terminal.gwt.client.ui.window.WindowConnector.WindowServerRPC;
-import com.vaadin.terminal.gwt.client.ui.window.WindowConnector.WindowState;
+import com.vaadin.terminal.gwt.client.ui.window.WindowServerRPC;
+import com.vaadin.terminal.gwt.client.ui.window.WindowState;
 
 /**
  * A component that represents an application (browser native) window or a sub