6 files changed, 95 insertions, 31 deletions

diff --git a/src/org/json/simple/JSONArray.java b/src/org/json/simple/JSONArray.java
index e2c7042..a71a221 100644
--- a/src/org/json/simple/JSONArray.java
+++ b/src/org/json/simple/JSONArray.java
@@ -49,7 +49,8 @@ public class JSONArray extends ArrayList<Object> implements JSONAware, JSONStrea
          * @param collection

          * @param out

          */

-        public static void writeJSONString(final Collection<?> collection, final Writer out) throws IOException {

+        public static void writeJSONString(final Collection<?> collection, final Writer out)

+                        throws IOException {

                 if (collection == null) {

                         out.write("null");

                         return;

diff --git a/src/org/json/simple/JSONObject.java b/src/org/json/simple/JSONObject.java
index 55eeeb6..ee6bf0a 100644
--- a/src/org/json/simple/JSONObject.java
+++ b/src/org/json/simple/JSONObject.java
@@ -19,7 +19,8 @@ import rejava.io.Writer;
  * @author FangYidong<fangyidong@yahoo.com.cn>

  */

 @SuppressWarnings("rawtypes")

-public class JSONObject extends HashMap<String, Object> implements Map<String, Object>, JSONAware, JSONStreamAware {

+public class JSONObject extends HashMap<String, Object> implements Map<String, Object>, JSONAware,

+                JSONStreamAware {

 

         private static final long serialVersionUID = -503443796854799292L;

 

diff --git a/src/org/json/simple/JSONValue.java b/src/org/json/simple/JSONValue.java
index 3d42315..47a1abe 100644
--- a/src/org/json/simple/JSONValue.java
+++ b/src/org/json/simple/JSONValue.java
@@ -300,7 +300,9 @@ public class JSONValue {
                                 break;

                         default:

                                 // Reference: http://www.unicode.org/versions/Unicode5.1.0/

-                                if (((ch >= '\u0000') && (ch <= '\u001F')) || ((ch >= '\u007F') && (ch <= '\u009F')) || ((ch >= '\u2000') && (ch <= '\u20FF'))) {

+                                if (((ch >= '\u0000') && (ch <= '\u001F'))

+                                                || ((ch >= '\u007F') && (ch <= '\u009F'))

+                                                || ((ch >= '\u2000') && (ch <= '\u20FF'))) {

                                         final String ss = Integer.toHexString(ch);

                                         sb.append("\\u");

                                         for (int k = 0; k < (4 - ss.length()); k++) {

diff --git a/src/org/json/simple/parser/JSONParser.java b/src/org/json/simple/parser/JSONParser.java
index 4874eea..85472bb 100644
--- a/src/org/json/simple/parser/JSONParser.java
+++ b/src/org/json/simple/parser/JSONParser.java
@@ -78,7 +78,8 @@ public class JSONParser {
                 return this.parse(s, (ContainerFactory) null);

         }

 

-        public Object parse(final String s, final ContainerFactory containerFactory) throws ParseException {

+        public Object parse(final String s, final ContainerFactory containerFactory)

+                        throws ParseException {

                 final StringReader in = new StringReader(s);

                 try {

                         return this.parse(in, containerFactory);

@@ -109,7 +110,8 @@ public class JSONParser {
          * @throws ParseException

          */

         @SuppressWarnings({ "rawtypes", "unchecked" })

-        public Object parse(final Reader in, final ContainerFactory containerFactory) throws IOException, ParseException {

+        public Object parse(final Reader in, final ContainerFactory containerFactory)

+                        throws IOException, ParseException {

                 this.reset(in);

                 final LinkedList statusStack = new LinkedList();

                 final LinkedList valueStack = new LinkedList();

@@ -144,7 +146,8 @@ public class JSONParser {
                                         if (this.token.type == Yytoken.TYPE_EOF) {

                                                 return valueStack.removeFirst();

                                         } else {

-                                                throw new ParseException(this.getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, this.token);

+                                                throw new ParseException(this.getPosition(),

+                                                                ParseException.ERROR_UNEXPECTED_TOKEN, this.token);

                                         }

 

                                 case S_IN_OBJECT:

@@ -250,17 +253,20 @@ public class JSONParser {
                                         }// inner switch

                                         break;

                                 case S_IN_ERROR:

-                                        throw new ParseException(this.getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, this.token);

+                                        throw new ParseException(this.getPosition(),

+                                                        ParseException.ERROR_UNEXPECTED_TOKEN, this.token);

                                 }// switch

                                 if (this.status == JSONParser.S_IN_ERROR) {

-                                        throw new ParseException(this.getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, this.token);

+                                        throw new ParseException(this.getPosition(),

+                                                        ParseException.ERROR_UNEXPECTED_TOKEN, this.token);

                                 }

                         } while (this.token.type != Yytoken.TYPE_EOF);

                 } catch (final IOException ie) {

                         throw ie;

                 }

 

-                throw new ParseException(this.getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, this.token);

+                throw new ParseException(this.getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN,

+                                this.token);

         }

 

         private void nextToken() throws ParseException, IOException {

@@ -298,7 +304,8 @@ public class JSONParser {
                 this.parse(s, contentHandler, false);

         }

 

-        public void parse(final String s, final ContentHandler contentHandler, final boolean isResume) throws ParseException {

+        public void parse(final String s, final ContentHandler contentHandler, final boolean isResume)

+                        throws ParseException {

                 final StringReader in = new StringReader(s);

                 try {

                         this.parse(in, contentHandler, isResume);

@@ -310,7 +317,8 @@ public class JSONParser {
                 }

         }

 

-        public void parse(final Reader in, final ContentHandler contentHandler) throws IOException, ParseException {

+        public void parse(final Reader in, final ContentHandler contentHandler) throws IOException,

+                        ParseException {

                 this.parse(in, contentHandler, false);

         }

 

@@ -331,7 +339,8 @@ public class JSONParser {
          * @throws ParseException

          */

         @SuppressWarnings({ "unchecked", "rawtypes" })

-        public void parse(final Reader in, final ContentHandler contentHandler, boolean isResume) throws IOException, ParseException {

+        public void parse(final Reader in, final ContentHandler contentHandler, boolean isResume)

+                        throws IOException, ParseException {

                 if (!isResume) {

                         this.reset(in);

                         this.handlerStatusStack = new LinkedList<>();

@@ -386,7 +395,8 @@ public class JSONParser {
                                                 return;

                                         } else {

                                                 this.status = JSONParser.S_IN_ERROR;

-                                                throw new ParseException(this.getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, this.token);

+                                                throw new ParseException(this.getPosition(),

+                                                                ParseException.ERROR_UNEXPECTED_TOKEN, this.token);

                                         }

 

                                 case S_IN_OBJECT:

@@ -518,10 +528,12 @@ public class JSONParser {
                                         return;

 

                                 case S_IN_ERROR:

-                                        throw new ParseException(this.getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, this.token);

+                                        throw new ParseException(this.getPosition(),

+                                                        ParseException.ERROR_UNEXPECTED_TOKEN, this.token);

                                 }// switch

                                 if (this.status == JSONParser.S_IN_ERROR) {

-                                        throw new ParseException(this.getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, this.token);

+                                        throw new ParseException(this.getPosition(),

+                                                        ParseException.ERROR_UNEXPECTED_TOKEN, this.token);

                                 }

                         } while (this.token.type != Yytoken.TYPE_EOF);

                 } catch (final IOException ie) {

@@ -539,6 +551,7 @@ public class JSONParser {
                 }

 

                 this.status = JSONParser.S_IN_ERROR;

-                throw new ParseException(this.getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, this.token);

+                throw new ParseException(this.getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN,

+                                this.token);

         }

 }

diff --git a/src/org/json/simple/parser/ParseException.java b/src/org/json/simple/parser/ParseException.java
index df1b1d1..6bd8d8c 100644
--- a/src/org/json/simple/parser/ParseException.java
+++ b/src/org/json/simple/parser/ParseException.java
@@ -75,13 +75,16 @@ public class ParseException extends Exception {
 

                 switch (this.errorType) {

                 case ERROR_UNEXPECTED_CHAR: