diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-09-11 11:55:17 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-09-11 11:56:19 +0300 |
| commit | b3d9805666a9f798554a91ea09981816b9fe9d60 (patch) | |
| tree | 08a3375098e58c4d9322f66ff7da39c65359ae8f /uitest | |
| parent | c0b98ed77842f505f3a2f424c5d049a3c0c970cb (diff) | |
| download | vaadin-framework-b3d9805666a9f798554a91ea09981816b9fe9d60.tar.gz vaadin-framework-b3d9805666a9f798554a91ea09981816b9fe9d60.zip | |
Use org.json instead of com.vaadin.external.json (#9539)
Diffstat (limited to 'uitest')
4 files changed, 13 insertions, 9 deletions
diff --git a/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java b/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java index 38beca3bf1..bc17447052 100644 --- a/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java +++ b/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java @@ -19,9 +19,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.json.JSONArray; +import org.json.JSONException; + import com.vaadin.annotations.JavaScript; -import com.vaadin.external.json.JSONArray; -import com.vaadin.external.json.JSONException; import com.vaadin.server.DynamicConnectorResource; import com.vaadin.server.Resource; import com.vaadin.server.ResourceReference; diff --git a/uitest/src/com/vaadin/tests/extensions/JavascriptManagerTest.java b/uitest/src/com/vaadin/tests/extensions/JavascriptManagerTest.java index a4e2acb31e..9999925bb0 100644 --- a/uitest/src/com/vaadin/tests/extensions/JavascriptManagerTest.java +++ b/uitest/src/com/vaadin/tests/extensions/JavascriptManagerTest.java @@ -16,9 +16,10 @@ package com.vaadin.tests.extensions; -import com.vaadin.external.json.JSONArray; -import com.vaadin.external.json.JSONException; -import com.vaadin.external.json.JSONObject; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.tests.util.Log; diff --git a/uitest/src/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java b/uitest/src/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java index 18054c8e0f..ee78a1a6a0 100644 --- a/uitest/src/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java +++ b/uitest/src/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java @@ -16,10 +16,11 @@ package com.vaadin.tests.extensions; +import org.json.JSONArray; +import org.json.JSONException; + import com.vaadin.annotations.JavaScript; import com.vaadin.annotations.StyleSheet; -import com.vaadin.external.json.JSONArray; -import com.vaadin.external.json.JSONException; import com.vaadin.server.AbstractJavaScriptExtension; import com.vaadin.server.WrappedRequest; import com.vaadin.shared.JavaScriptExtensionState; diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/Flot.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/Flot.java index 816c60cfe5..3facad3631 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/Flot.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/Flot.java @@ -20,9 +20,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.json.JSONArray; +import org.json.JSONException; + import com.vaadin.annotations.JavaScript; -import com.vaadin.external.json.JSONArray; -import com.vaadin.external.json.JSONException; import com.vaadin.ui.AbstractJavaScriptComponent; import com.vaadin.ui.JavaScriptFunction; import com.vaadin.ui.Notification; |