diff options
| author | Jouni Koivuviita <jouni@vaadin.com> | 2012-08-07 16:05:49 +0300 |
|---|---|---|
| committer | Jouni Koivuviita <jouni@vaadin.com> | 2012-08-07 16:05:49 +0300 |
| commit | 8356465b3897fa16233064cfd586b4557f33e8e4 (patch) | |
| tree | aa14a1e52e85935486e7a4aec453247939a228fc /src/com/vaadin/terminal/JavaScriptCallbackHelper.java | |
| parent | 9a83722fde94af949b45d4c091399ba9e1f6ba29 (diff) | |
| parent | 5813e0e9e5af4f946e5ea9c73d426e95d93b7bc4 (diff) | |
| download | vaadin-framework-8356465b3897fa16233064cfd586b4557f33e8e4.tar.gz vaadin-framework-8356465b3897fa16233064cfd586b4557f33e8e4.zip | |
merge master
Diffstat (limited to 'src/com/vaadin/terminal/JavaScriptCallbackHelper.java')
| -rw-r--r-- | src/com/vaadin/terminal/JavaScriptCallbackHelper.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/vaadin/terminal/JavaScriptCallbackHelper.java b/src/com/vaadin/terminal/JavaScriptCallbackHelper.java index 01db0267d9..131875a5a4 100644 --- a/src/com/vaadin/terminal/JavaScriptCallbackHelper.java +++ b/src/com/vaadin/terminal/JavaScriptCallbackHelper.java @@ -14,8 +14,8 @@ import java.util.Set; import com.vaadin.external.json.JSONArray; import com.vaadin.external.json.JSONException; +import com.vaadin.shared.JavaScriptConnectorState; import com.vaadin.terminal.gwt.client.JavaScriptConnectorHelper; -import com.vaadin.terminal.gwt.client.JavaScriptConnectorHelper.JavaScriptConnectorState; import com.vaadin.tools.ReflectTools; import com.vaadin.ui.AbstractJavaScriptComponent; import com.vaadin.ui.JavaScript.JavaScriptCallbackRpc; @@ -65,6 +65,7 @@ public class JavaScriptCallbackHelper implements Serializable { private void ensureRpc() { if (javascriptCallbackRpc == null) { javascriptCallbackRpc = new JavaScriptCallbackRpc() { + @Override public void call(String name, JSONArray arguments) { JavaScriptCallback callback = callbacks.get(name); try { |