Merge remote-tracking branch 'origin/master' into grid

This merge needs Grid to use elemental.json instead of org.json

Change-Id: Ib3c387c7e282b2502f266bafbdaad8727f5dc6ef

1 files changed, 3 insertions, 7 deletions

diff --git a/server/src/com/vaadin/ui/JavaScriptFunction.java b/server/src/com/vaadin/ui/JavaScriptFunction.java
index 2c026abd1a..c006a36d58 100644
--- a/server/src/com/vaadin/ui/JavaScriptFunction.java
+++ b/server/src/com/vaadin/ui/JavaScriptFunction.java
@@ -18,14 +18,12 @@ package com.vaadin.ui;
 
 import java.io.Serializable;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-
 import com.vaadin.server.AbstractJavaScriptExtension;
+import elemental.json.JsonArray;
 
 /**
  * Defines a method that is called by a client-side JavaScript function. When
- * the corresponding JavaScript function is called, the {@link #call(JSONArray)}
+ * the corresponding JavaScript function is called, the {@link #call(JsonArray)}
  * method is invoked.
  * 
  * @see JavaScript#addFunction(String, JavaScriptCallback)
@@ -46,8 +44,6 @@ public interface JavaScriptFunction extends Serializable {
      * @param arguments
      *            an array with JSON representations of the arguments with which
      *            the JavaScript function was called.
-     * @throws JSONException
-     *             if the arguments can not be interpreted
      */
-    public void call(JSONArray arguments) throws JSONException;
+    public void call(JsonArray arguments);
 }