From f2551a9fc03636deb5fcd3f30c761dca946c8341 Mon Sep 17 00:00:00 2001 From: Taras Hupalo Date: Tue, 12 Aug 2014 15:28:41 +0300 Subject: replaced all org.json.* usages with elemental.json.* (#8942) Change-Id: I4809fbbdb48f3e36c8e1da8552ff3fa734714105 --- uitest/src/com/vaadin/tests/minitutorials/v7a3/JSAPIUI.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'uitest/src/com/vaadin/tests/minitutorials/v7a3/JSAPIUI.java') diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/JSAPIUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/JSAPIUI.java index 8f1eda6816..e98fe6d066 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/JSAPIUI.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/JSAPIUI.java @@ -1,8 +1,5 @@ package com.vaadin.tests.minitutorials.v7a3; -import org.json.JSONArray; -import org.json.JSONException; - import com.vaadin.server.ExternalResource; import com.vaadin.server.VaadinRequest; import com.vaadin.ui.JavaScript; @@ -12,6 +9,9 @@ import com.vaadin.ui.Notification; import com.vaadin.ui.Notification.Type; import com.vaadin.ui.UI; +import elemental.json.JsonArray; +import elemental.json.JsonException; + public class JSAPIUI extends UI { @Override public void init(VaadinRequest request) { @@ -19,7 +19,7 @@ public class JSAPIUI extends UI { JavaScript.getCurrent().addFunction("com.example.api.notify", new JavaScriptFunction() { @Override - public void call(JSONArray arguments) throws JSONException { + public void call(JsonArray arguments) { try { String caption = arguments.getString(0); if (arguments.length() == 1) { @@ -28,10 +28,10 @@ public class JSAPIUI extends UI { } else { // type should be in [1] Notification.show(caption, - Type.values()[arguments.getInt(1)]); + Type.values()[((int) arguments.getNumber(1))]); } - } catch (JSONException e) { + } catch (JsonException e) { // We'll log in the console, you might not want to JavaScript.getCurrent().execute( "console.error('" + e.getMessage() + "')"); -- cgit v1.2.3