diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-11-29 07:23:27 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-11-29 07:23:27 +0000 |
| commit | 46dfb4d6b1a660b94b263db5003b0c8583d569b9 (patch) | |
| tree | 7b98c4e4886f69bdab9432bc890661bf08e3d28e /client | |
| parent | b3f7a4238e8b1aea74cab26c5fab09d15ae96dd0 (diff) | |
| parent | 1281bb6c855bea61a97e146a894959ec98e5c401 (diff) | |
| download | vaadin-framework-46dfb4d6b1a660b94b263db5003b0c8583d569b9.tar.gz vaadin-framework-46dfb4d6b1a660b94b263db5003b0c8583d569b9.zip | |
Merge "Make AbstractExtensionConnector.extend abstract (#10378)"
Diffstat (limited to 'client')
3 files changed, 15 insertions, 3 deletions
diff --git a/client/src/com/vaadin/client/JavaScriptExtension.java b/client/src/com/vaadin/client/JavaScriptExtension.java index bf1bb5b56a..a1ad5147a6 100644 --- a/client/src/com/vaadin/client/JavaScriptExtension.java +++ b/client/src/com/vaadin/client/JavaScriptExtension.java @@ -49,4 +49,10 @@ public final class JavaScriptExtension extends AbstractExtensionConnector super.onUnregister(); helper.onUnregister(); } + + @Override + protected void extend(ServerConnector target) { + // Nothing to do for JavaScriptExtension here. Everything is done in + // javascript. + } } diff --git a/client/src/com/vaadin/client/extensions/AbstractExtensionConnector.java b/client/src/com/vaadin/client/extensions/AbstractExtensionConnector.java index a007e15357..ee5771e6e0 100644 --- a/client/src/com/vaadin/client/extensions/AbstractExtensionConnector.java +++ b/client/src/com/vaadin/client/extensions/AbstractExtensionConnector.java @@ -42,7 +42,5 @@ public abstract class AbstractExtensionConnector extends AbstractConnector { } } - protected void extend(ServerConnector target) { - // Default does nothing - } + protected abstract void extend(ServerConnector target); } diff --git a/client/src/com/vaadin/client/extensions/javascriptmanager/JavaScriptManagerConnector.java b/client/src/com/vaadin/client/extensions/javascriptmanager/JavaScriptManagerConnector.java index f6d643d1ba..2550fce208 100644 --- a/client/src/com/vaadin/client/extensions/javascriptmanager/JavaScriptManagerConnector.java +++ b/client/src/com/vaadin/client/extensions/javascriptmanager/JavaScriptManagerConnector.java @@ -22,6 +22,7 @@ import java.util.Set; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.JsArray; import com.google.gwt.json.client.JSONArray; +import com.vaadin.client.ServerConnector; import com.vaadin.client.communication.StateChangeEvent; import com.vaadin.client.extensions.AbstractExtensionConnector; import com.vaadin.shared.communication.MethodInvocation; @@ -131,4 +132,11 @@ public class JavaScriptManagerConnector extends AbstractExtensionConnector { public JavaScriptManagerState getState() { return (JavaScriptManagerState) super.getState(); } + + @Override + protected void extend(ServerConnector target) { + // Nothing to do there as we are not interested in the connector we + // extend (Page i.e. UI) + + } } |