summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-11-06 13:31:05 +0200
committerVaadin Code Review <review@vaadin.com>2012-11-06 11:33:03 +0000
commit70200e43f567d11462fb7dd8614c1546e9c4c270 (patch)
tree183b2baa8bc7bacb7ad2ca0b06dde7110303428e
parent9f441030134a04f551c147c569ddce92e1cec9f6 (diff)
downloadvaadin-framework-70200e43f567d11462fb7dd8614c1546e9c4c270.tar.gz
vaadin-framework-70200e43f567d11462fb7dd8614c1546e9c4c270.zip
Make getRpcProxy protected (#9312)
Change-Id: Ia315978b72e5fa3d2f7268b9bb4b4095c2d93402
-rw-r--r--server/src/com/vaadin/server/AbstractClientConnector.java2
-rw-r--r--uitest/src/com/vaadin/tests/widgetset/server/SerializerTestExtension.java6
2 files changed, 7 insertions, 1 deletions
diff --git a/server/src/com/vaadin/server/AbstractClientConnector.java b/server/src/com/vaadin/server/AbstractClientConnector.java
index 1f0d3049b5..0e81224ccc 100644
--- a/server/src/com/vaadin/server/AbstractClientConnector.java
+++ b/server/src/com/vaadin/server/AbstractClientConnector.java
@@ -236,7 +236,7 @@ public abstract class AbstractClientConnector implements ClientConnector {
*
* @since 7.0
*/
- public <T extends ClientRpc> T getRpcProxy(final Class<T> rpcInterface) {
+ protected <T extends ClientRpc> T getRpcProxy(final Class<T> rpcInterface) {
// create, initialize and return a dynamic proxy for RPC
try {
if (!rpcProxyMap.containsKey(rpcInterface)) {
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/SerializerTestExtension.java b/uitest/src/com/vaadin/tests/widgetset/server/SerializerTestExtension.java
index 978ed80ed5..79d097426b 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/SerializerTestExtension.java
+++ b/uitest/src/com/vaadin/tests/widgetset/server/SerializerTestExtension.java
@@ -17,12 +17,18 @@
package com.vaadin.tests.widgetset.server;
import com.vaadin.server.AbstractExtension;
+import com.vaadin.shared.communication.ClientRpc;
import com.vaadin.tests.widgetset.client.ComplexTestBean;
import com.vaadin.tests.widgetset.client.SerializerTestRpc;
public class SerializerTestExtension extends AbstractExtension {
@Override
+ public <T extends ClientRpc> T getRpcProxy(Class<T> rpcInterface) {
+ return super.getRpcProxy(rpcInterface);
+ }
+
+ @Override
public ComplexTestBean getState() {
return (ComplexTestBean) super.getState();
}