@@ -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); | |||
} | |||
@@ -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); | |||
} | |||
@@ -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()); |
@@ -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; | |||
@@ -50,7 +50,7 @@ public class RpcProxyGenerator extends Generator { | |||
throw new UnableToCompleteException(); | |||
} | |||
String generatedClassName = "ClientToServerRpc_" | |||
String generatedClassName = "ServerRpc_" | |||
+ requestedType.getName().replaceAll("[$.]", "_"); | |||
JClassType initializableInterface = typeOracle |
@@ -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); | |||
} | |||
/** |