summaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin/ui/JavaScript.java
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-09-11 11:55:17 +0300
committerLeif Åstrand <leif@vaadin.com>2012-09-11 11:56:19 +0300
commitb3d9805666a9f798554a91ea09981816b9fe9d60 (patch)
tree08a3375098e58c4d9322f66ff7da39c65359ae8f /server/src/com/vaadin/ui/JavaScript.java
parentc0b98ed77842f505f3a2f424c5d049a3c0c970cb (diff)
downloadvaadin-framework-b3d9805666a9f798554a91ea09981816b9fe9d60.tar.gz
vaadin-framework-b3d9805666a9f798554a91ea09981816b9fe9d60.zip
Use org.json instead of com.vaadin.external.json (#9539)
Diffstat (limited to 'server/src/com/vaadin/ui/JavaScript.java')
-rw-r--r--server/src/com/vaadin/ui/JavaScript.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/server/src/com/vaadin/ui/JavaScript.java b/server/src/com/vaadin/ui/JavaScript.java
index f9324ba321..3782ead85a 100644
--- a/server/src/com/vaadin/ui/JavaScript.java
+++ b/server/src/com/vaadin/ui/JavaScript.java
@@ -19,8 +19,9 @@ package com.vaadin.ui;
import java.util.HashMap;
import java.util.Map;
-import com.vaadin.external.json.JSONArray;
-import com.vaadin.external.json.JSONException;
+import org.json.JSONArray;
+import org.json.JSONException;
+
import com.vaadin.server.AbstractExtension;
import com.vaadin.server.Page;
import com.vaadin.shared.communication.ServerRpc;