propane 3.1.0.pre-java → 3.2.0-java

data/src/main/java/processing/data/JSONObject.java

@@ -33,7 +33,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
-
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -111,95 +110,92 @@ import processing.core.PApplet;
  * @see PApplet#saveJSONArray(JSONArray, String)
  */
 public class JSONObject {
-  /**
-   * The maximum number of keys in the key pool.
-   */
-  private static final int keyPoolSize = 100;
-
-  /**
-   * Key pooling is like string interning, but without permanently tying up
-   * memory. To help conserve memory, storage of duplicated key strings in
-   * JSONObjects will be avoided by using a key pool to manage unique key
-   * string objects. This is used by JSONObject.put(string, object).
-   */
-  private static HashMap<String, Object> keyPool =
-    new HashMap<>(keyPoolSize);
-
-
-  // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
-
-
-  /**
-   * JSONObject.NULL is equivalent to the value that JavaScript calls null,
-   * whilst Java's null is equivalent to the value that JavaScript calls
-   * undefined.
-   */
-  private static final class Null {
+
     /**
-     * There is only intended to be a single instance of the NULL object,
-     * so the clone method returns itself.
-     * @return     NULL.
+     * The maximum number of keys in the key pool.
      */
-    @Override
-    protected final Object clone() {
-      return this;
-    }
+    private static final int keyPoolSize = 100;
 
     /**
-     * A Null object is equal to the null value and to itself.
-     * @param object    An object to test for nullness.
-     * @return true if the object parameter is the JSONObject.NULL object
-     *  or null.
+     * Key pooling is like string interning, but without permanently tying up
+     * memory. To help conserve memory, storage of duplicated key strings in
+     * JSONObjects will be avoided by using a key pool to manage unique key
+     * string objects. This is used by JSONObject.put(string, object).
      */
-    @Override
-    public boolean equals(Object object) {
-      return object == null || object == this;
-    }
+    private static HashMap<String, Object> keyPool
+            = new HashMap<>(keyPoolSize);
 
+    // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
     /**
-     * Get the "null" string value.
-     * @return The string "null".
+     * JSONObject.NULL is equivalent to the value that JavaScript calls null,
+     * whilst Java's null is equivalent to the value that JavaScript calls
+     * undefined.
      */
-    @Override
-    public String toString() {
-      return "null";
-    }
-
-    @Override
-    public int hashCode() {
-      // TODO Auto-generated method stub
-      return super.hashCode();
-    }
-  }
+    private static final class Null {
+
+        /**
+         * There is only intended to be a single instance of the NULL object, so
+         * the clone method returns itself.
+         *
+         * @return NULL.
+         */
+        @Override
+        protected final Object clone() {
+            return this;
+        }
 
+        /**
+         * A Null object is equal to the null value and to itself.
+         *
+         * @param object An object to test for nullness.
+         * @return true if the object parameter is the JSONObject.NULL object or
+         * null.
+         */
+        @Override
+        public boolean equals(Object object) {
+            return object == null || object == this;
+        }
 
-  // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
+        /**
+         * Get the "null" string value.
+         *
+         * @return The string "null".
+         */
+        @Override
+        public String toString() {
+            return "null";
+        }
 
+        @Override
+        public int hashCode() {
+            // TODO Auto-generated method stub
+            return super.hashCode();
+        }
+    }
 
-  /**
-   * The map where the JSONObject's properties are kept.
-   */
+    // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
+    /**
+     * The map where the JSONObject's properties are kept.
+     */
 //  private final Map map;
-  private final HashMap<String, Object> map;
-
-
-  /**
-   * It is sometimes more convenient and less ambiguous to have a
-   * <code>NULL</code> object than to use Java's <code>null</code> value.
-   * <code>JSONObject.NULL.equals(null)</code> returns <code>true</code>.
-   * <code>JSONObject.NULL.toString()</code> returns <code>"null"</code>.
-   */
-  public static final Object NULL = new Null();
+    private final HashMap<String, Object> map;
 
+    /**
+     * It is sometimes more convenient and less ambiguous to have a
+     * <code>NULL</code> object than to use Java's <code>null</code> value.
+     * <code>JSONObject.NULL.equals(null)</code> returns <code>true</code>.
+     * <code>JSONObject.NULL.toString()</code> returns <code>"null"</code>.
+     */
+    public static final Object NULL = new Null();
 
-  /**
-   * Construct an empty JSONObject.
-   * @nowebref
-   */
-  public JSONObject() {
-    this.map = new HashMap<>();
-  }
-
+    /**
+     * Construct an empty JSONObject.
+     *
+     * @nowebref
+     */
+    public JSONObject() {
+        this.map = new HashMap<>();
+    }
 
 //  /**
 //   * Construct a JSONObject from a subset of another JSONObject.
@@ -217,153 +213,144 @@ public class JSONObject {
 //      }
 //    }
 //  }
-
-
-  /**
-   * @nowebref
-   */
-  public JSONObject(Reader reader) {
-    this(new JSONTokener(reader));
-  }
-
-
-  /**
-   * Construct a JSONObject from a JSONTokener.
-   * @param x A JSONTokener object containing the source string.
-   * @throws RuntimeException If there is a syntax error in the source string
-   *  or a duplicated key.
-   */
-  protected JSONObject(JSONTokener x) {
-    this();
-    char c;
-    String key;
-
-    if (x.nextClean() != '{') {
-      throw new RuntimeException("A JSONObject text must begin with '{'");
+    /**
+     * @nowebref
+     */
+    public JSONObject(Reader reader) {
+        this(new JSONTokener(reader));
     }
-    for (;;) {
-      c = x.nextClean();
-      switch (c) {
-      case 0:
-        throw new RuntimeException("A JSONObject text must end with '}'");
-      case '}':
-        return;
-      default:
-        x.back();
-        key = x.nextValue().toString();
-      }
 
-      // The key is followed by ':'. We will also tolerate '=' or '=>'.
+    /**
+     * Construct a JSONObject from a JSONTokener.
+     *
+     * @param x A JSONTokener object containing the source string.
+     * @throws RuntimeException If there is a syntax error in the source string
+     * or a duplicated key.
+     */
+    protected JSONObject(JSONTokener x) {
+        this();
+        char c;
+        String key;
 
-      c = x.nextClean();
-      if (c == '=') {
-        if (x.next() != '>') {
-          x.back();
+        if (x.nextClean() != '{') {
+            throw new RuntimeException("A JSONObject text must begin with '{'");
         }
-      } else if (c != ':') {
-        throw new RuntimeException("Expected a ':' after a key");
-      }
-      this.putOnce(key, x.nextValue());
-
-      // Pairs are separated by ','. We will also tolerate ';'.
+        for (;;) {
+            c = x.nextClean();
+            switch (c) {
+                case 0:
+                    throw new RuntimeException("A JSONObject text must end with '}'");
+                case '}':
+                    return;
+                default:
+                    x.back();
+                    key = x.nextValue().toString();
+            }
 
-      switch (x.nextClean()) {
-      case ';':
-      case ',':
-        if (x.nextClean() == '}') {
-          return;
+            // The key is followed by ':'. We will also tolerate '=' or '=>'.
+            c = x.nextClean();
+            if (c == '=') {
+                if (x.next() != '>') {
+                    x.back();
+                }
+            } else if (c != ':') {
+                throw new RuntimeException("Expected a ':' after a key");
+            }
+            this.putOnce(key, x.nextValue());
+
+            // Pairs are separated by ','. We will also tolerate ';'.
+            switch (x.nextClean()) {
+                case ';':
+                case ',':
+                    if (x.nextClean() == '}') {
+                        return;
+                    }
+                    x.back();
+                    break;
+                case '}':
+                    return;
+                default:
+                    throw new RuntimeException("Expected a ',' or '}'");
+            }
         }
-        x.back();
-        break;
-      case '}':
-        return;
-      default:
-        throw new RuntimeException("Expected a ',' or '}'");
-      }
     }
-  }
-
-
-  /**
-   * Construct a JSONObject from a Map.
-   *
-   * @param map A map object that can be used to initialize the contents of
-   *  the JSONObject.
-   */
-  protected JSONObject(HashMap<String, Object> map) {
-    this.map = new HashMap<>();
-    if (map != null) {
-      Iterator i = map.entrySet().iterator();
-      while (i.hasNext()) {
-        Map.Entry e = (Map.Entry) i.next();
-        Object value = e.getValue();
-        if (value != null) {
-          map.put((String) e.getKey(), wrap(value));
+
+    /**
+     * Construct a JSONObject from a Map.
+     *
+     * @param map A map object that can be used to initialize the contents of
+     * the JSONObject.
+     */
+    protected JSONObject(HashMap<String, Object> map) {
+        this.map = new HashMap<>();
+        if (map != null) {
+            Iterator i = map.entrySet().iterator();
+            while (i.hasNext()) {
+                Map.Entry e = (Map.Entry) i.next();
+                Object value = e.getValue();
+                if (value != null) {
+                    map.put((String) e.getKey(), wrap(value));
+                }
+            }
         }
-      }
     }
-  }
-
 
-  /**
-   * @nowebref
-   */
-  public JSONObject(IntDict dict) {
-    map = new HashMap<>();
-    for (int i = 0; i < dict.size(); i++) {
-      setInt(dict.key(i), dict.value(i));
+    /**
+     * @nowebref
+     */
+    public JSONObject(IntDict dict) {
+        map = new HashMap<>();
+        for (int i = 0; i < dict.size(); i++) {
+            setInt(dict.key(i), dict.value(i));
+        }
     }
-  }
 
-
-  /**
-   * @nowebref
-   */
-  public JSONObject(FloatDict dict) {
-    map = new HashMap<>();
-    for (int i = 0; i < dict.size(); i++) {
-      setFloat(dict.key(i), dict.value(i));
+    /**
+     * @nowebref
+     */
+    public JSONObject(FloatDict dict) {
+        map = new HashMap<>();
+        for (int i = 0; i < dict.size(); i++) {
+            setFloat(dict.key(i), dict.value(i));
+        }
     }
-  }
 
+    /**
+     * @nowebref
+     */
+    public JSONObject(StringDict dict) {
+        map = new HashMap<>();
+        for (int i = 0; i < dict.size(); i++) {
+            setString(dict.key(i), dict.value(i));
+        }
+    }
 
-  /**
-   * @nowebref
-   */
-  public JSONObject(StringDict dict) {
-    map = new HashMap<>();
-    for (int i = 0; i < dict.size(); i++) {
-      setString(dict.key(i), dict.value(i));
+    /**
+     * Construct a JSONObject from an Object using bean getters. It reflects on
+     * all of the public methods of the object. For each of the methods with no
+     * parameters and a name starting with <code>"get"</code> or
+     * <code>"is"</code> followed by an uppercase letter, the method is invoked,
+     * and a key and the value returned from the getter method are put into the
+     * new JSONObject.
+     *
+     * The key is formed by removing the <code>"get"</code> or <code>"is"</code>
+     * prefix. If the second remaining character is not upper case, then the
+     * first character is converted to lower case.
+     *
+     * For example, if an object has a method named <code>"getName"</code>, and
+     * if the result of calling <code>object.getName()</code> is
+     * <code>"Larry Fine"</code>, then the JSONObject will contain
+     * <code>"name": "Larry Fine"</code>.
+     *
+     * @param bean An object that has getter methods that should be used to make
+     * a JSONObject.
+     */
+    protected JSONObject(Object bean) {
+        this();
+        this.populateMap(bean);
     }
-  }
-
-
-  /**
-   * Construct a JSONObject from an Object using bean getters.
-   * It reflects on all of the public methods of the object.
-   * For each of the methods with no parameters and a name starting
-   * with <code>"get"</code> or <code>"is"</code> followed by an uppercase letter,
-   * the method is invoked, and a key and the value returned from the getter method
-   * are put into the new JSONObject.
-   *
-   * The key is formed by removing the <code>"get"</code> or <code>"is"</code> prefix.
-   * If the second remaining character is not upper case, then the first
-   * character is converted to lower case.
-   *
-   * For example, if an object has a method named <code>"getName"</code>, and
-   * if the result of calling <code>object.getName()</code> is <code>"Larry Fine"</code>,
-   * then the JSONObject will contain <code>"name": "Larry Fine"</code>.
-   *
-   * @param bean An object that has getter methods that should be used
-   * to make a JSONObject.
-   */
-  protected JSONObject(Object bean) {
-    this();
-    this.populateMap(bean);
-  }
-
-
-  // holding off on this method until we decide on how to handle reflection
+
+    // holding off on this method until we decide on how to handle reflection
 //  /**
 //   * Construct a JSONObject from an Object, using reflection to find the
 //   * public members. The resulting JSONObject's keys will be the strings
@@ -386,21 +373,19 @@ public class JSONObject {
 //      }
 //    }
 //  }
-
-
-  /**
-   * Construct a JSONObject from a source JSON text string.
-   * This is the most commonly used JSONObject constructor.
-   * @param source    A string beginning
-   *  with <code>{</code>&nbsp;<small>(left brace)</small> and ending
-   *  with <code>}</code>&nbsp;<small>(right brace)</small>.
-   * @exception RuntimeException If there is a syntax error in the source
-   *  string or a duplicated key.
-   */
-  static public JSONObject parse(String source) {
-    return new JSONObject(new JSONTokener(source));
-  }
-
+    /**
+     * Construct a JSONObject from a source JSON text string. This is the most
+     * commonly used JSONObject constructor.
+     *
+     * @param source A string beginning with <code>{</code>&nbsp;<small>(left
+     * brace)</small> and ending with <code>}</code>&nbsp;<small>(right
+     * brace)</small>.
+     * @exception RuntimeException If there is a syntax error in the source
+     * string or a duplicated key.
+     */
+    static public JSONObject parse(String source) {
+        return new JSONObject(new JSONTokener(source));
+    }
 
 //  /**
 //   * Construct a JSONObject from a ResourceBundle.
@@ -440,8 +425,6 @@ public class JSONObject {
 //      }
 //    }
 //  }
-
-
 //  /**
 //   * Accumulate values under a key. It is similar to the put method except
 //   * that if there is already an object stored under the key then a
@@ -475,8 +458,6 @@ public class JSONObject {
 //    }
 //    return this;
 //  }
-
-
 //  /**
 //   * Append values to the array under a key. If the key does not exist in the
 //   * JSONObject, then the key is put in the JSONObject with its value being a
@@ -501,334 +482,315 @@ public class JSONObject {
 //    }
 //    return this;
 //  }
+    /**
+     * Produce a string from a double. The string "null" will be returned if the
+     * number is not finite.
+     *
+     * @param d A double.
+     * @return A String.
+     */
+    static protected String doubleToString(double d) {
+        if (Double.isInfinite(d) || Double.isNaN(d)) {
+            return "null";
+        }
 
-
-  /**
-   * Produce a string from a double. The string "null" will be returned if
-   * the number is not finite.
-   * @param  d A double.
-   * @return A String.
-   */
-  static protected String doubleToString(double d) {
-    if (Double.isInfinite(d) || Double.isNaN(d)) {
-      return "null";
+        // Shave off trailing zeros and decimal point, if possible.
+        String string = Double.toString(d);
+        if (string.indexOf('.') > 0 && string.indexOf('e') < 0
+                && string.indexOf('E') < 0) {
+            while (string.endsWith("0")) {
+                string = string.substring(0, string.length() - 1);
+            }
+            if (string.endsWith(".")) {
+                string = string.substring(0, string.length() - 1);
+            }
+        }
+        return string;
     }
 
-    // Shave off trailing zeros and decimal point, if possible.
-
-    String string = Double.toString(d);
-    if (string.indexOf('.') > 0 && string.indexOf('e') < 0 &&
-      string.indexOf('E') < 0) {
-      while (string.endsWith("0")) {
-        string = string.substring(0, string.length() - 1);
-      }
-      if (string.endsWith(".")) {
-        string = string.substring(0, string.length() - 1);
-      }
-    }
-    return string;
-  }
-
-
-  /**
-   * Get the value object associated with a key.
-   *
-   * @param key   A key string.
-   * @return      The object associated with the key.
-   * @throws      RuntimeException if the key is not found.
-   */
-  public Object get(String key) {
-    if (key == null) {
-      throw new RuntimeException("JSONObject.get(null) called");
-    }
-    Object object = this.opt(key);
-    if (object == null) {
-      // Adding for rev 0257 in line with other p5 api
-      return null;
-    }
-    if (object == null) {
-      throw new RuntimeException("JSONObject[" + quote(key) + "] not found");
-    }
-    return object;
-  }
-
-
-  /**
-   * Gets the String associated with a key
-   *
-   * @webref jsonobject:method
-   * @brief Gets the string value associated with a key
-   * @param key a key string
-   * @return A string which is the value.
-   * @throws RuntimeException if there is no string value for the key.
-   * @see JSONObject#getInt(String)
-   * @see JSONObject#getFloat(String)
-   * @see JSONObject#getBoolean(String)
-   */
-  public String getString(String key) {
-    Object object = this.get(key);
-    if (object == null) {
-      // Adding for rev 0257 in line with other p5 api
-      return null;
-    }
-    if (object instanceof String) {
-      return (String)object;
-    }
-    throw new RuntimeException("JSONObject[" + quote(key) + "] is not a string");
-  }
-
-
-  /**
-   * Get an optional string associated with a key.
-   * It returns the defaultValue if there is no such key.
-   *
-   * @param key   A key string.
-   * @param defaultValue     The default.
-   * @return      A string which is the value.
-   */
-  public String getString(String key, String defaultValue) {
-    Object object = this.opt(key);
-    return NULL.equals(object) ? defaultValue : object.toString();
-  }
-
-
-  /**
-   * Gets the int value associated with a key
-   *
-   * @webref jsonobject:method
-   * @brief Gets the int value associated with a key
-   * @param key A key string.
-   * @return The integer value.
-   * @throws RuntimeException if the key is not found or if the value cannot
-   *  be converted to an integer.
-   * @see JSONObject#getFloat(String)
-   * @see JSONObject#getString(String)
-   * @see JSONObject#getBoolean(String)
-   */
-  public int getInt(String key) {
-    Object object = this.get(key);
-    if (object == null) {
-      throw new RuntimeException("JSONObject[" + quote(key) + "] not found");
+    /**
+     * Get the value object associated with a key.
+     *
+     * @param key A key string.
+     * @return The object associated with the key.
+     * @throws RuntimeException if the key is not found.
+     */
+    public Object get(String key) {
+        if (key == null) {
+            throw new RuntimeException("JSONObject.get(null) called");
+        }
+        Object object = this.opt(key);
+        if (object == null) {
+            // Adding for rev 0257 in line with other p5 api
+            return null;
+        }
+        if (object == null) {
+            throw new RuntimeException("JSONObject[" + quote(key) + "] not found");
+        }
+        return object;
     }
-    try {
-      return object instanceof Number ?
-        ((Number)object).intValue() : Integer.parseInt((String)object);
-    } catch (Exception e) {
-      throw new RuntimeException("JSONObject[" + quote(key) + "] is not an int.");
+
+    /**
+     * Gets the String associated with a key
+     *
+     * @webref jsonobject:method
+     * @brief Gets the string value associated with a key
+     * @param key a key string
+     * @return A string which is the value.
+     * @throws RuntimeException if there is no string value for the key.
+     * @see JSONObject#getInt(String)
+     * @see JSONObject#getFloat(String)
+     * @see JSONObject#getBoolean(String)
+     */
+    public String getString(String key) {
+        Object object = this.get(key);
+        if (object == null) {
+            // Adding for rev 0257 in line with other p5 api
+            return null;
+        }
+        if (object instanceof String) {
+            return (String) object;
+        }
+        throw new RuntimeException("JSONObject[" + quote(key) + "] is not a string");
     }
-  }
-
-
-  /**
-   * Get an optional int value associated with a key,
-   * or the default if there is no such key or if the value is not a number.
-   * If the value is a string, an attempt will be made to evaluate it as
-   * a number.
-   *
-   * @param key   A key string.
-   * @param defaultValue     The default.
-   * @return      An object which is the value.
-   */
-  public int getInt(String key, int defaultValue) {
-    try {
-      return this.getInt(key);
-    } catch (Exception e) {
-      return defaultValue;
+
+    /**
+     * Get an optional string associated with a key. It returns the defaultValue
+     * if there is no such key.
+     *
+     * @param key A key string.
+     * @param defaultValue The default.
+     * @return A string which is the value.
+     */
+    public String getString(String key, String defaultValue) {
+        Object object = this.opt(key);
+        return NULL.equals(object) ? defaultValue : object.toString();
     }
-  }
-
-
-  /**
-   * Get the long value associated with a key.
-   *
-   * @param key   A key string.
-   * @return      The long value.
-   * @throws   RuntimeException if the key is not found or if the value cannot
-   *  be converted to a long.
-   */
-  public long getLong(String key) {
-    Object object = this.get(key);
-    try {
-      return object instanceof Number
-        ? ((Number)object).longValue()
-          : Long.parseLong((String)object);
-    } catch (Exception e) {
-      throw new RuntimeException("JSONObject[" + quote(key) + "] is not a long.", e);
+
+    /**
+     * Gets the int value associated with a key
+     *
+     * @webref jsonobject:method
+     * @brief Gets the int value associated with a key
+     * @param key A key string.
+     * @return The integer value.
+     * @throws RuntimeException if the key is not found or if the value cannot
+     * be converted to an integer.
+     * @see JSONObject#getFloat(String)
+     * @see JSONObject#getString(String)
+     * @see JSONObject#getBoolean(String)
+     */
+    public int getInt(String key) {
+        Object object = this.get(key);
+        if (object == null) {
+            throw new RuntimeException("JSONObject[" + quote(key) + "] not found");
+        }
+        try {
+            return object instanceof Number
+                    ? ((Number) object).intValue() : Integer.parseInt((String) object);
+        } catch (Exception e) {
+            throw new RuntimeException("JSONObject[" + quote(key) + "] is not an int.");
+        }
     }
-  }
-
-
-  /**
-   * Get an optional long value associated with a key,
-   * or the default if there is no such key or if the value is not a number.
-   * If the value is a string, an attempt will be made to evaluate it as
-   * a number.
-   *
-   * @param key          A key string.
-   * @param defaultValue The default.
-   * @return             An object which is the value.
-   */
-  public long getLong(String key, long defaultValue) {
-    try {
-      return this.getLong(key);
-    } catch (Exception e) {
-      return defaultValue;
+
+    /**
+     * Get an optional int value associated with a key, or the default if there
+     * is no such key or if the value is not a number. If the value is a string,
+     * an attempt will be made to evaluate it as a number.
+     *
+     * @param key A key string.
+     * @param defaultValue The default.
+     * @return An object which is the value.
+     */
+    public int getInt(String key, int defaultValue) {
+        try {
+            return this.getInt(key);
+        } catch (Exception e) {
+            return defaultValue;
+        }
     }
-  }
-
-
-  /**
-   * @webref jsonobject:method
-   * @brief Gets the float value associated with a key
-   * @param key a key string
-   * @see JSONObject#getInt(String)
-   * @see JSONObject#getString(String)
-   * @see JSONObject#getBoolean(String)
-   */
-  public float getFloat(String key) {
-    return (float) getDouble(key);
-  }
-
-
-  public float getFloat(String key, float defaultValue) {
-    try {
-      return getFloat(key);
-    } catch (Exception e) {
-      return defaultValue;
+
+    /**
+     * Get the long value associated with a key.
+     *
+     * @param key A key string.
+     * @return The long value.
+     * @throws RuntimeException if the key is not found or if the value cannot
+     * be converted to a long.
+     */
+    public long getLong(String key) {
+        Object object = this.get(key);
+        try {
+            return object instanceof Number
+                    ? ((Number) object).longValue()
+                    : Long.parseLong((String) object);
+        } catch (Exception e) {
+            throw new RuntimeException("JSONObject[" + quote(key) + "] is not a long.", e);
+        }
     }
-  }
-
-
-  /**
-   * Get the double value associated with a key.
-   * @param key   A key string.
-   * @return      The numeric value.
-   * @throws RuntimeException if the key is not found or
-   *  if the value is not a Number object and cannot be converted to a number.
-   */
-  public double getDouble(String key) {
-    Object object = this.get(key);
-    try {
-      return object instanceof Number
-        ? ((Number)object).doubleValue()
-          : Double.parseDouble((String)object);
-    } catch (Exception e) {
-      throw new RuntimeException("JSONObject[" + quote(key) + "] is not a number.");
+
+    /**
+     * Get an optional long value associated with a key, or the default if there
+     * is no such key or if the value is not a number. If the value is a string,
+     * an attempt will be made to evaluate it as a number.
+     *
+     * @param key A key string.
+     * @param defaultValue The default.
+     * @return An object which is the value.
+     */
+    public long getLong(String key, long defaultValue) {
+        try {
+            return this.getLong(key);
+        } catch (Exception e) {
+            return defaultValue;
+        }
     }
-  }
-
-
-  /**
-   * Get an optional double associated with a key, or the
-   * defaultValue if there is no such key or if its value is not a number.
-   * If the value is a string, an attempt will be made to evaluate it as
-   * a number.
-   *
-   * @param key   A key string.
-   * @param defaultValue     The default.
-   * @return      An object which is the value.
-   */
-  public double getDouble(String key, double defaultValue) {
-    try {
-      return this.getDouble(key);
-    } catch (Exception e) {
-      return defaultValue;
+
+    /**
+     * @webref jsonobject:method
+     * @brief Gets the float value associated with a key
+     * @param key a key string
+     * @see JSONObject#getInt(String)
+     * @see JSONObject#getString(String)
+     * @see JSONObject#getBoolean(String)
+     */
+    public float getFloat(String key) {
+        return (float) getDouble(key);
     }
-  }
-
-
-  /**
-   * Get the boolean value associated with a key.
-   *
-   * @webref jsonobject:method
-   * @brief Gets the boolean value associated with a key
-   * @param key a key string
-   * @return The truth.
-   * @throws RuntimeException if the value is not a Boolean or the String "true" or "false".
-   * @see JSONObject#getInt(String)
-   * @see JSONObject#getFloat(String)
-   * @see JSONObject#getString(String)
-   */
-  public boolean getBoolean(String key) {
-    Object object = this.get(key);
-    if (object.equals(Boolean.FALSE) ||
-      (object instanceof String &&
-        ((String)object).equalsIgnoreCase("false"))) {
-      return false;
-    } else if (object.equals(Boolean.TRUE) ||
-      (object instanceof String &&
-        ((String)object).equalsIgnoreCase("true"))) {
-      return true;
+
+    public float getFloat(String key, float defaultValue) {
+        try {
+            return getFloat(key);
+        } catch (Exception e) {
+            return defaultValue;
+        }
     }
-    throw new RuntimeException("JSONObject[" + quote(key) + "] is not a Boolean.");
-  }
-
-
-  /**
-   * Get an optional boolean associated with a key.
-   * It returns the defaultValue if there is no such key, or if it is not
-   * a Boolean or the String "true" or "false" (case insensitive).
-   *
-   * @param key              A key string.
-   * @param defaultValue     The default.
-   * @return      The truth.
-   */
-  public boolean getBoolean(String key, boolean defaultValue) {
-    try {
-      return this.getBoolean(key);
-    } catch (Exception e) {
-      return defaultValue;
+
+    /**
+     * Get the double value associated with a key.
+     *
+     * @param key A key string.
+     * @return The numeric value.
+     * @throws RuntimeException if the key is not found or if the value is not a
+     * Number object and cannot be converted to a number.
+     */
+    public double getDouble(String key) {
+        Object object = this.get(key);
+        try {
+            return object instanceof Number
+                    ? ((Number) object).doubleValue()
+                    : Double.parseDouble((String) object);
+        } catch (Exception e) {
+            throw new RuntimeException("JSONObject[" + quote(key) + "] is not a number.");
+        }
     }
-  }
-
-
-  /**
-   * Get the JSONArray value associated with a key.
-   *
-   * @webref jsonobject:method
-   * @brief Gets the JSONArray value associated with a key
-   * @param key a key string
-   * @return A JSONArray which is the value, or null if not present
-   * @throws RuntimeException if the value is not a JSONArray.
-   * @see JSONObject#getJSONObject(String)
-   * @see JSONObject#setJSONObject(String, JSONObject)
-   * @see JSONObject#setJSONArray(String, JSONArray)
-   */
-  public JSONArray getJSONArray(String key) {
-    Object object = this.get(key);
-    if (object == null) {
-      return null;
+
+    /**
+     * Get an optional double associated with a key, or the defaultValue if
+     * there is no such key or if its value is not a number. If the value is a
+     * string, an attempt will be made to evaluate it as a number.
+     *
+     * @param key A key string.
+     * @param defaultValue The default.
+     * @return An object which is the value.
+     */
+    public double getDouble(String key, double defaultValue) {
+        try {
+            return this.getDouble(key);
+        } catch (Exception e) {
+            return defaultValue;
+        }
     }
-    if (object instanceof JSONArray) {
-      return (JSONArray)object;
+
+    /**
+     * Get the boolean value associated with a key.
+     *
+     * @webref jsonobject:method
+     * @brief Gets the boolean value associated with a key
+     * @param key a key string
+     * @return The truth.
+     * @throws RuntimeException if the value is not a Boolean or the String
+     * "true" or "false".
+     * @see JSONObject#getInt(String)
+     * @see JSONObject#getFloat(String)
+     * @see JSONObject#getString(String)
+     */
+    public boolean getBoolean(String key) {
+        Object object = this.get(key);
+        if (object.equals(Boolean.FALSE)
+                || (object instanceof String
+                && ((String) object).equalsIgnoreCase("false"))) {
+            return false;
+        } else if (object.equals(Boolean.TRUE)
+                || (object instanceof String
+                && ((String) object).equalsIgnoreCase("true"))) {
+            return true;
+        }
+        throw new RuntimeException("JSONObject[" + quote(key) + "] is not a Boolean.");
     }
-    throw new RuntimeException("JSONObject[" + quote(key) + "] is not a JSONArray.");
-  }
-
-
-  /**
-   * Get the JSONObject value associated with a key.
-   *
-   * @webref jsonobject:method
-   * @brief Gets the JSONObject value associated with a key
-   * @param key a key string
-   * @return A JSONObject which is the value or null if not available.
-   * @throws RuntimeException if the value is not a JSONObject.
-   * @see JSONObject#getJSONArray(String)
-   * @see JSONObject#setJSONObject(String, JSONObject)
-   * @see JSONObject#setJSONArray(String, JSONArray)
-   */
-  public JSONObject getJSONObject(String key) {
-    Object object = this.get(key);
-    if (object == null) {
-      return null;
+
+    /**
+     * Get an optional boolean associated with a key. It returns the
+     * defaultValue if there is no such key, or if it is not a Boolean or the
+     * String "true" or "false" (case insensitive).
+     *
+     * @param key A key string.
+     * @param defaultValue The default.
+     * @return The truth.
+     */
+    public boolean getBoolean(String key, boolean defaultValue) {
+        try {
+            return this.getBoolean(key);
+        } catch (Exception e) {
+            return defaultValue;
+        }
     }
-    if (object instanceof JSONObject) {
-      return (JSONObject)object;
+
+    /**
+     * Get the JSONArray value associated with a key.
+     *
+     * @webref jsonobject:method
+     * @brief Gets the JSONArray value associated with a key
+     * @param key a key string
+     * @return A JSONArray which is the value, or null if not present
+     * @throws RuntimeException if the value is not a JSONArray.
+     * @see JSONObject#getJSONObject(String)
+     * @see JSONObject#setJSONObject(String, JSONObject)
+     * @see JSONObject#setJSONArray(String, JSONArray)
+     */
+    public JSONArray getJSONArray(String key) {
+        Object object = this.get(key);
+        if (object == null) {
+            return null;
+        }
+        if (object instanceof JSONArray) {
+            return (JSONArray) object;
+        }
+        throw new RuntimeException("JSONObject[" + quote(key) + "] is not a JSONArray.");
     }
-    throw new RuntimeException("JSONObject[" + quote(key) + "] is not a JSONObject.");
-  }
 
+    /**
+     * Get the JSONObject value associated with a key.
+     *
+     * @webref jsonobject:method
+     * @brief Gets the JSONObject value associated with a key
+     * @param key a key string
+     * @return A JSONObject which is the value or null if not available.
+     * @throws RuntimeException if the value is not a JSONObject.
+     * @see JSONObject#getJSONArray(String)
+     * @see JSONObject#setJSONObject(String, JSONObject)
+     * @see JSONObject#setJSONArray(String, JSONArray)
+     */
+    public JSONObject getJSONObject(String key) {
+        Object object = this.get(key);
+        if (object == null) {
+            return null;
+        }
+        if (object instanceof JSONObject) {
+            return (JSONObject) object;
+        }
+        throw new RuntimeException("JSONObject[" + quote(key) + "] is not a JSONObject.");
+    }
 
 //  /**
 //   * Get an array of field names from a JSONObject.
@@ -872,17 +834,15 @@ public class JSONObject {
 //    }
 //    return names;
 //  }
-
-
-  /**
-   * Determine if the JSONObject contains a specific key.
-   * @param key   A key string.
-   * @return      true if the key exists in the JSONObject.
-   */
-  public boolean hasKey(String key) {
-    return map.containsKey(key);
-  }
-
+    /**
+     * Determine if the JSONObject contains a specific key.
+     *
+     * @param key A key string.
+     * @return true if the key exists in the JSONObject.
+     */
+    public boolean hasKey(String key) {
+        return map.containsKey(key);
+    }
 
 //  /**
 //   * Increment a property of a JSONObject. If there is no such property,
@@ -910,52 +870,46 @@ public class JSONObject {
 //    }
 //    return this;
 //  }
+    /**
+     * Determine if the value associated with the key is null or if there is no
+     * value.
+     *
+     * @webref
+     * @param key A key string.
+     * @return true if there is no value associated with the key or if the value
+     * is the JSONObject.NULL object.
+     */
+    public boolean isNull(String key) {
+        return JSONObject.NULL.equals(this.opt(key));
+    }
 
-
-  /**
-   * Determine if the value associated with the key is null or if there is
-   * no value.
-   *
-   * @webref
-   * @param key   A key string.
-   * @return      true if there is no value associated with the key or if
-   *  the value is the JSONObject.NULL object.
-   */
-  public boolean isNull(String key) {
-    return JSONObject.NULL.equals(this.opt(key));
-  }
-
-
-  /**
-   * Get an enumeration of the keys of the JSONObject.
-   *
-   * @return An iterator of the keys.
-   */
-  public Iterator keyIterator() {
+    /**
+     * Get an enumeration of the keys of the JSONObject.
+     *
+     * @return An iterator of the keys.
+     */
+    public Iterator keyIterator() {
 //    return this.keySet().iterator();
-    return map.keySet().iterator();
-  }
-
-
-  /**
-   * Get a set of keys of the JSONObject.
-   *
-   * @return A keySet.
-   */
-  public Set keys() {
-    return this.map.keySet();
-  }
-
+        return map.keySet().iterator();
+    }
 
-  /**
-   * Get the number of keys stored in the JSONObject.
-   *
-   * @return The number of keys in the JSONObject.
-   */
-  public int size() {
-    return this.map.size();
-  }
+    /**
+     * Get a set of keys of the JSONObject.
+     *
+     * @return A keySet.
+     */
+    public Set keys() {
+        return this.map.keySet();
+    }
 
+    /**
+     * Get the number of keys stored in the JSONObject.
+     *
+     * @return The number of keys in the JSONObject.
+     */
+    public int size() {
+        return this.map.size();
+    }
 
 //  /**
 //   * Produce a JSONArray containing the names of the elements of this
@@ -971,45 +925,42 @@ public class JSONObject {
 //    }
 //    return ja.size() == 0 ? null : ja;
 //  }
-
-
-  /**
-   * Produce a string from a Number.
-   * @param  number A Number
-   * @return A String.
-   * @throws RuntimeException If number is null or a non-finite number.
-   */
-  private static String numberToString(Number number) {
-    if (number == null) {
-      throw new RuntimeException("Null pointer");
+    /**
+     * Produce a string from a Number.
+     *
+     * @param number A Number
+     * @return A String.
+     * @throws RuntimeException If number is null or a non-finite number.
+     */
+    private static String numberToString(Number number) {
+        if (number == null) {
+            throw new RuntimeException("Null pointer");
+        }
+        testValidity(number);
+
+        // Shave off trailing zeros and decimal point, if possible.
+        String string = number.toString();
+        if (string.indexOf('.') > 0 && string.indexOf('e') < 0
+                && string.indexOf('E') < 0) {
+            while (string.endsWith("0")) {
+                string = string.substring(0, string.length() - 1);
+            }
+            if (string.endsWith(".")) {
+                string = string.substring(0, string.length() - 1);
+            }
+        }
+        return string;
     }
-    testValidity(number);
 
-    // Shave off trailing zeros and decimal point, if possible.
-
-    String string = number.toString();
-    if (string.indexOf('.') > 0 && string.indexOf('e') < 0 &&
-      string.indexOf('E') < 0) {
-      while (string.endsWith("0")) {
-        string = string.substring(0, string.length() - 1);
-      }
-      if (string.endsWith(".")) {
-        string = string.substring(0, string.length() - 1);
-      }
+    /**
+     * Get an optional value associated with a key.
+     *
+     * @param key A key string.
+     * @return An object which is the value, or null if there is no value.
+     */
+    private Object opt(String key) {
+        return key == null ? null : this.map.get(key);
     }
-    return string;
-  }
-
-
-  /**
-   * Get an optional value associated with a key.
-   * @param key   A key string.
-   * @return      An object which is the value, or null if there is no value.
-   */
-  private Object opt(String key) {
-    return key == null ? null : this.map.get(key);
-  }
-
 
 //  /**
 //   * Get an optional boolean associated with a key.
@@ -1022,8 +973,6 @@ public class JSONObject {
 //  private boolean optBoolean(String key) {
 //    return this.optBoolean(key, false);
 //  }
-
-
 //  /**
 //   * Get an optional double associated with a key,
 //   * or NaN if there is no such key or if its value is not a number.
@@ -1036,8 +985,6 @@ public class JSONObject {
 //  private double optDouble(String key) {
 //    return this.optDouble(key, Double.NaN);
 //  }
-
-
 //  /**
 //   * Get an optional int value associated with a key,
 //   * or zero if there is no such key or if the value is not a number.
@@ -1050,8 +997,6 @@ public class JSONObject {
 //  private int optInt(String key) {
 //    return this.optInt(key, 0);
 //  }
-
-
 //  /**
 //   * Get an optional JSONArray associated with a key.
 //   * It returns null if there is no such key, or if its value is not a
@@ -1064,8 +1009,6 @@ public class JSONObject {
 //    Object o = this.opt(key);
 //    return o instanceof JSONArray ? (JSONArray)o : null;
 //  }
-
-
 //  /**
 //   * Get an optional JSONObject associated with a key.
 //   * It returns null if there is no such key, or if its value is not a
@@ -1078,8 +1021,6 @@ public class JSONObject {
 //    Object object = this.opt(key);
 //    return object instanceof JSONObject ? (JSONObject)object : null;
 //  }
-
-
 //  /**
 //   * Get an optional long value associated with a key,
 //   * or zero if there is no such key or if the value is not a number.
@@ -1092,8 +1033,6 @@ public class JSONObject {
 //  public long optLong(String key) {
 //    return this.optLong(key, 0);
 //  }
-
-
 //  /**
 //   * Get an optional string associated with a key.
 //   * It returns an empty string if there is no such key. If the value is not
@@ -1105,176 +1044,169 @@ public class JSONObject {
 //  public String optString(String key) {
 //    return this.optString(key, "");
 //  }
+    private void populateMap(Object bean) {
+        Class klass = bean.getClass();
+
+        // If klass is a System class then set includeSuperClass to false.
+        boolean includeSuperClass = klass.getClassLoader() != null;
+
+        Method[] methods = includeSuperClass
+                ? klass.getMethods()
+                : klass.getDeclaredMethods();
+        for (int i = 0; i < methods.length; i += 1) {
+            try {
+                Method method = methods[i];
+                if (Modifier.isPublic(method.getModifiers())) {
+                    String name = method.getName();
+                    String key = "";
+                    if (name.startsWith("get")) {
+                        if ("getClass".equals(name)
+                                || "getDeclaringClass".equals(name)) {
+                            key = "";
+                        } else {
+                            key = name.substring(3);
+                        }
+                    } else if (name.startsWith("is")) {
+                        key = name.substring(2);
+                    }
+                    if (key.length() > 0
+                            && Character.isUpperCase(key.charAt(0))
+                            && method.getParameterTypes().length == 0) {
+                        if (key.length() == 1) {
+                            key = key.toLowerCase();
+                        } else if (!Character.isUpperCase(key.charAt(1))) {
+                            key = key.substring(0, 1).toLowerCase()
+                                    + key.substring(1);
+                        }
+
+                        Object result = method.invoke(bean, (Object[]) null);
+                        if (result != null) {
+                            this.map.put(key, wrap(result));
+                        }
+                    }
+                }
+            } catch (Exception ignore) {
+            }
+        }
+    }
 
+    /**
+     * @webref jsonobject:method
+     * @brief Put a key/String pair in the JSONObject
+     * @param key a key string
+     * @param value the value to assign
+     * @see JSONObject#setInt(String, int)
+     * @see JSONObject#setFloat(String, float)
+     * @see JSONObject#setBoolean(String, boolean)
+     */
+    public JSONObject setString(String key, String value) {
+        return put(key, value);
+    }
 
-  private void populateMap(Object bean) {
-    Class klass = bean.getClass();
+    /**
+     * Put a key/int pair in the JSONObject.
+     *
+     * @webref jsonobject:method
+     * @brief Put a key/int pair in the JSONObject
+     * @param key a key string
+     * @param value the value to assign
+     * @return this.
+     * @throws RuntimeException If the key is null.
+     * @see JSONObject#setFloat(String, float)
+     * @see JSONObject#setString(String, String)
+     * @see JSONObject#setBoolean(String, boolean)
+     */
+    public JSONObject setInt(String key, int value) {
+        this.put(key, Integer.valueOf(value));
+        return this;
+    }
 
-    // If klass is a System class then set includeSuperClass to false.
+    /**
+     * Put a key/long pair in the JSONObject.
+     *
+     * @param key A key string.
+     * @param value A long which is the value.
+     * @return this.
+     * @throws RuntimeException If the key is null.
+     */
+    public JSONObject setLong(String key, long value) {
+        this.put(key, Long.valueOf(value));
+        return this;
+    }
 
-    boolean includeSuperClass = klass.getClassLoader() != null;
+    /**
+     * @webref jsonobject:method
+     * @brief Put a key/float pair in the JSONObject
+     * @param key a key string
+     * @param value the value to assign
+     * @throws RuntimeException If the key is null or if the number is NaN or
+     * infinite.
+     * @see JSONObject#setInt(String, int)
+     * @see JSONObject#setString(String, String)
+     * @see JSONObject#setBoolean(String, boolean)
+     */
+    public JSONObject setFloat(String key, float value) {
+        this.put(key, Double.valueOf(value));
+        return this;
+    }
 
-    Method[] methods = includeSuperClass
-      ? klass.getMethods()
-        : klass.getDeclaredMethods();
-      for (int i = 0; i < methods.length; i += 1) {
-        try {
-          Method method = methods[i];
-          if (Modifier.isPublic(method.getModifiers())) {
-            String name = method.getName();
-            String key = "";
-            if (name.startsWith("get")) {
-              if ("getClass".equals(name) ||
-                "getDeclaringClass".equals(name)) {
-                key = "";
-              } else {
-                key = name.substring(3);
-              }
-            } else if (name.startsWith("is")) {
-              key = name.substring(2);
-            }
-            if (key.length() > 0 &&
-              Character.isUpperCase(key.charAt(0)) &&
-              method.getParameterTypes().length == 0) {
-              if (key.length() == 1) {
-                key = key.toLowerCase();
-              } else if (!Character.isUpperCase(key.charAt(1))) {
-                key = key.substring(0, 1).toLowerCase() +
-                  key.substring(1);
-              }
-
-              Object result = method.invoke(bean, (Object[])null);
-              if (result != null) {
-                this.map.put(key, wrap(result));
-              }
-            }
-          }
-        } catch (Exception ignore) {
-        }
-      }
-  }
-
-
-  /**
-   * @webref jsonobject:method
-   * @brief Put a key/String pair in the JSONObject
-   * @param key a key string
-   * @param value the value to assign
-   * @see JSONObject#setInt(String, int)
-   * @see JSONObject#setFloat(String, float)
-   * @see JSONObject#setBoolean(String, boolean)
-   */
-  public JSONObject setString(String key, String value) {
-    return put(key, value);
-  }
-
-
-  /**
-   * Put a key/int pair in the JSONObject.
-   *
-   * @webref jsonobject:method
-   * @brief Put a key/int pair in the JSONObject
-   * @param key a key string
-   * @param value the value to assign
-   * @return this.
-   * @throws RuntimeException If the key is null.
-   * @see JSONObject#setFloat(String, float)
-   * @see JSONObject#setString(String, String)
-   * @see JSONObject#setBoolean(String, boolean)
-   */
-  public JSONObject setInt(String key, int value) {
-    this.put(key, Integer.valueOf(value));
-    return this;
-  }
-
-
-  /**
-   * Put a key/long pair in the JSONObject.
-   *
-   * @param key   A key string.
-   * @param value A long which is the value.
-   * @return this.
-   * @throws RuntimeException If the key is null.
-   */
-  public JSONObject setLong(String key, long value) {
-    this.put(key, Long.valueOf(value));
-    return this;
-  }
-
-  /**
-   * @webref jsonobject:method
-   * @brief Put a key/float pair in the JSONObject
-   * @param key a key string
-   * @param value the value to assign
-   * @throws RuntimeException If the key is null or if the number is NaN or infinite.
-   * @see JSONObject#setInt(String, int)
-   * @see JSONObject#setString(String, String)
-   * @see JSONObject#setBoolean(String, boolean)
-   */
-  public JSONObject setFloat(String key, float value) {
-    this.put(key, Double.valueOf(value));
-    return this;
-  }
-
-
-  /**
-   * Put a key/double pair in the JSONObject.
-   *
-   * @param key   A key string.
-   * @param value A double which is the value.
-   * @return this.
-   * @throws RuntimeException If the key is null or if the number is NaN or infinite.
-   */
-  public JSONObject setDouble(String key, double value) {
-    this.put(key, Double.valueOf(value));
-    return this;
-  }
-
-
-  /**
-   * Put a key/boolean pair in the JSONObject.
-   *
-   * @webref jsonobject:method
-   * @brief Put a key/boolean pair in the JSONObject
-   * @param key a key string
-   * @param value the value to assign
-   * @return this.
-   * @throws RuntimeException If the key is null.
-   * @see JSONObject#setInt(String, int)
-   * @see JSONObject#setFloat(String, float)
-   * @see JSONObject#setString(String, String)
-   */
-  public JSONObject setBoolean(String key, boolean value) {
-    this.put(key, value ? Boolean.TRUE : Boolean.FALSE);
-    return this;
-  }
-
-  /**
-   * @webref jsonobject:method
-   * @brief Sets the JSONObject value associated with a key
-   * @param key a key string
-   * @param value value to assign
-   * @see JSONObject#setJSONArray(String, JSONArray)
-   * @see JSONObject#getJSONObject(String)
-   * @see JSONObject#getJSONArray(String)
-   */
-  public JSONObject setJSONObject(String key, JSONObject value) {
-    return put(key, value);
-  }
-
-  /**
-   * @webref jsonobject:method
-   * @brief Sets the JSONArray value associated with a key
-   * @param key a key string
-   * @param value value to assign
-   * @see JSONObject#setJSONObject(String, JSONObject)
-   * @see JSONObject#getJSONObject(String)
-   * @see JSONObject#getJSONArray(String)
-   */
-  public JSONObject setJSONArray(String key, JSONArray value) {
-    return put(key, value);
-  }
+    /**
+     * Put a key/double pair in the JSONObject.
+     *
+     * @param key A key string.
+     * @param value A double which is the value.
+     * @return this.
+     * @throws RuntimeException If the key is null or if the number is NaN or
+     * infinite.
+     */
+    public JSONObject setDouble(String key, double value) {
+        this.put(key, Double.valueOf(value));
+        return this;
+    }
 
+    /**
+     * Put a key/boolean pair in the JSONObject.
+     *
+     * @webref jsonobject:method
+     * @brief Put a key/boolean pair in the JSONObject
+     * @param key a key string
+     * @param value the value to assign
+     * @return this.
+     * @throws RuntimeException If the key is null.
+     * @see JSONObject#setInt(String, int)
+     * @see JSONObject#setFloat(String, float)
+     * @see JSONObject#setString(String, String)
+     */
+    public JSONObject setBoolean(String key, boolean value) {
+        this.put(key, value ? Boolean.TRUE : Boolean.FALSE);
+        return this;
+    }
+
+    /**
+     * @webref jsonobject:method
+     * @brief Sets the JSONObject value associated with a key
+     * @param key a key string
+     * @param value value to assign
+     * @see JSONObject#setJSONArray(String, JSONArray)
+     * @see JSONObject#getJSONObject(String)
+     * @see JSONObject#getJSONArray(String)
+     */
+    public JSONObject setJSONObject(String key, JSONObject value) {
+        return put(key, value);
+    }
+
+    /**
+     * @webref jsonobject:method
+     * @brief Sets the JSONArray value associated with a key
+     * @param key a key string
+     * @param value value to assign
+     * @see JSONObject#setJSONObject(String, JSONObject)
+     * @see JSONObject#getJSONObject(String)
+     * @see JSONObject#getJSONArray(String)
+     */
+    public JSONObject setJSONArray(String key, JSONArray value) {
+        return put(key, value);
+    }
 
 //  /**
 //   * Put a key/value pair in the JSONObject, where the value will be a
@@ -1288,8 +1220,6 @@ public class JSONObject {
 //    this.put(key, new JSONArray(value));
 //    return this;
 //  }
-
-
 //  /**
 //   * Put a key/value pair in the JSONObject, where the value will be a
 //   * JSONObject which is produced from a Map.
@@ -1303,63 +1233,61 @@ public class JSONObject {
 //    this.put(key, new JSONObject(value));
 //    return this;
 //  }
-
-
-  /**
-   * Put a key/value pair in the JSONObject. If the value is null,
-   * then the key will be removed from the JSONObject if it is present.
-   * @param key   A key string.
-   * @param value An object which is the value. It should be of one of these
-   *  types: Boolean, Double, Integer, JSONArray, JSONObject, Long, String,
-   *  or the JSONObject.NULL object.
-   * @return this.
-   * @throws RuntimeException If the value is non-finite number
-   *  or if the key is null.
-   */
-  public JSONObject put(String key, Object value) {
-    String pooled;
-    if (key == null) {
-      throw new RuntimeException("Null key.");
-    }
-    if (value != null) {
-      testValidity(value);
-      pooled = (String)keyPool.get(key);
-      if (pooled == null) {
-        if (keyPool.size() >= keyPoolSize) {
-          keyPool = new HashMap<>(keyPoolSize);
+    /**
+     * Put a key/value pair in the JSONObject. If the value is null, then the
+     * key will be removed from the JSONObject if it is present.
+     *
+     * @param key A key string.
+     * @param value An object which is the value. It should be of one of these
+     * types: Boolean, Double, Integer, JSONArray, JSONObject, Long, String, or
+     * the JSONObject.NULL object.
+     * @return this.
+     * @throws RuntimeException If the value is non-finite number or if the key
+     * is null.
+     */
+    public JSONObject put(String key, Object value) {
+        String pooled;
+        if (key == null) {
+            throw new RuntimeException("Null key.");
         }
-        keyPool.put(key, key);
-      } else {
-        key = pooled;
-      }
-      this.map.put(key, value);
-    } else {
-      this.remove(key);
-    }
-    return this;
-  }
-
-
-  /**
-   * Put a key/value pair in the JSONObject, but only if the key and the
-   * value are both non-null, and only if there is not already a member
-   * with that name.
-   * @param key
-   * @param value
-   * @return {@code this}.
-   * @throws RuntimeException if the key is a duplicate, or if
-   * {@link #put(String,Object)} throws.
-   */
-  private JSONObject putOnce(String key, Object value) {
-    if (key != null && value != null) {
-      if (this.opt(key) != null) {
-        throw new RuntimeException("Duplicate key \"" + key + "\"");
-      }
-      this.put(key, value);
+        if (value != null) {
+            testValidity(value);
+            pooled = (String) keyPool.get(key);
+            if (pooled == null) {
+                if (keyPool.size() >= keyPoolSize) {
+                    keyPool = new HashMap<>(keyPoolSize);
+                }
+                keyPool.put(key, key);
+            } else {
+                key = pooled;
+            }
+            this.map.put(key, value);
+        } else {
+            this.remove(key);
+        }
+        return this;
     }
-    return this;
-  }
 
+    /**
+     * Put a key/value pair in the JSONObject, but only if the key and the value
+     * are both non-null, and only if there is not already a member with that
+     * name.
+     *
+     * @param key
+     * @param value
+     * @return {@code this}.
+     * @throws RuntimeException if the key is a duplicate, or if
+     * {@link #put(String,Object)} throws.
+     */
+    private JSONObject putOnce(String key, Object value) {
+        if (key != null && value != null) {
+            if (this.opt(key) != null) {
+                throw new RuntimeException("Duplicate key \"" + key + "\"");
+            }
+            this.put(key, value);
+        }
+        return this;
+    }
 
 //  /**
 //   * Put a key/value pair in the JSONObject, but only if the
@@ -1377,174 +1305,170 @@ public class JSONObject {
 //    }
 //    return this;
 //  }
+    /**
+     * Produce a string in double quotes with backslash sequences in all the
+     * right places. A backslash will be inserted within </, producing <\/,
+     * allowing JSON text to be delivered in HTML. In JSON text, a string cannot
+     * contain a control character or an unescaped quote or backslash. @param
+     * string A String @return A String correctly formatted for insertion in a
+     * JSON text.
+     */
+    static public String quote(String string) {
+        StringWriter sw = new StringWriter();
+        synchronized (sw.getBuffer()) {
+            try {
+                return quote(string, sw).toString();
+            } catch (IOException ignored) {
+                // will never happen - we are writing to a string writer
+                return "";
+            }
+        }
+    }
 
+    static public Writer quote(String string, Writer w) throws IOException {
+        if (string == null || string.length() == 0) {
+            w.write("\"\"");
+            return w;
+        }
 
-  /**
-   * Produce a string in double quotes with backslash sequences in all the
-   * right places. A backslash will be inserted within </, producing <\/,
-   * allowing JSON text to be delivered in HTML. In JSON text, a string
-   * cannot contain a control character or an unescaped quote or backslash.
-   * @param string A String
-   * @return  A String correctly formatted for insertion in a JSON text.
-   */
-  static public String quote(String string) {
-    StringWriter sw = new StringWriter();
-    synchronized (sw.getBuffer()) {
-      try {
-        return quote(string, sw).toString();
-      } catch (IOException ignored) {
-        // will never happen - we are writing to a string writer
-        return "";
-      }
+        char b;
+        char c = 0;
+        String hhhh;
+        int i;
+        int len = string.length();
+
+        w.write('"');
+        for (i = 0; i < len; i += 1) {
+            b = c;
+            c = string.charAt(i);
+            switch (c) {
+                case '\\':
+                case '"':
+                    w.write('\\');
+                    w.write(c);
+                    break;
+                case '/':
+                    if (b == '<') {
+                        w.write('\\');
+                    }
+                    w.write(c);
+                    break;
+                case '\b':
+                    w.write("\\b");
+                    break;
+                case '\t':
+                    w.write("\\t");
+                    break;
+                case '\n':
+                    w.write("\\n");
+                    break;
+                case '\f':
+                    w.write("\\f");
+                    break;
+                case '\r':
+                    w.write("\\r");
+                    break;
+                default:
+                    if (c < ' ' || (c >= '\u0080' && c < '\u00a0')
+                            || (c >= '\u2000' && c < '\u2100')) {
+                        w.write("\\u");
+                        hhhh = Integer.toHexString(c);
+                        w.write("0000", 0, 4 - hhhh.length());
+                        w.write(hhhh);
+                    } else {
+                        w.write(c);
+                    }
+            }
+        }
+        w.write('"');
+        return w;
     }
-  }
 
-  static public Writer quote(String string, Writer w) throws IOException {
-    if (string == null || string.length() == 0) {
-      w.write("\"\"");
-      return w;
+    /**
+     * Remove a name and its value, if present.
+     *
+     * @param key The name to be removed.
+     * @return The value that was associated with the name, or null if there was
+     * no value.
+     */
+    public Object remove(String key) {
+        return this.map.remove(key);
     }
 
-    char b;
-    char c = 0;
-    String hhhh;
-    int i;
-    int len = string.length();
-
-    w.write('"');
-    for (i = 0; i < len; i += 1) {
-      b = c;
-      c = string.charAt(i);
-      switch (c) {
-      case '\\':
-      case '"':
-        w.write('\\');
-        w.write(c);
-        break;
-      case '/':
-        if (b == '<') {
-          w.write('\\');
+    /**
+     * Try to convert a string into a number, boolean, or null. If the string
+     * can't be converted, return the string.
+     *
+     * @param string A String.
+     * @return A simple JSON value.
+     */
+    static protected Object stringToValue(String string) {
+        Double d;
+        if (string.equals("")) {
+            return string;
         }
-        w.write(c);
-        break;
-      case '\b':
-        w.write("\\b");
-        break;
-      case '\t':
-        w.write("\\t");
-        break;
-      case '\n':
-        w.write("\\n");
-        break;
-      case '\f':
-        w.write("\\f");
-        break;
-      case '\r':
-        w.write("\\r");
-        break;
-      default:
-        if (c < ' ' || (c >= '\u0080' && c < '\u00a0')
-          || (c >= '\u2000' && c < '\u2100')) {
-          w.write("\\u");
-          hhhh = Integer.toHexString(c);
-          w.write("0000", 0, 4 - hhhh.length());
-          w.write(hhhh);
-        } else {
-          w.write(c);
+        if (string.equalsIgnoreCase("true")) {
+            return Boolean.TRUE;
+        }
+        if (string.equalsIgnoreCase("false")) {
+            return Boolean.FALSE;
+        }
+        if (string.equalsIgnoreCase("null")) {
+            return JSONObject.NULL;
         }
-      }
-    }
-    w.write('"');
-    return w;
-  }
-
-
-  /**
-   * Remove a name and its value, if present.
-   * @param key The name to be removed.
-   * @return The value that was associated with the name,
-   * or null if there was no value.
-   */
-  public Object remove(String key) {
-    return this.map.remove(key);
-  }
-
-
-  /**
-   * Try to convert a string into a number, boolean, or null. If the string
-   * can't be converted, return the string.
-   * @param string A String.
-   * @return A simple JSON value.
-   */
-  static protected Object stringToValue(String string) {
-    Double d;
-    if (string.equals("")) {
-      return string;
-    }
-    if (string.equalsIgnoreCase("true")) {
-      return Boolean.TRUE;
-    }
-    if (string.equalsIgnoreCase("false")) {
-      return Boolean.FALSE;
-    }
-    if (string.equalsIgnoreCase("null")) {
-      return JSONObject.NULL;
-    }
 
-    /*
+        /*
      * If it might be a number, try converting it.
      * If a number cannot be produced, then the value will just
      * be a string. Note that the plus and implied string
      * conventions are non-standard. A JSON parser may accept
      * non-JSON forms as long as it accepts all correct JSON forms.
-     */
-
-    char b = string.charAt(0);
-    if ((b >= '0' && b <= '9') || b == '.' || b == '-' || b == '+') {
-      try {
-        if (string.indexOf('.') > -1 ||
-          string.indexOf('e') > -1 || string.indexOf('E') > -1) {
-          d = Double.valueOf(string);
-          if (!d.isInfinite() && !d.isNaN()) {
-            return d;
-          }
-        } else {
-          Long myLong = Long.valueOf(string);
-          if (myLong.longValue() == myLong.intValue()) {
-            return Integer.valueOf(myLong.intValue());
-          } else {
-            return myLong;
-          }
+         */
+        char b = string.charAt(0);
+        if ((b >= '0' && b <= '9') || b == '.' || b == '-' || b == '+') {
+            try {
+                if (string.indexOf('.') > -1
+                        || string.indexOf('e') > -1 || string.indexOf('E') > -1) {
+                    d = Double.valueOf(string);
+                    if (!d.isInfinite() && !d.isNaN()) {
+                        return d;
+                    }
+                } else {
+                    Long myLong = Long.valueOf(string);
+                    if (myLong.longValue() == myLong.intValue()) {
+                        return Integer.valueOf(myLong.intValue());
+                    } else {
+                        return myLong;
+                    }
+                }
+            } catch (Exception ignore) {
+            }
         }
-      }  catch (Exception ignore) {
-      }
+        return string;
     }
-    return string;
-  }
-
-
-  /**
-   * Throw an exception if the object is a NaN or infinite number.
-   * @param o The object to test. If not Float or Double, accepted without
-   *    exceptions.
-   * @throws RuntimeException If o is infinite or NaN.
-   */
-  static protected void testValidity(Object o) {
-    if (o != null) {
-      if (o instanceof Double) {
-        if (((Double)o).isInfinite() || ((Double)o).isNaN()) {
-          throw new RuntimeException(
-            "JSON does not allow non-finite numbers.");
-        }
-      } else if (o instanceof Float) {
-        if (((Float)o).isInfinite() || ((Float)o).isNaN()) {
-          throw new RuntimeException(
-            "JSON does not allow non-finite numbers.");
+
+    /**
+     * Throw an exception if the object is a NaN or infinite number.
+     *
+     * @param o The object to test. If not Float or Double, accepted without
+     * exceptions.
+     * @throws RuntimeException If o is infinite or NaN.
+     */
+    static protected void testValidity(Object o) {
+        if (o != null) {
+            if (o instanceof Double) {
+                if (((Double) o).isInfinite() || ((Double) o).isNaN()) {
+                    throw new RuntimeException(
+                            "JSON does not allow non-finite numbers.");
+                }
+            } else if (o instanceof Float) {
+                if (((Float) o).isInfinite() || ((Float) o).isNaN()) {
+                    throw new RuntimeException(
+                            "JSON does not allow non-finite numbers.");
+                }
+            }
         }
-      }
     }
-  }
-
 
 //  /**
 //   * Produce a JSONArray containing the values of the members of this
@@ -1564,108 +1488,101 @@ public class JSONObject {
 //    }
 //    return ja;
 //  }
-
-
 //  protected boolean save(OutputStream output) {
 //    return save(PApplet.createWriter(output));
 //  }
+    public boolean save(File file, String options) {
+        PrintWriter writer = PApplet.createWriter(file);
+        boolean success = write(writer, options);
+        writer.close();
+        return success;
+    }
 
+    public boolean write(PrintWriter output) {
+        return write(output, null);
+    }
 
-  public boolean save(File file, String options) {
-    PrintWriter writer = PApplet.createWriter(file);
-    boolean success = write(writer, options);
-    writer.close();
-    return success;
-  }
-
-
-  public boolean write(PrintWriter output) {
-    return write(output, null);
-  }
-
-
-  public boolean write(PrintWriter output, String options) {
-    int indentFactor = 2;
-    if (options != null) {
-      String[] opts = PApplet.split(options, ',');
-      for (String opt : opts) {
-        if (opt.equals("compact")) {
-          indentFactor = -1;
-        } else if (opt.startsWith("indent=")) {
-          indentFactor = PApplet.parseInt(opt.substring(7), -2);
-          if (indentFactor == -2) {
-            throw new IllegalArgumentException("Could not read a number from " + opt);
-          }
-        } else {
-          System.err.println("Ignoring " + opt);
+    public boolean write(PrintWriter output, String options) {
+        int indentFactor = 2;
+        if (options != null) {
+            String[] opts = PApplet.split(options, ',');
+            for (String opt : opts) {
+                if (opt.equals("compact")) {
+                    indentFactor = -1;
+                } else if (opt.startsWith("indent=")) {
+                    indentFactor = PApplet.parseInt(opt.substring(7), -2);
+                    if (indentFactor == -2) {
+                        throw new IllegalArgumentException("Could not read a number from " + opt);
+                    }
+                } else {
+                    System.err.println("Ignoring " + opt);
+                }
+            }
         }
-      }
+        output.print(format(indentFactor));
+        output.flush();
+        return true;
     }
-    output.print(format(indentFactor));
-    output.flush();
-    return true;
-  }
-
-
-  /**
-   * Return the JSON data formatted with two spaces for indents.
-   * Chosen to do this since it's the most common case (e.g. with println()).
-   * Same as format(2). Use the format() function for more options.
-   */
-  @Override
-  public String toString() {
-    try {
-      return format(2);
-    } catch (Exception e) {
-      return null;
-    }
-  }
-
-
-  /**
-   * Make a prettyprinted JSON text of this JSONObject.
-   * <p>
-   * Warning: This method assumes that the data structure is acyclical.
-   * @param indentFactor The number of spaces to add to each level of
-   *  indentation.
-   * @return a printable, displayable, portable, transmittable
-   *  representation of the object, beginning
-   *  with <code>{</code>&nbsp;<small>(left brace)</small> and ending
-   *  with <code>}</code>&nbsp;<small>(right brace)</small>.
-   * @throws RuntimeException If the object contains an invalid number.
-   */
-  public String format(int indentFactor) {
-    StringWriter w = new StringWriter();
-    synchronized (w.getBuffer()) {
-      return this.writeInternal(w, indentFactor, 0).toString();
+
+    /**
+     * Return the JSON data formatted with two spaces for indents. Chosen to do
+     * this since it's the most common case (e.g. with println()). Same as
+     * format(2). Use the format() function for more options.
+     */
+    @Override
+    public String toString() {
+        try {
+            return format(2);
+        } catch (Exception e) {
+            return null;
+        }
     }
-  }
-
-  /**
-   * Make a JSON text of an Object value. If the object has an
-   * value.toJSONString() method, then that method will be used to produce
-   * the JSON text. The method is required to produce a strictly
-   * conforming text. If the object does not contain a toJSONString
-   * method (which is the most common case), then a text will be
-   * produced by other means. If the value is an array or Collection,
-   * then a JSONArray will be made from it and its toJSONString method
-   * will be called. If the value is a MAP, then a JSONObject will be made
-   * from it and its toJSONString method will be called. Otherwise, the
-   * value's toString method will be called, and the result will be quoted.
-   *
-   * <p>
-   * Warning: This method assumes that the data structure is acyclical.
-   * @param value The value to be serialized.
-   * @return a printable, displayable, transmittable
-   *  representation of the object, beginning
-   *  with <code>{</code>&nbsp;<small>(left brace)</small> and ending
-   *  with <code>}</code>&nbsp;<small>(right brace)</small>.
-   * @throws RuntimeException If the value is or contains an invalid number.
-   */
-  static protected String valueToString(Object value) {
-    if (value == null || value.equals(null)) {
-      return "null";
+
+    /**
+     * Make a prettyprinted JSON text of this JSONObject.
+     * <p>
+     * Warning: This method assumes that the data structure is acyclical.
+     *
+     * @param indentFactor The number of spaces to add to each level of
+     * indentation.
+     * @return a printable, displayable, portable, transmittable representation
+     * of the object, beginning with <code>{</code>&nbsp;<small>(left
+     * brace)</small> and ending with <code>}</code>&nbsp;<small>(right
+     * brace)</small>.
+     * @throws RuntimeException If the object contains an invalid number.
+     */
+    public String format(int indentFactor) {
+        StringWriter w = new StringWriter();
+        synchronized (w.getBuffer()) {
+            return this.writeInternal(w, indentFactor, 0).toString();
+        }
     }
+
+    /**
+     * Make a JSON text of an Object value. If the object has an
+     * value.toJSONString() method, then that method will be used to produce the
+     * JSON text. The method is required to produce a strictly conforming text.
+     * If the object does not contain a toJSONString method (which is the most
+     * common case), then a text will be produced by other means. If the value
+     * is an array or Collection, then a JSONArray will be made from it and its
+     * toJSONString method will be called. If the value is a MAP, then a
+     * JSONObject will be made from it and its toJSONString method will be
+     * called. Otherwise, the value's toString method will be called, and the
+     * result will be quoted.
+     *
+     * <p>
+     * Warning: This method assumes that the data structure is acyclical.
+     *
+     * @param value The value to be serialized.
+     * @return a printable, displayable, transmittable representation of the
+     * object, beginning with <code>{</code>&nbsp;<small>(left brace)</small>
+     * and ending with <code>}</code>&nbsp;<small>(right brace)</small>.
+     * @throws RuntimeException If the value is or contains an invalid number.
+     */
+    static protected String valueToString(Object value) {
+        if (value == null || value.equals(null)) {
+            return "null";
+        }
 //    if (value instanceof JSONString) {
 //      Object object;
 //      try {
@@ -1678,78 +1595,74 @@ public class JSONObject {
 //      }
 //      throw new RuntimeException("Bad value from toJSONString: " + object);
 //    }
-    if (value instanceof Number) {
-      return numberToString((Number) value);
-    }
-    if (value instanceof Boolean || value instanceof JSONObject ||
-      value instanceof JSONArray) {
-      return value.toString();
-    }
-    if (value instanceof Map) {
-      return new JSONObject(value).toString();
-    }
-    if (value instanceof Collection) {
-      return new JSONArray(value).toString();
-    }
-    if (value.getClass().isArray()) {
-      return new JSONArray(value).toString();
+        if (value instanceof Number) {
+            return numberToString((Number) value);
+        }
+        if (value instanceof Boolean || value instanceof JSONObject
+                || value instanceof JSONArray) {
+            return value.toString();
+        }
+        if (value instanceof Map) {
+            return new JSONObject(value).toString();
+        }
+        if (value instanceof Collection) {
+            return new JSONArray(value).toString();
+        }
+        if (value.getClass().isArray()) {
+            return new JSONArray(value).toString();
+        }
+        return quote(value.toString());
     }
-    return quote(value.toString());
-  }
-
-  /**
-   * Wrap an object, if necessary. If the object is null, return the NULL
-   * object. If it is an array or collection, wrap it in a JSONArray. If
-   * it is a map, wrap it in a JSONObject. If it is a standard property
-   * (Double, String, et al) then it is already wrapped. Otherwise, if it
-   * comes from one of the java packages, turn it into a string. And if
-   * it doesn't, try to wrap it in a JSONObject. If the wrapping fails,
-   * then null is returned.
-   *
-   * @param object The object to wrap
-   * @return The wrapped value
-   */
-  static protected Object wrap(Object object) {
-    try {
-      if (object == null) {
-        return NULL;
-      }
-      if (object instanceof JSONObject || object instanceof JSONArray  ||
-        NULL.equals(object)      || /*object instanceof JSONString ||*/
-        object instanceof Byte   || object instanceof Character  ||
-        object instanceof Short  || object instanceof Integer    ||
-        object instanceof Long   || object instanceof Boolean    ||
-        object instanceof Float  || object instanceof Double     ||
-        object instanceof String) {
-        return object;
-      }
 
-      if (object instanceof Collection) {
-        return new JSONArray(object);
-      }
-      if (object.getClass().isArray()) {
-        return new JSONArray(object);
-      }
-      if (object instanceof Map) {
-        return new JSONObject(object);
-      }
-      Package objectPackage = object.getClass().getPackage();
-      String objectPackageName = objectPackage != null
-        ? objectPackage.getName()
-          : "";
-        if (
-          objectPackageName.startsWith("java.") ||
-          objectPackageName.startsWith("javax.") ||
-          object.getClass().getClassLoader() == null
-          ) {
-          return object.toString();
+    /**
+     * Wrap an object, if necessary. If the object is null, return the NULL
+     * object. If it is an array or collection, wrap it in a JSONArray. If it is
+     * a map, wrap it in a JSONObject. If it is a standard property (Double,
+     * String, et al) then it is already wrapped. Otherwise, if it comes from
+     * one of the java packages, turn it into a string. And if it doesn't, try
+     * to wrap it in a JSONObject. If the wrapping fails, then null is returned.
+     *
+     * @param object The object to wrap
+     * @return The wrapped value
+     */
+    static protected Object wrap(Object object) {
+        try {
+            if (object == null) {
+                return NULL;
+            }
+            if (object instanceof JSONObject || object instanceof JSONArray
+                    || NULL.equals(object)
+                    || /*object instanceof JSONString ||*/ object instanceof Byte || object instanceof Character
+                    || object instanceof Short || object instanceof Integer
+                    || object instanceof Long || object instanceof Boolean
+                    || object instanceof Float || object instanceof Double
+                    || object instanceof String) {
+                return object;
+            }
+
+            if (object instanceof Collection) {
+                return new JSONArray(object);
+            }
+            if (object.getClass().isArray()) {
+                return new JSONArray(object);
+            }
+            if (object instanceof Map) {
+                return new JSONObject(object);
+            }
+            Package objectPackage = object.getClass().getPackage();
+            String objectPackageName = objectPackage != null
+                    ? objectPackage.getName()
+                    : "";
+            if (objectPackageName.startsWith("java.")
+                    || objectPackageName.startsWith("javax.")
+                    || object.getClass().getClassLoader() == null) {
+                return object.toString();
+            }
+            return new JSONObject(object);
+        } catch (Exception exception) {
+            return null;
         }
-        return new JSONObject(object);
-    } catch(Exception exception) {
-      return null;
     }
-  }
-
 
 //  /**
 //   * Write the contents of the JSONObject as JSON text to a writer.
@@ -1763,28 +1676,26 @@ public class JSONObject {
 //  protected Writer write(Writer writer) {
 //    return this.write(writer, 0, 0);
 //  }
-
-
-  static final Writer writeValue(Writer writer, Object value,
-                                 int indentFactor, int indent) throws IOException {
-    if (value == null || value.equals(null)) {
-      writer.write("null");
-    } else if (value instanceof JSONObject) {
-      ((JSONObject) value).writeInternal(writer, indentFactor, indent);
-    } else if (value instanceof JSONArray) {
-      ((JSONArray) value).writeInternal(writer, indentFactor, indent);
-    } else if (value instanceof Map) {
-      new JSONObject(value).writeInternal(writer, indentFactor, indent);
-    } else if (value instanceof Collection) {
-      new JSONArray(value).writeInternal(writer, indentFactor,
-                                              indent);
-    } else if (value.getClass().isArray()) {
-      new JSONArray(value).writeInternal(writer, indentFactor, indent);
-    } else if (value instanceof Number) {
-      writer.write(numberToString((Number) value));
-    } else if (value instanceof Boolean) {
-      writer.write(value.toString());
-      /*
+    static final Writer writeValue(Writer writer, Object value,
+            int indentFactor, int indent) throws IOException {
+        if (value == null || value.equals(null)) {
+            writer.write("null");
+        } else if (value instanceof JSONObject) {
+            ((JSONObject) value).writeInternal(writer, indentFactor, indent);
+        } else if (value instanceof JSONArray) {
+            ((JSONArray) value).writeInternal(writer, indentFactor, indent);
+        } else if (value instanceof Map) {
+            new JSONObject(value).writeInternal(writer, indentFactor, indent);
+        } else if (value instanceof Collection) {
+            new JSONArray(value).writeInternal(writer, indentFactor,
+                    indent);
+        } else if (value.getClass().isArray()) {
+            new JSONArray(value).writeInternal(writer, indentFactor, indent);
+        } else if (value instanceof Number) {
+            writer.write(numberToString((Number) value));
+        } else if (value instanceof Boolean) {
+            writer.write(value.toString());
+            /*
     } else if (value instanceof JSONString) {
       Object o;
       try {
@@ -1793,78 +1704,76 @@ public class JSONObject {
         throw new RuntimeException(e);
       }
       writer.write(o != null ? o.toString() : quote(value.toString()));
-      */
-    } else {
-      quote(value.toString(), writer);
+             */
+        } else {
+            quote(value.toString(), writer);
+        }
+        return writer;
     }
-    return writer;
-  }
 
-
-  static final void indent(Writer writer, int indent) throws IOException {
-    for (int i = 0; i < indent; i += 1) {
-      writer.write(' ');
-    }
-  }
-
-  /**
-   * Write the contents of the JSONObject as JSON text to a writer.
-   * <p>
-   * Warning: This method assumes that the data structure is acyclical.
-   *
-   * @return The writer.
-   * @throws RuntimeException
-   */
-  protected Writer writeInternal(Writer writer, int indentFactor, int indent) {
-    try {
-      boolean commanate = false;
-      final int length = this.size();
-      Iterator keys = this.keyIterator();
-      writer.write('{');
-
-      int actualFactor = (indentFactor == -1) ? 0 : indentFactor;
-
-      if (length == 1) {
-        Object key = keys.next();
-        writer.write(quote(key.toString()));
-        writer.write(':');
-        if (actualFactor > 0) {
-          writer.write(' ');
-        }
-        //writeValue(writer, this.map.get(key), actualFactor, indent);
-        writeValue(writer, this.map.get(key), indentFactor, indent);
-      } else if (length != 0) {
-        final int newIndent = indent + actualFactor;
-        while (keys.hasNext()) {
-          Object key = keys.next();
-          if (commanate) {
-            writer.write(',');
-          }
-          if (indentFactor != -1) {
-            writer.write('\n');
-          }
-          indent(writer, newIndent);
-          writer.write(quote(key.toString()));
-          writer.write(':');
-          if (actualFactor > 0) {
+    static final void indent(Writer writer, int indent) throws IOException {
+        for (int i = 0; i < indent; i += 1) {
             writer.write(' ');
-          }
-          //writeValue(writer, this.map.get(key), actualFactor, newIndent);
-          writeValue(writer, this.map.get(key), indentFactor, newIndent);
-          commanate = true;
         }
-        if (indentFactor != -1) {
-          writer.write('\n');
-        }
-        indent(writer, indent);
-      }
-      writer.write('}');
-      return writer;
-    } catch (IOException exception) {
-      throw new RuntimeException(exception);
     }
-  }
 
+    /**
+     * Write the contents of the JSONObject as JSON text to a writer.
+     * <p>
+     * Warning: This method assumes that the data structure is acyclical.
+     *
+     * @return The writer.
+     * @throws RuntimeException
+     */
+    protected Writer writeInternal(Writer writer, int indentFactor, int indent) {
+        try {
+            boolean commanate = false;
+            final int length = this.size();
+            Iterator keys = this.keyIterator();
+            writer.write('{');
+
+            int actualFactor = (indentFactor == -1) ? 0 : indentFactor;
+
+            if (length == 1) {
+                Object key = keys.next();
+                writer.write(quote(key.toString()));
+                writer.write(':');
+                if (actualFactor > 0) {
+                    writer.write(' ');
+                }
+                //writeValue(writer, this.map.get(key), actualFactor, indent);
+                writeValue(writer, this.map.get(key), indentFactor, indent);
+            } else if (length != 0) {
+                final int newIndent = indent + actualFactor;
+                while (keys.hasNext()) {
+                    Object key = keys.next();
+                    if (commanate) {
+                        writer.write(',');
+                    }
+                    if (indentFactor != -1) {
+                        writer.write('\n');
+                    }
+                    indent(writer, newIndent);
+                    writer.write(quote(key.toString()));
+                    writer.write(':');
+                    if (actualFactor > 0) {
+                        writer.write(' ');
+                    }
+                    //writeValue(writer, this.map.get(key), actualFactor, newIndent);
+                    writeValue(writer, this.map.get(key), indentFactor, newIndent);
+                    commanate = true;
+                }
+                if (indentFactor != -1) {
+                    writer.write('\n');
+                }
+                indent(writer, indent);
+            }
+            writer.write('}');
+            return writer;
+        } catch (IOException exception) {
+            throw new RuntimeException(exception);
+        }
+    }
 
 //  // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 //
@@ -1879,11 +1788,7 @@ public class JSONObject {
 //      super(throwable);
 //    }
 //  }
-
-
-  // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
-
-
+    // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 //  /**
 //   * Get the hex value of a character (base16).
 //   * @param c A character between '0' and '9' or between 'A' and 'F' or
@@ -1902,8 +1807,6 @@ public class JSONObject {
 //    }
 //    return -1;
 //  }
-
-
 //  static class JSONTokener {
 //    private long    character;
 //    private boolean eof;