diff options
author | Taras Hupalo <taras.hupalo@gmail.com> | 2014-08-12 15:28:41 +0300 |
---|---|---|
committer | Leif Åstrand <leif@vaadin.com> | 2014-08-26 09:51:15 +0000 |
commit | f2551a9fc03636deb5fcd3f30c761dca946c8341 (patch) | |
tree | b59bc2c5ea1f7471dec4ef59826614b4f6d0adbf /server/src/com/vaadin/ui/JavaScript.java | |
parent | c8d58261954de18ef67eaf9043bd93360202cf06 (diff) | |
download | vaadin-framework-f2551a9fc03636deb5fcd3f30c761dca946c8341.tar.gz vaadin-framework-f2551a9fc03636deb5fcd3f30c761dca946c8341.zip |
replaced all org.json.* usages with elemental.json.* (#8942)
Change-Id: I4809fbbdb48f3e36c8e1da8552ff3fa734714105
Diffstat (limited to 'server/src/com/vaadin/ui/JavaScript.java')
-rw-r--r-- | server/src/com/vaadin/ui/JavaScript.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/server/src/com/vaadin/ui/JavaScript.java b/server/src/com/vaadin/ui/JavaScript.java index 68c8c9a6e4..668ae67056 100644 --- a/server/src/com/vaadin/ui/JavaScript.java +++ b/server/src/com/vaadin/ui/JavaScript.java @@ -19,15 +19,15 @@ package com.vaadin.ui; import java.util.HashMap; import java.util.Map; -import org.json.JSONArray; -import org.json.JSONException; - import com.vaadin.server.AbstractExtension; import com.vaadin.server.Page; import com.vaadin.shared.communication.ServerRpc; import com.vaadin.shared.extension.javascriptmanager.ExecuteJavaScriptRpc; import com.vaadin.shared.extension.javascriptmanager.JavaScriptManagerState; +import elemental.json.JsonArray; +import elemental.json.JsonException; + /** * Provides access to JavaScript functionality in the web browser. To get an * instance of JavaScript, either use Page.getJavaScript() or @@ -43,7 +43,7 @@ public class JavaScript extends AbstractExtension { // Can not be defined in client package as this JSONArray is not available // in GWT public interface JavaScriptCallbackRpc extends ServerRpc { - public void call(String name, JSONArray arguments); + public void call(String name, JsonArray arguments); } /** @@ -54,12 +54,12 @@ public class JavaScript extends AbstractExtension { public JavaScript() { registerRpc(new JavaScriptCallbackRpc() { @Override - public void call(String name, JSONArray arguments) { + public void call(String name, JsonArray arguments) { JavaScriptFunction function = functions.get(name); // TODO handle situation if name is not registered try { function.call(arguments); - } catch (JSONException e) { + } catch (JsonException e) { throw new IllegalArgumentException(e); } } |