update to latest code changes from json.org

source/net/yacy/cora/util/JSONException.java

@@ -6,28 +6,44 @@
 
 package net.yacy.cora.util;
 
-public class JSONException extends Exception {
+/**
-    /**
+ * The JSONException is thrown by the JSON.org classes when things are amiss.
-	 * 
+ *
-	 */
+ * @author JSON.org
-	private static final long serialVersionUID = 0;
+ * @version 2014-05-03
-	private Throwable cause;
+ */
+public class JSONException extends RuntimeException {
+    private static final long serialVersionUID = 0;
+    private Throwable cause;
 
     /**
      * Constructs a JSONException with an explanatory message.
-     * @param message Detail about the reason for the exception.
+     *
+     * @param message
+     *            Detail about the reason for the exception.
      */
-    protected JSONException(String message) {
+    public JSONException(String message) {
         super(message);
     }
 
-    protected JSONException(Throwable t) {
+    /**
-        super(t.getMessage());
+     * Constructs a new JSONException with the specified cause.
-        this.cause = t;
+     * @param cause The cause.
+     */
+    public JSONException(Throwable cause) {
+        super(cause.getMessage());
+        this.cause = cause;
     }
 
+    /**
+     * Returns the cause of this exception or null if the cause is nonexistent
+     * or unknown.
+     *
+     * @return the cause of this exception or null if the cause is nonexistent
+     *          or unknown.
+     */
     @Override
     public synchronized Throwable getCause() {
         return this.cause;
     }
-}
+}

source/net/yacy/cora/util/JSONString.java

@@ -0,0 +1,18 @@
+package net.yacy.cora.util;
+/**
+ * The <code>JSONString</code> interface allows a <code>toJSONString()</code>
+ * method so that a class can change the behavior of
+ * <code>JSONObject.toString()</code>, <code>JSONArray.toString()</code>,
+ * and <code>JSONWriter.value(</code>Object<code>)</code>. The
+ * <code>toJSONString</code> method will be used instead of the default behavior
+ * of using the Object's <code>toString()</code> method and quoting the result.
+ */
+public interface JSONString {
+    /**
+     * The <code>toJSONString</code> method allows a class to produce its own JSON
+     * serialization.
+     *
+     * @return A strictly syntactically correct JSON text.
+     */
+    public String toJSONString();
+}

source/net/yacy/cora/util/JSONTokener.java

@@ -27,36 +27,38 @@ SOFTWARE.
  * it. It is used by the JSONObject and JSONArray constructors to parse
  * JSON source strings.
  * @author JSON.org
- * @version 2010-02-02
+ * @version 2014-05-03
  */
 
 package net.yacy.cora.util;
 
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringReader;
 
-
 public class JSONTokener {
 
-    private int 	character;
+    private long    character;
-	private boolean eof;
+    private boolean eof;
-    private int 	index;
+    private long    index;
-    private int 	line;
+    private long    line;
-    private char 	previous;
+    private char    previous;
-    private final Reader 	reader;
+    private Reader  reader;
     private boolean usePrevious;
 
 
     /**
-     * Construct a JSONTokener from a reader.
+     * Construct a JSONTokener from a Reader.
      *
      * @param reader     A reader.
      */
     public JSONTokener(Reader reader) {
-        this.reader = reader.markSupported() ?
+        this.reader = reader.markSupported()
-        		reader : new BufferedReader(reader);
+            ? reader
+            : new BufferedReader(reader);
         this.eof = false;
         this.usePrevious = false;
         this.previous = 0;
@@ -66,6 +68,15 @@ public class JSONTokener {
     }
 
 
+    /**
+     * Construct a JSONTokener from an InputStream.
+     * @param inputStream The source.
+     */
+    public JSONTokener(InputStream inputStream) throws JSONException {
+        this(new InputStreamReader(inputStream));
+    }
+
+
     /**
      * Construct a JSONTokener from a string.
      *
@@ -112,7 +123,7 @@ public class JSONTokener {
     }
 
     public boolean end() {
-    	return this.eof && !this.usePrevious;
+        return this.eof && !this.usePrevious;
     }
 
 
@@ -122,11 +133,11 @@ public class JSONTokener {
      * @return true if not yet at the end of the source.
      */
     public boolean more() throws JSONException {
-        next();
+        this.next();
-        if (end()) {
+        if (this.end()) {
             return false;
         }
-        back();
+        this.back();
         return true;
     }
 
@@ -139,31 +150,31 @@ public class JSONTokener {
     public char next() throws JSONException {
         int c;
         if (this.usePrevious) {
-        	this.usePrevious = false;
+            this.usePrevious = false;
             c = this.previous;
         } else {
-	        try {
+            try {
-	            c = this.reader.read();
+                c = this.reader.read();
-	        } catch (final IOException exception) {
+            } catch (IOException exception) {
-	            throw new JSONException(exception);
+                throw new JSONException(exception);
-	        }
+            }
-
+
-	        if (c <= 0) { // End of stream
+            if (c <= 0) { // End of stream
-	        	this.eof = true;
+                this.eof = true;
-	        	c = 0;
+                c = 0;
-	        }
+            }
+        }
+        this.index += 1;
+        if (this.previous == '\r') {
+            this.line += 1;
+            this.character = c == '\n' ? 0 : 1;
+        } else if (c == '\n') {
+            this.line += 1;
+            this.character = 0;
+        } else {
+            this.character += 1;
         }
-    	this.index += 1;
+        this.previous = (char) c;
-    	if (this.previous == '\r') {
-    		this.line += 1;
-    		this.character = c == '\n' ? 0 : 1;
-    	} else if (c == '\n') {
-    		this.line += 1;
-    		this.character = 0;
-    	} else {
-    		this.character += 1;
-    	}
-    	this.previous = (char) c;
         return this.previous;
     }
 
@@ -176,9 +187,9 @@ public class JSONTokener {
      * @throws JSONException if the character does not match.
      */
     public char next(char c) throws JSONException {
-        char n = next();
+        char n = this.next();
         if (n != c) {
-            throw syntaxError("Expected '" + c + "' and instead saw '" +
+            throw this.syntaxError("Expected '" + c + "' and instead saw '" +
                     n + "'");
         }
         return n;
@@ -199,17 +210,17 @@ public class JSONTokener {
              return "";
          }
 
-         char[] buffer = new char[n];
+         char[] chars = new char[n];
          int pos = 0;
 
          while (pos < n) {
-             buffer[pos] = next();
+             chars[pos] = this.next();
-             if (end()) {
+             if (this.end()) {
-                 throw syntaxError("Substring bounds error");
+                 throw this.syntaxError("Substring bounds error");
              }
              pos += 1;
          }
-         return new String(buffer);
+         return new String(chars);
      }
 
 
@@ -220,7 +231,7 @@ public class JSONTokener {
      */
     public char nextClean() throws JSONException {
         for (;;) {
-            char c = next();
+            char c = this.next();
             if (c == 0 || c > ' ') {
                 return c;
             }
@@ -243,14 +254,14 @@ public class JSONTokener {
         char c;
         StringBuilder sb = new StringBuilder();
         for (;;) {
-            c = next();
+            c = this.next();
             switch (c) {
             case 0:
             case '\n':
             case '\r':
-                throw syntaxError("Unterminated string");
+                throw this.syntaxError("Unterminated string");
             case '\\':
-                c = next();
+                c = this.next();
                 switch (c) {
                 case 'b':
                     sb.append('\b');
@@ -268,16 +279,16 @@ public class JSONTokener {
                     sb.append('\r');
                     break;
                 case 'u':
-                    sb.append((char)Integer.parseInt(next(4), 16));
+                    sb.append((char)Integer.parseInt(this.next(4), 16));
                     break;
                 case '"':
                 case '\'':
                 case '\\':
                 case '/':
-                	sb.append(c);
+                    sb.append(c);
-                	break;
+                    break;
                 default:
-                    throw syntaxError("Illegal escape.");
+                    throw this.syntaxError("Illegal escape.");
                 }
                 break;
             default:
@@ -293,16 +304,16 @@ public class JSONTokener {
     /**
      * Get the text up but not including the specified character or the
      * end of line, whichever comes first.
-     * @param  d A delimiter character.
+     * @param  delimiter A delimiter character.
      * @return   A string.
      */
-    public String nextTo(char d) throws JSONException {
+    public String nextTo(char delimiter) throws JSONException {
         StringBuilder sb = new StringBuilder();
         for (;;) {
-            char c = next();
+            char c = this.next();
-            if (c == d || c == 0 || c == '\n' || c == '\r') {
+            if (c == delimiter || c == 0 || c == '\n' || c == '\r') {
                 if (c != 0) {
-                    back();
+                    this.back();
                 }
                 return sb.toString().trim();
             }
@@ -321,11 +332,11 @@ public class JSONTokener {
         char c;
         StringBuilder sb = new StringBuilder();
         for (;;) {
-            c = next();
+            c = this.next();
             if (delimiters.indexOf(c) >= 0 || c == 0 ||
                     c == '\n' || c == '\r') {
                 if (c != 0) {
-                    back();
+                    this.back();
                 }
                 return sb.toString().trim();
             }
@@ -342,22 +353,19 @@ public class JSONTokener {
      * @return An object.
      */
     public Object nextValue() throws JSONException {
-        char c = nextClean();
+        char c = this.nextClean();
-        String s;
+        String string;
 
         switch (c) {
             case '"':
             case '\'':
-                return nextString(c);
+                return this.nextString(c);
             case '{':
-                back();
+                this.back();
                 return new JSONObject(this);
             case '[':
-            case '(':
+                this.back();
-                back();
                 return new JSONArray(this);
-        default:
-            break;
         }
 
         /*
@@ -372,15 +380,15 @@ public class JSONTokener {
         StringBuilder sb = new StringBuilder();
         while (c >= ' ' && ",:]}/\\\"[{;=#".indexOf(c) < 0) {
             sb.append(c);
-            c = next();
+            c = this.next();
         }
-        back();
+        this.back();
 
-        s = sb.toString().trim();
+        string = sb.toString().trim();
-        if (s.equals("")) {
+        if ("".equals(string)) {
-            throw syntaxError("Missing value");
+            throw this.syntaxError("Missing value");
         }
-        return JSONObject.stringToValue(s);
+        return JSONObject.stringToValue(string);
     }
 
 
@@ -394,12 +402,12 @@ public class JSONTokener {
     public char skipTo(char to) throws JSONException {
         char c;
         try {
-            int startIndex = this.index;
+            long startIndex = this.index;
-            int startCharacter = this.character;
+            long startCharacter = this.character;
-            int startLine = this.line;
+            long startLine = this.line;
-            this.reader.mark(Integer.MAX_VALUE);
+            this.reader.mark(1000000);
             do {
-                c = next();
+                c = this.next();
                 if (c == 0) {
                     this.reader.reset();
                     this.index = startIndex;
@@ -408,11 +416,10 @@ public class JSONTokener {
                     return c;
                 }
             } while (c != to);
-        } catch (final IOException exc) {
+        } catch (IOException exception) {
-            throw new JSONException(exc);
+            throw new JSONException(exception);
         }
-
+        this.back();
-        back();
         return c;
     }
 
@@ -424,7 +431,7 @@ public class JSONTokener {
      * @return  A JSONException object, suitable for throwing
      */
     public JSONException syntaxError(String message) {
-        return new JSONException(message + toString());
+        return new JSONException(message + this.toString());
     }
 
 
@@ -435,6 +442,7 @@ public class JSONTokener {
      */
     @Override
     public String toString() {
-        return " at " + this.index + " [character " + this.character + " line " + this.line + "]";
+        return " at " + this.index + " [character " + this.character + " line " +
+            this.line + "]";
     }
 }