ClientToServerRpc -> ServerRpc

diff --git a/src/com/vaadin/terminal/gwt/client/ui/ButtonConnector.java b/src/com/vaadin/terminal/gwt/client/ui/ButtonConnector.java
index a4d4e588d5049ef3ccac7abed5032863eb7cedc9..34b4591eaeaa5bc65dea47cf9d15606a1107401c 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/ButtonConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ButtonConnector.java
@@ -10,6 +10,7 @@ import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.ComponentState;
 import com.vaadin.terminal.gwt.client.EventHelper;
+import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.communication.ServerRpc;
 
@@ -20,7 +21,7 @@ public class ButtonConnector extends AbstractComponentConnector {
      * 
      * @since 7.0
      */
-    public interface ButtonClientToServerRpc extends ServerRpc {
+    public interface ButtonServerRpc extends ServerRpc {
         /**
          * Button click event.
          * 
@@ -44,8 +45,7 @@ public class ButtonConnector extends AbstractComponentConnector {
     @Override
     public void init() {
         super.init();
-        ButtonClientToServerRpc rpcProxy = GWT
-                .create(ButtonClientToServerRpc.class);
+        ButtonServerRpc rpcProxy = GWT.create(ButtonServerRpc.class);
         getWidget().buttonRpcProxy = initRPC(rpcProxy);
     }
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/NativeButtonConnector.java b/src/com/vaadin/terminal/gwt/client/ui/NativeButtonConnector.java
index 87f7943773acda8b80fad7ca23291501a58d891c..20737fc70b095ad3f7debd2415175372557105ff 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/NativeButtonConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/NativeButtonConnector.java
@@ -10,7 +10,7 @@ import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.ComponentState;
 import com.vaadin.terminal.gwt.client.EventHelper;
 import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.ButtonConnector.ButtonClientToServerRpc;
+import com.vaadin.terminal.gwt.client.ui.ButtonConnector.ButtonServerRpc;
 
 public class NativeButtonConnector extends AbstractComponentConnector {
 
@@ -18,8 +18,8 @@ public class NativeButtonConnector extends AbstractComponentConnector {
     public void init() {
         super.init();
 
-        ButtonClientToServerRpc rpcProxy = GWT
-                .create(ButtonClientToServerRpc.class);
+        ButtonServerRpc rpcProxy = GWT
+                .create(ButtonServerRpc.class);
         getWidget().buttonRpcProxy = initRPC(rpcProxy);
     }
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VButton.java b/src/com/vaadin/terminal/gwt/client/ui/VButton.java
index bd287f048ff61c9d00ab0ae98bea79d3844e5b76..5309d11a04e5a54d066c0e744e459bb6abe63cab 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VButton.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VButton.java
@@ -25,7 +25,7 @@ import com.vaadin.terminal.gwt.client.EventId;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.VTooltip;
-import com.vaadin.terminal.gwt.client.ui.ButtonConnector.ButtonClientToServerRpc;
+import com.vaadin.terminal.gwt.client.ui.ButtonConnector.ButtonServerRpc;
 
 public class VButton extends FocusWidget implements ClickHandler, FocusHandler,
         BlurHandler {
@@ -89,7 +89,7 @@ public class VButton extends FocusWidget implements ClickHandler, FocusHandler,
 
     protected int clickShortcut = 0;
     // TODO Move this to VButtonPaintable
-    ButtonClientToServerRpc buttonRpcProxy;
+    ButtonServerRpc buttonRpcProxy;
 
     public VButton() {
         super(DOM.createDiv());

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java b/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java
index e9bbcc6984c62a67e578044a5535b3acae6767e2..c7036d52d0ccf2f3ac9eca694b872a6ee3213081 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java
@@ -21,7 +21,7 @@ import com.vaadin.terminal.gwt.client.EventId;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.VTooltip;
-import com.vaadin.terminal.gwt.client.ui.ButtonConnector.ButtonClientToServerRpc;
+import com.vaadin.terminal.gwt.client.ui.ButtonConnector.ButtonServerRpc;
 
 public class VNativeButton extends Button implements ClickHandler,
         FocusHandler, BlurHandler {
@@ -34,7 +34,7 @@ public class VNativeButton extends Button implements ClickHandler,
 
     protected ApplicationConnection client;
 
-    ButtonClientToServerRpc buttonRpcProxy;
+    ButtonServerRpc buttonRpcProxy;
 
     protected Element errorIndicatorElement;
 

diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyGenerator.java b/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyGenerator.java
index 9bcb08fb7227ae9cd4d37320d0eb826e13a6edbc..57334923b403252e074934081efcdcb3c61160b3 100644 (file)
--- a/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyGenerator.java
+++ b/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyGenerator.java
@@ -50,7 +50,7 @@ public class RpcProxyGenerator extends Generator {
             throw new UnableToCompleteException();
         }
 
-        String generatedClassName = "ClientToServerRpc_"
+        String generatedClassName = "ServerRpc_"
                 + requestedType.getName().replaceAll("[$.]", "_");
 
         JClassType initializableInterface = typeOracle

diff --git a/src/com/vaadin/ui/Button.java b/src/com/vaadin/ui/Button.java
index eb84d852dddfc40f249a47ad7c42e05e7dcb9b62..5574da6e6cfddd3e087ee7d5af3414992a22b658 100644 (file)
--- a/src/com/vaadin/ui/Button.java
+++ b/src/com/vaadin/ui/Button.java
@@ -21,7 +21,7 @@ import com.vaadin.event.ShortcutListener;
 import com.vaadin.terminal.gwt.client.ComponentState;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.ui.ButtonConnector;
-import com.vaadin.terminal.gwt.client.ui.ButtonConnector.ButtonClientToServerRpc;
+import com.vaadin.terminal.gwt.client.ui.ButtonConnector.ButtonServerRpc;
 import com.vaadin.terminal.gwt.client.ui.ButtonState;
 import com.vaadin.terminal.gwt.server.RpcTarget;
 import com.vaadin.tools.ReflectTools;
@@ -47,7 +47,7 @@ public class Button extends AbstractComponent implements
      */
     public Button() {
         // TODO take the implementation out of an anonymous class?
-        registerRpcImplementation(new ButtonClientToServerRpc() {
+        registerRpcImplementation(new ButtonServerRpc() {
             public void click(String mouseEventDetails) {
                 fireClick(MouseEventDetails.deSerialize(mouseEventDetails));
             }
@@ -57,7 +57,7 @@ public class Button extends AbstractComponent implements
                 // this (client side has already disabled the button)
                 setEnabled(false);
             }
-        }, ButtonClientToServerRpc.class);
+        }, ButtonServerRpc.class);
     }
 
     /**