You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by rf...@apache.org on 2011/03/12 07:51:11 UTC
svn commit: r1080874 - in /incubator/wink/trunk/wink-json4j/src:
main/java/org/apache/wink/json4j/ main/java/org/apache/wink/json4j/compat/
main/java/org/apache/wink/json4j/compat/impl/
main/java/org/apache/wink/json4j/internal/ main/java/org/apache/wi...
Author: rfeng
Date: Sat Mar 12 06:51:10 2011
New Revision: 1080874
URL: http://svn.apache.org/viewvc?rev=1080874&view=rev
Log:
Clean up imports to remove unused imports and sort the imports by order
Modified:
incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/JSON.java
incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/JSONArray.java
incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/JSONObject.java
incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/JSONStringer.java
incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/JSONWriter.java
incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/OrderedJSONObject.java
incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/compat/JSONFactory.java
incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/compat/impl/ApacheJSONFactory.java
incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/compat/impl/ApacheJSONStringerDelegate.java
incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/internal/BeanSerializer.java
incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/internal/Serializer.java
incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/internal/SerializerVerbose.java
incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/internal/Tokenizer.java
incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/utils/XML.java
incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/utils/internal/JSONObject.java
incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/utils/internal/JSONSAXHandler.java
incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/compat/tests/ApacheJSONArrayTest.java
incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/compat/tests/ApacheJSONObjectTest.java
incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/compat/tests/ApacheJSONStringerTest.java
incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/compat/tests/ApacheJSONWriterTest.java
incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/BeanSerializerTest.java
incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/JSONObjectTest.java
incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/JSONStringerTest.java
incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/JSONWriterTest.java
incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/XMLTests.java
Modified: incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/JSON.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/JSON.java?rev=1080874&r1=1080873&r2=1080874&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/JSON.java (original)
+++ incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/JSON.java Sat Mar 12 06:51:10 2011
@@ -19,14 +19,14 @@
package org.apache.wink.json4j;
+import java.io.BufferedReader;
+import java.io.CharArrayReader;
import java.io.IOException;
import java.io.InputStream;
-import java.io.Reader;
-import java.io.PushbackReader;
-import java.io.BufferedReader;
import java.io.InputStreamReader;
+import java.io.PushbackReader;
+import java.io.Reader;
import java.io.StringReader;
-import java.io.CharArrayReader;
/**
* Helper class that does generic parsing of a JSON stream and returns the appropriate
Modified: incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/JSONArray.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/JSONArray.java?rev=1080874&r1=1080873&r2=1080874&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/JSONArray.java (original)
+++ incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/JSONArray.java Sat Mar 12 06:51:10 2011
@@ -19,24 +19,22 @@
package org.apache.wink.json4j;
+import java.io.BufferedWriter;
+import java.io.CharArrayWriter;
import java.io.IOException;
-import java.io.StringReader;
-import java.io.Reader;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.io.OutputStream;
-import java.io.Writer;
-import java.io.BufferedWriter;
-import java.io.CharArrayWriter;
import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.StringReader;
import java.io.StringWriter;
-import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
-
+import java.io.Writer;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
-import java.util.Collection;
import org.apache.wink.json4j.internal.BeanSerializer;
import org.apache.wink.json4j.internal.Parser;
Modified: incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/JSONObject.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/JSONObject.java?rev=1080874&r1=1080873&r2=1080874&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/JSONObject.java (original)
+++ incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/JSONObject.java Sat Mar 12 06:51:10 2011
@@ -20,23 +20,23 @@
package org.apache.wink.json4j;
import java.io.BufferedWriter;
+import java.io.CharArrayWriter;
import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.InputStreamReader;
import java.io.InputStream;
-import java.io.Writer;
-import java.io.OutputStreamWriter;
+import java.io.InputStreamReader;
import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.StringReader;
import java.io.StringWriter;
-import java.io.CharArrayWriter;
import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.util.Collection;
import java.util.HashMap;
-import java.util.Set;
import java.util.Iterator;
-import java.util.Vector;
import java.util.Map;
-import java.util.Collection;
+import java.util.Set;
+import java.util.Vector;
import org.apache.wink.json4j.internal.BeanSerializer;
import org.apache.wink.json4j.internal.Null;
Modified: incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/JSONStringer.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/JSONStringer.java?rev=1080874&r1=1080873&r2=1080874&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/JSONStringer.java (original)
+++ incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/JSONStringer.java Sat Mar 12 06:51:10 2011
@@ -19,8 +19,8 @@
package org.apache.wink.json4j;
-import java.io.StringWriter;
import java.io.IOException;
+import java.io.StringWriter;
/**
Modified: incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/JSONWriter.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/JSONWriter.java?rev=1080874&r1=1080873&r2=1080874&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/JSONWriter.java (original)
+++ incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/JSONWriter.java Sat Mar 12 06:51:10 2011
@@ -19,11 +19,11 @@
package org.apache.wink.json4j;
-import java.io.Writer;
import java.io.BufferedWriter;
-import java.io.StringWriter;
import java.io.CharArrayWriter;
import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
import java.util.Stack;
import org.apache.wink.json4j.internal.BeanSerializer;
Modified: incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/OrderedJSONObject.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/OrderedJSONObject.java?rev=1080874&r1=1080873&r2=1080874&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/OrderedJSONObject.java (original)
+++ incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/OrderedJSONObject.java Sat Mar 12 06:51:10 2011
@@ -19,26 +19,16 @@
package org.apache.wink.json4j;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.io.Reader;
import java.io.StringReader;
-import java.io.InputStreamReader;
-import java.io.InputStream;
-import java.io.Writer;
-import java.io.OutputStreamWriter;
-import java.io.OutputStream;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import org.apache.wink.json4j.internal.Parser;
-import org.apache.wink.json4j.internal.Serializer;
-import org.apache.wink.json4j.internal.SerializerVerbose;
/**
* Extension of the basic JSONObject. This class allows control of the serialization order of attributes.
Modified: incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/compat/JSONFactory.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/compat/JSONFactory.java?rev=1080874&r1=1080873&r2=1080874&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/compat/JSONFactory.java (original)
+++ incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/compat/JSONFactory.java Sat Mar 12 06:51:10 2011
@@ -20,9 +20,9 @@
package org.apache.wink.json4j.compat;
import java.io.Reader;
+import java.io.Writer;
import java.util.Collection;
import java.util.Map;
-import java.io.Writer;
public abstract class JSONFactory {
Modified: incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/compat/impl/ApacheJSONFactory.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/compat/impl/ApacheJSONFactory.java?rev=1080874&r1=1080873&r2=1080874&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/compat/impl/ApacheJSONFactory.java (original)
+++ incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/compat/impl/ApacheJSONFactory.java Sat Mar 12 06:51:10 2011
@@ -20,9 +20,9 @@
package org.apache.wink.json4j.compat.impl;
import java.io.Reader;
+import java.io.Writer;
import java.util.Collection;
import java.util.Map;
-import java.io.Writer;
import org.apache.wink.json4j.compat.JSONArray;
import org.apache.wink.json4j.compat.JSONException;
Modified: incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/compat/impl/ApacheJSONStringerDelegate.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/compat/impl/ApacheJSONStringerDelegate.java?rev=1080874&r1=1080873&r2=1080874&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/compat/impl/ApacheJSONStringerDelegate.java (original)
+++ incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/compat/impl/ApacheJSONStringerDelegate.java Sat Mar 12 06:51:10 2011
@@ -19,10 +19,10 @@
package org.apache.wink.json4j.compat.impl;
-import org.apache.wink.json4j.compat.JSONStringer;
-
-import java.io.StringWriter;
import java.io.IOException;
+import java.io.StringWriter;
+
+import org.apache.wink.json4j.compat.JSONStringer;
/**
*
Modified: incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/internal/BeanSerializer.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/internal/BeanSerializer.java?rev=1080874&r1=1080873&r2=1080874&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/internal/BeanSerializer.java (original)
+++ incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/internal/BeanSerializer.java Sat Mar 12 06:51:10 2011
@@ -19,15 +19,12 @@
package org.apache.wink.json4j.internal;
-import java.io.IOException;
-import java.util.Map;
-import java.util.Iterator;
-import java.util.Collection;
+import java.lang.reflect.Method;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
import java.util.List;
-import java.util.HashMap;
-import java.lang.reflect.Method;
-import java.lang.NoSuchMethodException;
+import java.util.Map;
import org.apache.wink.json4j.JSONArray;
import org.apache.wink.json4j.JSONArtifact;
Modified: incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/internal/Serializer.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/internal/Serializer.java?rev=1080874&r1=1080873&r2=1080874&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/internal/Serializer.java (original)
+++ incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/internal/Serializer.java Sat Mar 12 06:51:10 2011
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.Map;
import org.apache.wink.json4j.JSONArray;
-import org.apache.wink.json4j.JSONException;
import org.apache.wink.json4j.JSONObject;
import org.apache.wink.json4j.JSONString;
import org.apache.wink.json4j.OrderedJSONObject;
Modified: incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/internal/SerializerVerbose.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/internal/SerializerVerbose.java?rev=1080874&r1=1080873&r2=1080874&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/internal/SerializerVerbose.java (original)
+++ incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/internal/SerializerVerbose.java Sat Mar 12 06:51:10 2011
@@ -21,9 +21,9 @@ package org.apache.wink.json4j.internal;
import java.io.IOException;
import java.io.Writer;
-import java.util.Map;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
/**
* Internaql class for handling the serialization of JSON objects in a verbose
Modified: incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/internal/Tokenizer.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/internal/Tokenizer.java?rev=1080874&r1=1080873&r2=1080874&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/internal/Tokenizer.java (original)
+++ incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/internal/Tokenizer.java Sat Mar 12 06:51:10 2011
@@ -19,12 +19,12 @@
package org.apache.wink.json4j.internal;
-import java.io.IOException;
-import java.io.Reader;
import java.io.BufferedReader;
-import java.io.StringReader;
import java.io.CharArrayReader;
+import java.io.IOException;
import java.io.PushbackReader;
+import java.io.Reader;
+import java.io.StringReader;
/**
* Tokenizes a stream into JSON tokens.
Modified: incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/utils/XML.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/utils/XML.java?rev=1080874&r1=1080873&r2=1080874&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/utils/XML.java (original)
+++ incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/utils/XML.java Sat Mar 12 06:51:10 2011
@@ -19,49 +19,41 @@
package org.apache.wink.json4j.utils;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-import java.util.StringTokenizer;
-import java.io.File;
-import java.io.InputStream;
import java.io.BufferedInputStream;
-import java.io.OutputStream;
import java.io.ByteArrayOutputStream;
+import java.io.File;
import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.UnsupportedEncodingException;
import java.io.IOException;
-import java.util.logging.*;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.StringReader;
+import java.io.UnsupportedEncodingException;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
-/**
- * Used for conversion of JSON -> XML.
- */
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Document;
-import java.util.Properties;
-import java.util.Iterator;
-import java.util.Set;
-import java.io.StringReader;
-
-
import org.apache.wink.json4j.JSONArray;
import org.apache.wink.json4j.JSONObject;
import org.apache.wink.json4j.utils.internal.JSONSAXHandler;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
/**
Modified: incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/utils/internal/JSONObject.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/utils/internal/JSONObject.java?rev=1080874&r1=1080873&r2=1080874&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/utils/internal/JSONObject.java (original)
+++ incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/utils/internal/JSONObject.java Sat Mar 12 06:51:10 2011
@@ -19,16 +19,14 @@
package org.apache.wink.json4j.utils.internal;
-import java.util.logging.*;
-import java.util.StringTokenizer;
-import java.util.Hashtable;
-import java.util.Enumeration;
-import java.util.Vector;
-import java.util.Properties;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
import java.io.IOException;
import java.io.Writer;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Properties;
+import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
/**
Modified: incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/utils/internal/JSONSAXHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/utils/internal/JSONSAXHandler.java?rev=1080874&r1=1080873&r2=1080874&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/utils/internal/JSONSAXHandler.java (original)
+++ incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/utils/internal/JSONSAXHandler.java Sat Mar 12 06:51:10 2011
@@ -19,18 +19,17 @@
package org.apache.wink.json4j.utils.internal;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.util.Properties;
+import java.util.Stack;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
import org.xml.sax.helpers.DefaultHandler;
-import java.util.logging.*;
-import java.util.Stack;
-import java.util.StringTokenizer;
-import java.util.Properties;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.IOException;
/**
Modified: incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/compat/tests/ApacheJSONArrayTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/compat/tests/ApacheJSONArrayTest.java?rev=1080874&r1=1080873&r2=1080874&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/compat/tests/ApacheJSONArrayTest.java (original)
+++ incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/compat/tests/ApacheJSONArrayTest.java Sat Mar 12 06:51:10 2011
@@ -19,14 +19,15 @@
package org.apache.wink.json4j.compat.tests;
+import java.io.InputStreamReader;
+import java.io.Reader;
+
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import java.io.*;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.HashMap;
-import org.apache.wink.json4j.compat.*;
+import org.apache.wink.json4j.compat.JSONArray;
+import org.apache.wink.json4j.compat.JSONException;
+import org.apache.wink.json4j.compat.JSONFactory;
+import org.apache.wink.json4j.compat.JSONObject;
/**
* Tests for the basic Java JSONArray model
Modified: incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/compat/tests/ApacheJSONObjectTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/compat/tests/ApacheJSONObjectTest.java?rev=1080874&r1=1080873&r2=1080874&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/compat/tests/ApacheJSONObjectTest.java (original)
+++ incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/compat/tests/ApacheJSONObjectTest.java Sat Mar 12 06:51:10 2011
@@ -19,14 +19,17 @@
package org.apache.wink.json4j.compat.tests;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import java.io.*;
-import java.util.Iterator;
-import java.util.Set;
+import java.io.InputStreamReader;
+import java.io.Reader;
import java.util.HashMap;
+import java.util.Iterator;
+
+import junit.framework.TestCase;
-import org.apache.wink.json4j.compat.*;
+import org.apache.wink.json4j.compat.JSONArray;
+import org.apache.wink.json4j.compat.JSONException;
+import org.apache.wink.json4j.compat.JSONFactory;
+import org.apache.wink.json4j.compat.JSONObject;
/**
* Tests for the basic Java JSONObject model
Modified: incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/compat/tests/ApacheJSONStringerTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/compat/tests/ApacheJSONStringerTest.java?rev=1080874&r1=1080873&r2=1080874&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/compat/tests/ApacheJSONStringerTest.java (original)
+++ incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/compat/tests/ApacheJSONStringerTest.java Sat Mar 12 06:51:10 2011
@@ -20,13 +20,11 @@
package org.apache.wink.json4j.compat.tests;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import java.io.*;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.HashMap;
-import org.apache.wink.json4j.compat.*;
+import org.apache.wink.json4j.compat.JSONArray;
+import org.apache.wink.json4j.compat.JSONFactory;
+import org.apache.wink.json4j.compat.JSONObject;
+import org.apache.wink.json4j.compat.JSONStringer;
/**
* Tests for the basic Java JSONStringer
Modified: incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/compat/tests/ApacheJSONWriterTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/compat/tests/ApacheJSONWriterTest.java?rev=1080874&r1=1080873&r2=1080874&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/compat/tests/ApacheJSONWriterTest.java (original)
+++ incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/compat/tests/ApacheJSONWriterTest.java Sat Mar 12 06:51:10 2011
@@ -19,14 +19,14 @@
package org.apache.wink.json4j.compat.tests;
+import java.io.StringWriter;
+
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import java.io.*;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.HashMap;
-import org.apache.wink.json4j.compat.*;
+import org.apache.wink.json4j.compat.JSONArray;
+import org.apache.wink.json4j.compat.JSONFactory;
+import org.apache.wink.json4j.compat.JSONObject;
+import org.apache.wink.json4j.compat.JSONWriter;
/**
* Tests for the basic Java JSONWriter
Modified: incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/BeanSerializerTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/BeanSerializerTest.java?rev=1080874&r1=1080873&r2=1080874&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/BeanSerializerTest.java (original)
+++ incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/BeanSerializerTest.java Sat Mar 12 06:51:10 2011
@@ -19,16 +19,13 @@
package org.apache.wink.json4j.tests;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import java.io.*;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.HashMap;
import java.util.Date;
-import org.apache.wink.json4j.*;
-import org.apache.wink.json4j.internal.*;
+import junit.framework.TestCase;
+
+import org.apache.wink.json4j.JSONArtifact;
+import org.apache.wink.json4j.JSONObject;
+import org.apache.wink.json4j.internal.BeanSerializer;
/**
* Tests for the basic Java Bean serializer
Modified: incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/JSONObjectTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/JSONObjectTest.java?rev=1080874&r1=1080873&r2=1080874&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/JSONObjectTest.java (original)
+++ incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/JSONObjectTest.java Sat Mar 12 06:51:10 2011
@@ -19,18 +19,20 @@
package org.apache.wink.json4j.tests;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import java.io.*;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.Date;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
-import java.util.Set;
-import java.util.HashMap;
-import java.util.Date;
-import org.apache.wink.json4j.*;
-import org.apache.wink.json4j.utils.*;
+import junit.framework.TestCase;
+
+import org.apache.wink.json4j.JSONArray;
+import org.apache.wink.json4j.JSONException;
+import org.apache.wink.json4j.JSONObject;
/**
* Tests for the basic Java JSONObject model
Modified: incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/JSONStringerTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/JSONStringerTest.java?rev=1080874&r1=1080873&r2=1080874&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/JSONStringerTest.java (original)
+++ incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/JSONStringerTest.java Sat Mar 12 06:51:10 2011
@@ -20,14 +20,10 @@
package org.apache.wink.json4j.tests;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import java.io.*;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.HashMap;
-import org.apache.wink.json4j.*;
-import org.apache.wink.json4j.utils.*;
+import org.apache.wink.json4j.JSONArray;
+import org.apache.wink.json4j.JSONObject;
+import org.apache.wink.json4j.JSONStringer;
/**
* Tests for the basic Java JSONStringer
Modified: incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/JSONWriterTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/JSONWriterTest.java?rev=1080874&r1=1080873&r2=1080874&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/JSONWriterTest.java (original)
+++ incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/JSONWriterTest.java Sat Mar 12 06:51:10 2011
@@ -19,15 +19,13 @@
package org.apache.wink.json4j.tests;
+import java.io.StringWriter;
+
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import java.io.*;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.HashMap;
-import org.apache.wink.json4j.*;
-import org.apache.wink.json4j.utils.*;
+import org.apache.wink.json4j.JSONArray;
+import org.apache.wink.json4j.JSONObject;
+import org.apache.wink.json4j.JSONWriter;
/**
* Tests for the basic Java JSONWriter
Modified: incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/XMLTests.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/XMLTests.java?rev=1080874&r1=1080873&r2=1080874&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/XMLTests.java (original)
+++ incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/XMLTests.java Sat Mar 12 06:51:10 2011
@@ -23,7 +23,6 @@ package org.apache.wink.json4j.tests;
* Basic junit imports.
*/
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStream;