RPC -> Rpc for consistency

diff --git a/src/com/vaadin/terminal/gwt/client/ui/ClickRPC.java b/src/com/vaadin/terminal/gwt/client/ui/ClickRPC.java
deleted file mode 100644 (file)
index 6c81b28..0000000
--- a/src/com/vaadin/terminal/gwt/client/ui/ClickRPC.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/* 
-@VaadinApache2LicenseForJavaFiles@
- */
-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

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..37d6443
--- /dev/null
+++ b/src/com/vaadin/terminal/gwt/client/ui/ClickRpc.java
@@ -0,0 +1,18 @@
+/* 
+@VaadinApache2LicenseForJavaFiles@
+ */
+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

diff --git a/src/com/vaadin/terminal/gwt/client/ui/LayoutClickEventHandler.java b/src/com/vaadin/terminal/gwt/client/ui/LayoutClickEventHandler.java
index 09caa9ad82814fdaeff699186ff1ad5a18326ec7..7a5d85e34bea601deba33136ddddc4905781fc08 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/LayoutClickEventHandler.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/LayoutClickEventHandler.java
@@ -35,5 +35,5 @@ public abstract class LayoutClickEventHandler extends AbstractClickEventHandler
         getLayoutClickRPC().layoutClick(mouseDetails, getChildComponent(event));
     }
 
-    protected abstract LayoutClickRPC getLayoutClickRPC();
+    protected abstract LayoutClickRpc getLayoutClickRPC();
 }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/LayoutClickRPC.java b/src/com/vaadin/terminal/gwt/client/ui/LayoutClickRPC.java
deleted file mode 100644 (file)
index 20b9c87..0000000
--- a/src/com/vaadin/terminal/gwt/client/ui/LayoutClickRPC.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/* 
-@VaadinApache2LicenseForJavaFiles@
- */
-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

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..5b76f39
--- /dev/null
+++ b/src/com/vaadin/terminal/gwt/client/ui/LayoutClickRpc.java
@@ -0,0 +1,22 @@
+/* 
+@VaadinApache2LicenseForJavaFiles@
+ */
+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

diff --git a/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutConnector.java
index 2307f67ac59acbfb0a613b212278d0f4cb53d1bf..80b6254e0279a8a745d7709af34530e22831847a 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutConnector.java
@@ -21,7 +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.Connect;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.LayoutClickRPC;
+import com.vaadin.terminal.gwt.client.ui.LayoutClickRpc;
 import com.vaadin.terminal.gwt.client.ui.absolutelayout.VAbsoluteLayout.AbsoluteWrapper;
 import com.vaadin.ui.AbsoluteLayout;
 
@@ -38,20 +38,20 @@ public class AbsoluteLayoutConnector extends
         }
 
         @Override
-        protected LayoutClickRPC getLayoutClickRPC() {
+        protected LayoutClickRpc getLayoutClickRPC() {
             return rpc;
         };
 
     };
 
-    private AbsoluteLayoutServerRPC rpc;
+    private AbsoluteLayoutServerRpc rpc;
 
     private Map<String, AbsoluteWrapper> connectorIdToComponentWrapper = new HashMap<String, AbsoluteWrapper>();
 
     @Override
     protected void init() {
         super.init();
-        rpc = RpcProxy.create(AbsoluteLayoutServerRPC.class, this);
+        rpc = RpcProxy.create(AbsoluteLayoutServerRpc.class, this);
     }
 
     /**

diff --git a/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutServerRPC.java b/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutServerRPC.java
deleted file mode 100644 (file)
index df7ee1b..0000000
--- a/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutServerRPC.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/* 
-@VaadinApache2LicenseForJavaFiles@
- */
-package com.vaadin.terminal.gwt.client.ui.absolutelayout;
-
-import com.vaadin.terminal.gwt.client.communication.ServerRpc;
-import com.vaadin.terminal.gwt.client.ui.LayoutClickRPC;
-
-public interface AbsoluteLayoutServerRPC extends LayoutClickRPC, ServerRpc {
-
-}
\ No newline at end of file

diff --git a/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutServerRpc.java b/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutServerRpc.java
new file mode 100644 (file)
index 0000000..d626eb5
--- /dev/null
+++ b/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutServerRpc.java
@@ -0,0 +1,11 @@
+/* 
+@VaadinApache2LicenseForJavaFiles@
+ */
+package com.vaadin.terminal.gwt.client.ui.absolutelayout;
+
+import com.vaadin.terminal.gwt.client.communication.ServerRpc;
+import com.vaadin.terminal.gwt.client.ui.LayoutClickRpc;
+
+public interface AbsoluteLayoutServerRpc extends LayoutClickRpc, ServerRpc {
+
+}
\ No newline at end of file

diff --git a/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutConnector.java
index 76fb9ab9268106a9bd8a1dff0d8f481187d1d683..7df31a8593647d7a7d6f787dcf13af6eb2625e9f 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutConnector.java
@@ -20,7 +20,7 @@ import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
 import com.vaadin.terminal.gwt.client.ui.AbstractLayoutConnector;
 import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.LayoutClickRPC;
+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;
@@ -38,19 +38,19 @@ public class CssLayoutConnector extends AbstractLayoutConnector {
         }
 
         @Override
-        protected LayoutClickRPC getLayoutClickRPC() {
+        protected LayoutClickRpc getLayoutClickRPC() {
             return rpc;
         };
     };
 
-    private CssLayoutServerRPC rpc;
+    private CssLayoutServerRpc rpc;
 
     private Map<ComponentConnector, VCaption> childToCaption = new HashMap<ComponentConnector, VCaption>();
 
     @Override
     protected void init() {
         super.init();
-        rpc = RpcProxy.create(CssLayoutServerRPC.class, this);
+        rpc = RpcProxy.create(CssLayoutServerRpc.class, this);
     }
 
     @Override

diff --git a/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutServerRPC.java b/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutServerRPC.java
deleted file mode 100644 (file)
index 067ea54..0000000
--- a/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutServerRPC.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/* 
-@VaadinApache2LicenseForJavaFiles@
- */
-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/CssLayoutServerRpc.java b/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutServerRpc.java
new file mode 100644 (file)
index 0000000..7ba89d4
--- /dev/null
+++ b/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutServerRpc.java
@@ -0,0 +1,11 @@
+/* 
+@VaadinApache2LicenseForJavaFiles@
+ */
+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/embedded/EmbeddedConnector.java b/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java
index 423aac19744fac699a9d1b8aa910e7132cc7b2f4..81ac195c8ecc1dcd19d60299a2087abfc5118519 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java
@@ -35,12 +35,12 @@ public class EmbeddedConnector extends AbstractComponentConnector implements
 
     public static final String ALTERNATE_TEXT = "alt";
 
-    EmbeddedServerRPC rpc;
+    EmbeddedServerRpc rpc;
 
     @Override
     protected void init() {
         super.init();
-        rpc = RpcProxy.create(EmbeddedServerRPC.class, this);
+        rpc = RpcProxy.create(EmbeddedServerRpc.class, this);
     }
 
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {

diff --git a/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedServerRPC.java b/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedServerRPC.java
deleted file mode 100644 (file)
index e3410e4..0000000
--- a/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedServerRPC.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/* 
-@VaadinApache2LicenseForJavaFiles@
- */
-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

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..7f36c81
--- /dev/null
+++ b/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedServerRpc.java
@@ -0,0 +1,10 @@
+/* 
+@VaadinApache2LicenseForJavaFiles@
+ */
+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

diff --git a/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutConnector.java
index 82f26383a1a2b8d5c8347056bf59fa014754f293..e4a31b96ef7b647df1b4d6d0e0edf960cfc96c57 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutConnector.java
@@ -22,7 +22,7 @@ import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector;
 import com.vaadin.terminal.gwt.client.ui.AlignmentInfo;
 import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.LayoutClickRPC;
+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;
@@ -41,18 +41,18 @@ public class GridLayoutConnector extends AbstractComponentContainerConnector
         }
 
         @Override
-        protected LayoutClickRPC getLayoutClickRPC() {
+        protected LayoutClickRpc getLayoutClickRPC() {
             return rpc;
         };
 
     };
 
-    private GridLayoutServerRPC rpc;
+    private GridLayoutServerRpc rpc;
     private boolean needCaptionUpdate = false;
 
     @Override
     public void init() {
-        rpc = RpcProxy.create(GridLayoutServerRPC.class, this);
+        rpc = RpcProxy.create(GridLayoutServerRpc.class, this);
         getLayoutManager().registerDependency(this,
                 getWidget().spacingMeasureElement);
     }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutServerRPC.java b/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutServerRPC.java
deleted file mode 100644 (file)
index 1b7f1a1..0000000
--- a/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutServerRPC.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/* 
-@VaadinApache2LicenseForJavaFiles@
- */
-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/GridLayoutServerRpc.java b/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutServerRpc.java
new file mode 100644 (file)
index 0000000..cd8df29
--- /dev/null
+++ b/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutServerRpc.java
@@ -0,0 +1,11 @@
+/* 
+@VaadinApache2LicenseForJavaFiles@
+ */
+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/orderedlayout/AbstractOrderedLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
index d36046d6cbac788990796874b79d2d5e1193b5d0..174da61bd390017c78dd10926b9a91193d0c1a13 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
@@ -23,7 +23,7 @@ import com.vaadin.terminal.gwt.client.communication.RpcProxy;
 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.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;
@@ -31,7 +31,7 @@ import com.vaadin.terminal.gwt.client.ui.layout.VLayoutSlot;
 public abstract class AbstractOrderedLayoutConnector extends
         AbstractLayoutConnector implements Paintable, DirectionalManagedLayout {
 
-    AbstractOrderedLayoutServerRPC rpc;
+    AbstractOrderedLayoutServerRpc rpc;
 
     private LayoutClickEventHandler clickEventHandler = new LayoutClickEventHandler(
             this) {
@@ -43,7 +43,7 @@ public abstract class AbstractOrderedLayoutConnector extends
         }
 
         @Override
-        protected LayoutClickRPC getLayoutClickRPC() {
+        protected LayoutClickRpc getLayoutClickRPC() {
             return rpc;
         };
 
@@ -51,7 +51,7 @@ public abstract class AbstractOrderedLayoutConnector extends
 
     @Override
     public void init() {
-        rpc = RpcProxy.create(AbstractOrderedLayoutServerRPC.class, this);
+        rpc = RpcProxy.create(AbstractOrderedLayoutServerRpc.class, this);
         getLayoutManager().registerDependency(this,
                 getWidget().spacingMeasureElement);
     }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutServerRPC.java b/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutServerRPC.java
deleted file mode 100644 (file)
index f23cda3..0000000
--- a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutServerRPC.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/* 
-@VaadinApache2LicenseForJavaFiles@
- */
-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/AbstractOrderedLayoutServerRpc.java b/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java
new file mode 100644 (file)
index 0000000..5a29eac
--- /dev/null
+++ b/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java
@@ -0,0 +1,12 @@
+/* 
+@VaadinApache2LicenseForJavaFiles@
+ */
+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/panel/PanelConnector.java b/src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java
index a8512762f1859c106330440ae959ff9368632681..9555c38a365edd636a89519ef9f3312651109e5d 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java
@@ -43,11 +43,11 @@ public class PanelConnector extends AbstractComponentContainerConnector
 
     private Integer uidlScrollLeft;
 
-    private PanelServerRPC rpc;
+    private PanelServerRpc rpc;
 
     @Override
     public void init() {
-        rpc = RpcProxy.create(PanelServerRPC.class, this);
+        rpc = RpcProxy.create(PanelServerRpc.class, this);
         VPanel panel = getWidget();
         LayoutManager layoutManager = getLayoutManager();
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/panel/PanelServerRPC.java b/src/com/vaadin/terminal/gwt/client/ui/panel/PanelServerRPC.java
deleted file mode 100644 (file)
index 9a556cf..0000000
--- a/src/com/vaadin/terminal/gwt/client/ui/panel/PanelServerRPC.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/* 
-@VaadinApache2LicenseForJavaFiles@
- */
-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/PanelServerRpc.java b/src/com/vaadin/terminal/gwt/client/ui/panel/PanelServerRpc.java
new file mode 100644 (file)
index 0000000..9b59344
--- /dev/null
+++ b/src/com/vaadin/terminal/gwt/client/ui/panel/PanelServerRpc.java
@@ -0,0 +1,11 @@
+/* 
+@VaadinApache2LicenseForJavaFiles@
+ */
+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/root/RootConnector.java b/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java
index 408c15383ca7191cd62c187e72f3888008406d24..46f82d60b7c492543fb1ff9866dc55f3c8e94fb5 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java
@@ -47,7 +47,7 @@ import com.vaadin.ui.Root;
 public class RootConnector extends AbstractComponentContainerConnector
         implements Paintable, MayScrollChildren {
 
-    private RootServerRPC rpc = RpcProxy.create(RootServerRPC.class, this);
+    private RootServerRpc rpc = RpcProxy.create(RootServerRpc.class, this);
 
     private HandlerRegistration childStateChangeHandlerRegistration;
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/root/RootServerRPC.java b/src/com/vaadin/terminal/gwt/client/ui/root/RootServerRPC.java
deleted file mode 100644 (file)
index f32b972..0000000
--- a/src/com/vaadin/terminal/gwt/client/ui/root/RootServerRPC.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/* 
-@VaadinApache2LicenseForJavaFiles@
- */
-package com.vaadin.terminal.gwt.client.ui.root;
-
-import com.vaadin.terminal.gwt.client.communication.ServerRpc;
-import com.vaadin.terminal.gwt.client.ui.ClickRPC;
-
-public interface RootServerRPC extends ClickRPC, ServerRpc {
-
-}
\ No newline at end of file

diff --git a/src/com/vaadin/terminal/gwt/client/ui/root/RootServerRpc.java b/src/com/vaadin/terminal/gwt/client/ui/root/RootServerRpc.java
new file mode 100644 (file)
index 0000000..3895009
--- /dev/null
+++ b/src/com/vaadin/terminal/gwt/client/ui/root/RootServerRpc.java
@@ -0,0 +1,11 @@
+/* 
+@VaadinApache2LicenseForJavaFiles@
+ */
+package com.vaadin.terminal.gwt.client.ui.root;
+
+import com.vaadin.terminal.gwt.client.communication.ServerRpc;
+import com.vaadin.terminal.gwt.client.ui.ClickRpc;
+
+public interface RootServerRpc extends ClickRpc, ServerRpc {
+
+}
\ No newline at end of file

diff --git a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelConnector.java b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelConnector.java
index 7340c2cbd94f45b9d269221793b026de35321aea..b3921204dc89834919025f2967245ff73961d970 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelConnector.java
@@ -30,12 +30,12 @@ import com.vaadin.terminal.gwt.client.ui.splitpanel.VAbstractSplitPanel.Splitter
 public abstract class AbstractSplitPanelConnector extends
         AbstractComponentContainerConnector implements SimpleManagedLayout {
 
-    private AbstractSplitPanelRPC rpc;
+    private AbstractSplitPanelRpc rpc;
 
     @Override
     protected void init() {
         super.init();
-        rpc = RpcProxy.create(AbstractSplitPanelRPC.class, this);
+        rpc = RpcProxy.create(AbstractSplitPanelRpc.class, this);
         // TODO Remove
         getWidget().client = getConnection();
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelRPC.java b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelRPC.java
deleted file mode 100644 (file)
index 15cd47a..0000000
--- a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelRPC.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/* 
-@VaadinApache2LicenseForJavaFiles@
- */
-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/AbstractSplitPanelRpc.java b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelRpc.java
new file mode 100644 (file)
index 0000000..cc04383
--- /dev/null
+++ b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelRpc.java
@@ -0,0 +1,28 @@
+/* 
+@VaadinApache2LicenseForJavaFiles@
+ */
+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/window/WindowConnector.java b/src/com/vaadin/terminal/gwt/client/ui/window/WindowConnector.java
index 85f4213d3e4601ad867f4393eb4baec89d676fd7..6979982a9c271076052f14c79370c276dbef48f6 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/window/WindowConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/window/WindowConnector.java
@@ -44,7 +44,7 @@ public class WindowConnector extends AbstractComponentContainerConnector
         }
     };
 
-    private WindowServerRPC rpc;
+    private WindowServerRpc rpc;
 
     boolean minWidthChecked = false;
 
@@ -56,7 +56,7 @@ public class WindowConnector extends AbstractComponentContainerConnector
     @Override
     protected void init() {
         super.init();
-        rpc = RpcProxy.create(WindowServerRPC.class, this);
+        rpc = RpcProxy.create(WindowServerRpc.class, this);
 
         getLayoutManager().registerDependency(this,
                 getWidget().contentPanel.getElement());

diff --git a/src/com/vaadin/terminal/gwt/client/ui/window/WindowServerRPC.java b/src/com/vaadin/terminal/gwt/client/ui/window/WindowServerRPC.java
deleted file mode 100644 (file)
index 782284b..0000000
--- a/src/com/vaadin/terminal/gwt/client/ui/window/WindowServerRPC.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/* 
-@VaadinApache2LicenseForJavaFiles@
- */
-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/WindowServerRpc.java b/src/com/vaadin/terminal/gwt/client/ui/window/WindowServerRpc.java
new file mode 100644 (file)
index 0000000..4723c55
--- /dev/null
+++ b/src/com/vaadin/terminal/gwt/client/ui/window/WindowServerRpc.java
@@ -0,0 +1,10 @@
+/* 
+@VaadinApache2LicenseForJavaFiles@
+ */
+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/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
index 46d519c240b6d5c85a2fc71ae87344ae7d5d2034..56e99450d268033964cada5bc8a237ccdbdc8635 100644 (file)
--- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
@@ -1453,9 +1453,9 @@ public abstract class AbstractCommunicationManager implements Serializable {
                     continue;
                 }
 
-                if (invocation instanceof ServerRPCMethodInvocation) {
+                if (invocation instanceof ServerRpcMethodInvocation) {
                     ServerRpcManager.applyInvocation(connector,
-                            (ServerRPCMethodInvocation) invocation);
+                            (ServerRpcMethodInvocation) invocation);
                 } else {
 
                     // All code below is for legacy variable changes
@@ -1575,10 +1575,10 @@ public abstract class AbstractCommunicationManager implements Serializable {
         }
     }
 
-    private ServerRPCMethodInvocation parseServerRpcInvocation(
+    private ServerRpcMethodInvocation parseServerRpcInvocation(
             String connectorId, String interfaceName, String methodName,
             JSONArray parametersJson) throws JSONException {
-        ServerRPCMethodInvocation invocation = new ServerRPCMethodInvocation(
+        ServerRpcMethodInvocation invocation = new ServerRpcMethodInvocation(
                 connectorId, interfaceName, methodName, parametersJson.length());
 
         Object[] parameters = new Object[parametersJson.length()];

diff --git a/src/com/vaadin/terminal/gwt/server/RpcManager.java b/src/com/vaadin/terminal/gwt/server/RpcManager.java
index a629447069a3ebe6191009fe87f5af987e4a6eaf..d240ab846712570e428ca2b5beb5ba12ba45d4ea 100644 (file)
--- a/src/com/vaadin/terminal/gwt/server/RpcManager.java
+++ b/src/com/vaadin/terminal/gwt/server/RpcManager.java
@@ -13,5 +13,5 @@ import java.io.Serializable;
  * @since 7.0
  */
 public interface RpcManager extends Serializable {
-    public void applyInvocation(ServerRPCMethodInvocation invocation);
+    public void applyInvocation(ServerRpcMethodInvocation invocation);
 }

diff --git a/src/com/vaadin/terminal/gwt/server/ServerRPCMethodInvocation.java b/src/com/vaadin/terminal/gwt/server/ServerRPCMethodInvocation.java
deleted file mode 100644 (file)
index 6afb549..0000000
--- a/src/com/vaadin/terminal/gwt/server/ServerRPCMethodInvocation.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-@VaadinApache2LicenseForJavaFiles@
- */
-package com.vaadin.terminal.gwt.server;
-
-import java.lang.reflect.Method;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.vaadin.terminal.gwt.client.communication.MethodInvocation;
-import com.vaadin.terminal.gwt.client.communication.ServerRpc;
-
-public class ServerRPCMethodInvocation extends MethodInvocation {
-
-    private static final Map<String, Method> invocationMethodCache = new ConcurrentHashMap<String, Method>(
-            128, 0.75f, 1);
-
-    private final Method method;
-
-    private Class<? extends ServerRpc> interfaceClass;
-
-    public ServerRPCMethodInvocation(String connectorId, String interfaceName,
-            String methodName, int parameterCount) {
-        super(connectorId, interfaceName, methodName);
-
-        interfaceClass = findClass();
-        method = findInvocationMethod(interfaceClass, methodName,
-                parameterCount);
-    }
-
-    private Class<? extends ServerRpc> findClass() {
-        try {
-            Class<?> rpcInterface = Class.forName(getInterfaceName());
-            if (!ServerRpc.class.isAssignableFrom(rpcInterface)) {
-                throw new IllegalArgumentException("The interface "
-                        + getInterfaceName() + "is not a server RPC interface.");
-            }
-            return (Class<? extends ServerRpc>) rpcInterface;
-        } catch (ClassNotFoundException e) {
-            throw new IllegalArgumentException("The server RPC interface "
-                    + getInterfaceName() + " could not be found", e);
-        } finally {
-
-        }
-    }
-
-    public Class<? extends ServerRpc> getInterfaceClass() {
-        return interfaceClass;
-    }
-
-    public Method getMethod() {
-        return method;
-    }
-
-    /**
-     * Tries to find the method from the cache or alternatively by invoking
-     * {@link #doFindInvocationMethod(Class, String, int)} and updating the
-     * cache.
-     * 
-     * @param targetType
-     * @param methodName
-     * @param parameterCount
-     * @return
-     */
-    private Method findInvocationMethod(Class<?> targetType, String methodName,
-            int parameterCount) {
-        // TODO currently only using method name and number of parameters as the
-        // signature
-        String signature = targetType.getName() + "." + methodName + "("
-                + parameterCount;
-        Method invocationMethod = invocationMethodCache.get(signature);
-
-        if (invocationMethod == null) {
-            invocationMethod = doFindInvocationMethod(targetType, methodName,
-                    parameterCount);
-
-            if (invocationMethod != null) {
-                invocationMethodCache.put(signature, invocationMethod);
-            }
-        }
-
-        return invocationMethod;
-    }
-
-    /**
-     * Tries to find the method from the class by looping through available
-     * methods.
-     * 
-     * @param targetType
-     * @param methodName
-     * @param parameterCount
-     * @return
-     */
-    private Method doFindInvocationMethod(Class<?> targetType,
-            String methodName, int parameterCount) {
-        Method[] methods = targetType.getMethods();
-        for (Method method : methods) {
-            Class<?>[] parameterTypes = method.getParameterTypes();
-            if (method.getName().equals(methodName)
-                    && parameterTypes.length == parameterCount) {
-                return method;
-            }
-        }
-        return null;
-    }
-
-}

diff --git a/src/com/vaadin/terminal/gwt/server/ServerRpcManager.java b/src/com/vaadin/terminal/gwt/server/ServerRpcManager.java
index 025af7d61d51c9f3b4e3d683f5db8b36a1cd4414..07f83864c24b8e0d9a44a4d398d10f8ee3495823 100644 (file)
--- a/src/com/vaadin/terminal/gwt/server/ServerRpcManager.java
+++ b/src/com/vaadin/terminal/gwt/server/ServerRpcManager.java
@@ -68,7 +68,7 @@ public class ServerRpcManager<T> implements RpcManager {
      *            method invocation to perform
      */
     public static void applyInvocation(RpcTarget target,
-            ServerRPCMethodInvocation invocation) {
+            ServerRpcMethodInvocation invocation) {
         RpcManager manager = target.getRpcManager(invocation
                 .getInterfaceClass());
         if (manager != null) {
@@ -109,7 +109,7 @@ public class ServerRpcManager<T> implements RpcManager {
      * @param invocation
      *            method invocation to perform
      */
-    public void applyInvocation(ServerRPCMethodInvocation invocation) {
+    public void applyInvocation(ServerRpcMethodInvocation invocation) {
         Method method = invocation.getMethod();
         Class<?>[] parameterTypes = method.getParameterTypes();
         Object[] args = new Object[parameterTypes.length];

diff --git a/src/com/vaadin/terminal/gwt/server/ServerRpcMethodInvocation.java b/src/com/vaadin/terminal/gwt/server/ServerRpcMethodInvocation.java
new file mode 100644 (file)
index 0000000..6f278f7
--- /dev/null
+++ b/src/com/vaadin/terminal/gwt/server/ServerRpcMethodInvocation.java
@@ -0,0 +1,107 @@
+/*
+@VaadinApache2LicenseForJavaFiles@
+ */
+package com.vaadin.terminal.gwt.server;
+
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.vaadin.terminal.gwt.client.communication.MethodInvocation;
+import com.vaadin.terminal.gwt.client.communication.ServerRpc;
+
+public class ServerRpcMethodInvocation extends MethodInvocation {
+
+    private static final Map<String, Method> invocationMethodCache = new ConcurrentHashMap<String, Method>(
+            128, 0.75f, 1);
+
+    private final Method method;
+
+    private Class<? extends ServerRpc> interfaceClass;
+
+    public ServerRpcMethodInvocation(String connectorId, String interfaceName,
+            String methodName, int parameterCount) {
+        super(connectorId, interfaceName, methodName);
+
+        interfaceClass = findClass();
+        method = findInvocationMethod(interfaceClass, methodName,
+                parameterCount);
+    }
+
+    private Class<? extends ServerRpc> findClass() {
+        try {
+            Class<?> rpcInterface = Class.forName(getInterfaceName());
+            if (!ServerRpc.class.isAssignableFrom(rpcInterface)) {
+                throw new IllegalArgumentException("The interface "
+                        + getInterfaceName() + "is not a server RPC interface.");
+            }
+            return (Class<? extends ServerRpc>) rpcInterface;
+        } catch (ClassNotFoundException e) {
+            throw new IllegalArgumentException("The server RPC interface "
+                    + getInterfaceName() + " could not be found", e);
+        } finally {
+
+        }
+    }
+
+    public Class<? extends ServerRpc> getInterfaceClass() {
+        return interfaceClass;
+    }
+
+    public Method getMethod() {
+        return method;
+    }
+
+    /**
+     * Tries to find the method from the cache or alternatively by invoking
+     * {@link #doFindInvocationMethod(Class, String, int)} and updating the
+     * cache.
+     * 
+     * @param targetType
+     * @param methodName
+     * @param parameterCount
+     * @return
+     */
+    private Method findInvocationMethod(Class<?> targetType, String methodName,
+            int parameterCount) {
+        // TODO currently only using method name and number of parameters as the
+        // signature
+        String signature = targetType.getName() + "." + methodName + "("
+                + parameterCount;
+        Method invocationMethod = invocationMethodCache.get(signature);
+
+        if (invocationMethod == null) {
+            invocationMethod = doFindInvocationMethod(targetType, methodName,
+                    parameterCount);
+
+            if (invocationMethod != null) {
+                invocationMethodCache.put(signature, invocationMethod);
+            }
+        }
+
+        return invocationMethod;
+    }
+
+    /**
+     * Tries to find the method from the class by looping through available
+     * methods.
+     * 
+     * @param targetType
+     * @param methodName
+     * @param parameterCount
+     * @return
+     */
+    private Method doFindInvocationMethod(Class<?> targetType,
+            String methodName, int parameterCount) {
+        Method[] methods = targetType.getMethods();
+        for (Method method : methods) {
+            Class<?>[] parameterTypes = method.getParameterTypes();
+            if (method.getName().equals(methodName)
+                    && parameterTypes.length == parameterCount) {
+                return method;
+            }
+        }
+        return null;
+    }
+
+}

diff --git a/src/com/vaadin/ui/AbsoluteLayout.java b/src/com/vaadin/ui/AbsoluteLayout.java
index e548798abe1b597590e66e470eccdcf76fc0ab88..9ba005f75a1cf04988f0c36c9abf723b3ee7af73 100644 (file)
--- a/src/com/vaadin/ui/AbsoluteLayout.java
+++ b/src/com/vaadin/ui/AbsoluteLayout.java
@@ -16,7 +16,7 @@ import com.vaadin.terminal.Sizeable;
 import com.vaadin.terminal.gwt.client.Connector;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.absolutelayout.AbsoluteLayoutServerRPC;
+import com.vaadin.terminal.gwt.client.ui.absolutelayout.AbsoluteLayoutServerRpc;
 import com.vaadin.terminal.gwt.client.ui.absolutelayout.AbsoluteLayoutState;
 
 /**
@@ -28,7 +28,7 @@ import com.vaadin.terminal.gwt.client.ui.absolutelayout.AbsoluteLayoutState;
 public class AbsoluteLayout extends AbstractLayout implements
         LayoutClickNotifier {
 
-    private AbsoluteLayoutServerRPC rpc = new AbsoluteLayoutServerRPC() {
+    private AbsoluteLayoutServerRpc rpc = new AbsoluteLayoutServerRpc() {
 
         public void layoutClick(MouseEventDetails mouseDetails,
                 Connector clickedConnector) {

diff --git a/src/com/vaadin/ui/AbstractOrderedLayout.java b/src/com/vaadin/ui/AbstractOrderedLayout.java
index 0f2f670331f2d311ed9bb0a392a4ae3138bd920b..3606fa6572853965dd508bdb201019a2b93c83ad 100644 (file)
--- a/src/com/vaadin/ui/AbstractOrderedLayout.java
+++ b/src/com/vaadin/ui/AbstractOrderedLayout.java
@@ -19,7 +19,7 @@ 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.LayoutClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.orderedlayout.AbstractOrderedLayoutServerRPC;
+import com.vaadin.terminal.gwt.client.ui.orderedlayout.AbstractOrderedLayoutServerRpc;
 import com.vaadin.terminal.gwt.client.ui.orderedlayout.AbstractOrderedLayoutState;
 
 @SuppressWarnings("serial")
@@ -27,7 +27,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
         Layout.AlignmentHandler, Layout.SpacingHandler, LayoutClickNotifier,
         Vaadin6Component {
 
-    private AbstractOrderedLayoutServerRPC rpc = new AbstractOrderedLayoutServerRPC() {
+    private AbstractOrderedLayoutServerRpc rpc = new AbstractOrderedLayoutServerRpc() {
 
         public void layoutClick(MouseEventDetails mouseDetails,
                 Connector clickedConnector) {

diff --git a/src/com/vaadin/ui/AbstractSplitPanel.java b/src/com/vaadin/ui/AbstractSplitPanel.java
index 5eb46b85a99d2511e3df04c831e3bdd642ad6db4..aaf06e79be3b1cc3f1104e03d9a7ee1d6b3fd1c8 100644 (file)
--- a/src/com/vaadin/ui/AbstractSplitPanel.java
+++ b/src/com/vaadin/ui/AbstractSplitPanel.java
@@ -13,7 +13,7 @@ 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.ClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.splitpanel.AbstractSplitPanelRPC;
+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;
@@ -33,7 +33,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
 
     private Unit posUnit;
 
-    private AbstractSplitPanelRPC rpc = new AbstractSplitPanelRPC() {
+    private AbstractSplitPanelRpc rpc = new AbstractSplitPanelRpc() {
 
         public void splitterClick(MouseEventDetails mouseDetails) {
             fireEvent(new SplitterClickEvent(AbstractSplitPanel.this,

diff --git a/src/com/vaadin/ui/CssLayout.java b/src/com/vaadin/ui/CssLayout.java
index ac4f4b31a9531a4e1cb28ad0157db8436de0779c..0a2656af3154cbf80d9947c98a69969ef9cb1a2e 100644 (file)
--- a/src/com/vaadin/ui/CssLayout.java
+++ b/src/com/vaadin/ui/CssLayout.java
@@ -11,7 +11,7 @@ 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.CssLayoutServerRPC;
+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;
 
@@ -58,7 +58,7 @@ import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
  */
 public class CssLayout extends AbstractLayout implements LayoutClickNotifier {
 
-    private CssLayoutServerRPC rpc = new CssLayoutServerRPC() {
+    private CssLayoutServerRpc rpc = new CssLayoutServerRpc() {
 
         public void layoutClick(MouseEventDetails mouseDetails,
                 Connector clickedConnector) {

diff --git a/src/com/vaadin/ui/Embedded.java b/src/com/vaadin/ui/Embedded.java
index 052436cef7588ef9a30ebab11b0fca2bfb08b193..1bcd9846669725932e5aef4f55379f132cb43458 100644 (file)
--- a/src/com/vaadin/ui/Embedded.java
+++ b/src/com/vaadin/ui/Embedded.java
@@ -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.EmbeddedServerRPC;
+import com.vaadin.terminal.gwt.client.ui.embedded.EmbeddedServerRpc;
 
 /**
  * Component for embedding external objects.
@@ -80,7 +80,7 @@ public class Embedded extends AbstractComponent implements Vaadin6Component {
 
     private String altText;
 
-    private EmbeddedServerRPC rpc = new EmbeddedServerRPC() {
+    private EmbeddedServerRpc rpc = new EmbeddedServerRpc() {
         public void click(MouseEventDetails mouseDetails) {
             fireEvent(new ClickEvent(Embedded.this, mouseDetails));
         }

diff --git a/src/com/vaadin/ui/GridLayout.java b/src/com/vaadin/ui/GridLayout.java
index 689cdcf28ed009f2d10de87787dffc0eae2ef5ce..0ab729ce5c03004722fd863f893f62ef7646d1e6 100644 (file)
--- a/src/com/vaadin/ui/GridLayout.java
+++ b/src/com/vaadin/ui/GridLayout.java
@@ -22,7 +22,7 @@ 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.LayoutClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.gridlayout.GridLayoutServerRPC;
+import com.vaadin.terminal.gwt.client.ui.gridlayout.GridLayoutServerRpc;
 import com.vaadin.terminal.gwt.client.ui.gridlayout.GridLayoutState;
 
 /**
@@ -56,7 +56,7 @@ public class GridLayout extends AbstractLayout implements
         Layout.AlignmentHandler, Layout.SpacingHandler, LayoutClickNotifier,
         Vaadin6Component {
 
-    private GridLayoutServerRPC rpc = new GridLayoutServerRPC() {
+    private GridLayoutServerRpc rpc = new GridLayoutServerRpc() {
 
         public void layoutClick(MouseEventDetails mouseDetails,
                 Connector clickedConnector) {

diff --git a/src/com/vaadin/ui/Panel.java b/src/com/vaadin/ui/Panel.java
index e358462bbb1dde6ae023d856cb4a868a5ceebd19..b2916f78c723ac527af353568cd75b2edcf00ae9 100644 (file)
--- a/src/com/vaadin/ui/Panel.java
+++ b/src/com/vaadin/ui/Panel.java
@@ -18,7 +18,7 @@ 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.PanelServerRPC;
+import com.vaadin.terminal.gwt.client.ui.panel.PanelServerRpc;
 import com.vaadin.terminal.gwt.client.ui.panel.PanelState;
 import com.vaadin.ui.Component.Focusable;
 
@@ -47,7 +47,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
      */
     protected ActionManager actionManager;
 
-    private PanelServerRPC rpc = new PanelServerRPC() {
+    private PanelServerRpc rpc = new PanelServerRpc() {
         public void click(MouseEventDetails mouseDetails) {
             fireEvent(new ClickEvent(Panel.this, mouseDetails));
         }

diff --git a/src/com/vaadin/ui/Root.java b/src/com/vaadin/ui/Root.java
index 541127e092ab7a17601530afd218b13593675eff..405ae8da93ca4fb79ee7d0d9b13db834fb507bd2 100644 (file)
--- a/src/com/vaadin/ui/Root.java
+++ b/src/com/vaadin/ui/Root.java
@@ -33,7 +33,7 @@ import com.vaadin.terminal.WrappedRequest.BrowserDetails;
 import com.vaadin.terminal.gwt.client.ComponentState;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.ui.notification.VNotification;
-import com.vaadin.terminal.gwt.client.ui.root.RootServerRPC;
+import com.vaadin.terminal.gwt.client.ui.root.RootServerRpc;
 import com.vaadin.terminal.gwt.client.ui.root.RootState;
 import com.vaadin.terminal.gwt.client.ui.root.VRoot;
 import com.vaadin.tools.ReflectTools;
@@ -409,7 +409,7 @@ public abstract class Root extends AbstractComponentContainer implements
     private DirtyConnectorTracker dirtyConnectorTracker = new DirtyConnectorTracker(
             this);
 
-    private RootServerRPC rpc = new RootServerRPC() {
+    private RootServerRpc rpc = new RootServerRpc() {
         public void click(MouseEventDetails mouseDetails) {
             fireEvent(new ClickEvent(Root.this, mouseDetails));
         }

diff --git a/src/com/vaadin/ui/Window.java b/src/com/vaadin/ui/Window.java
index 6c3d75a9206cab4020d206035f9b5cc17371c1fe..3c17baf41451e3120604d138b59a9062ea04591b 100644 (file)
--- a/src/com/vaadin/ui/Window.java
+++ b/src/com/vaadin/ui/Window.java
@@ -24,7 +24,7 @@ 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.WindowServerRPC;
+import com.vaadin.terminal.gwt.client.ui.window.WindowServerRpc;
 import com.vaadin.terminal.gwt.client.ui.window.WindowState;
 
 /**
@@ -76,7 +76,7 @@ import com.vaadin.terminal.gwt.client.ui.window.WindowState;
 public class Window extends Panel implements FocusNotifier, BlurNotifier,
         Vaadin6Component {
 
-    private WindowServerRPC rpc = new WindowServerRPC() {
+    private WindowServerRpc rpc = new WindowServerRpc() {
 
         public void click(MouseEventDetails mouseDetails) {
             fireEvent(new ClickEvent(Window.this, mouseDetails));