value) throws JSONException
- {
- this.put(index, new JSONObject(value));
- return this;
- }
-
- /**
- * Put or replace an object value in the JSONArray. If the index is greater
- * than the length of the JSONArray, then null elements will be added as
- * necessary to pad it out.
- *
- * @param index
- * The subscript.
- * @param value
- * The value to put into the array. The value should be a
- * Boolean, Double, Integer, JSONArray, JSONObject, Long, or
- * String, or the JSONObject.NULL object.
- * @return this.
- * @throws JSONException
- * If the index is negative or if the the value is an invalid
- * number.
- */
- public JSONArray put(int index, Object value) throws JSONException
- {
- JSONObject.testValidity(value);
- if(index < 0)
- {
- throw new JSONException("JSONArray[" + index + "] not found.");
- }
- if(index < this.length())
- {
- this.myArrayList.set(index, value);
- } else
- {
- while(index != this.length())
- {
- this.put(JSONObject.NULL);
- }
- this.put(value);
- }
- return this;
- }
-
- /**
- * Remove an index and close the hole.
- *
- * @param index
- * The index of the element to be removed.
- * @return The value that was associated with the index, or null if there
- * was no value.
- */
- public Object remove(int index)
- {
- return index >= 0 && index < this.length() ? this.myArrayList.remove(index) : null;
- }
-
- /**
- * Determine if two JSONArrays are similar. They must contain similar
- * sequences.
- *
- * @param other
- * The other JSONArray
- * @return true if they are equal
- */
- public boolean similar(Object other)
- {
- if(!(other instanceof JSONArray))
- {
- return false;
- }
- int len = this.length();
- if(len != ((JSONArray) other).length())
- {
- return false;
- }
- for(int i = 0; i < len; i += 1)
- {
- Object valueThis = this.get(i);
- Object valueOther = ((JSONArray) other).get(i);
- if(valueThis instanceof JSONObject)
- {
- if(!((JSONObject) valueThis).similar(valueOther))
- {
- return false;
- }
- } else if(valueThis instanceof JSONArray)
- {
- if(!((JSONArray) valueThis).similar(valueOther))
- {
- return false;
- }
- } else if(!valueThis.equals(valueOther))
- {
- return false;
- }
- }
- return true;
- }
-
- /**
- * Produce a JSONObject by combining a JSONArray of names with the values of
- * this JSONArray.
- *
- * @param names
- * A JSONArray containing a list of key strings. These will be
- * paired with the values.
- * @return A JSONObject, or null if there are no names or if this JSONArray
- * has no values.
- * @throws JSONException
- * If any of the names are null.
- */
- public JSONObject toJSONObject(JSONArray names) throws JSONException
- {
- if(names == null || names.length() == 0 || this.length() == 0)
- {
- return null;
- }
- JSONObject jo = new JSONObject();
- for(int i = 0; i < names.length(); i += 1)
- {
- jo.put(names.getString(i), this.opt(i));
- }
- return jo;
- }
-
- /**
- * Make a JSON text of this JSONArray. For compactness, no unnecessary
- * whitespace is added. If it is not possible to produce a syntactically
- * correct JSON text then null will be returned instead. This could occur if
- * the array contains an invalid number.
- *
- * Warning: This method assumes that the data structure is acyclical.
- *
- * @return a printable, displayable, transmittable representation of the
- * array.
- */
- @Override
- public String toString()
- {
- try
- {
- return this.toString(0);
- } catch(Exception e)
- {
- return null;
- }
- }
-
- /**
- * Make a prettyprinted JSON text of this JSONArray. 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, transmittable representation of the
- * object, beginning with [ (left
- * bracket) and ending with ]
- * (right bracket) .
- * @throws JSONException
- */
- public String toString(int indentFactor) throws JSONException
- {
- StringWriter sw = new StringWriter();
- synchronized(sw.getBuffer())
- {
- return this.write(sw, indentFactor, 0).toString();
- }
- }
-
- /**
- * Write the contents of the JSONArray as JSON text to a writer. For
- * compactness, no whitespace is added.
- *
- * Warning: This method assumes that the data structure is acyclical.
- *
- * @return The writer.
- * @throws JSONException
- */
- public Writer write(Writer writer) throws JSONException
- {
- return this.write(writer, 0, 0);
- }
-
- /**
- * Write the contents of the JSONArray as JSON text to a writer. For
- * compactness, no whitespace is added.
- *
- * Warning: This method assumes that the data structure is acyclical.
- *
- * @param indentFactor
- * The number of spaces to add to each level of indentation.
- * @param indent
- * The indention of the top level.
- * @return The writer.
- * @throws JSONException
- */
- Writer write(Writer writer, int indentFactor, int indent) throws JSONException
- {
- try
- {
- boolean commanate = false;
- int length = this.length();
- writer.write('[');
-
- if(length == 1)
- {
- JSONObject.writeValue(writer, this.myArrayList.get(0), indentFactor, indent);
- } else if(length != 0)
- {
- final int newindent = indent + indentFactor;
-
- for(int i = 0; i < length; i += 1)
- {
- if(commanate)
- {
- writer.write(',');
- }
- if(indentFactor > 0)
- {
- writer.write('\n');
- }
- JSONObject.indent(writer, newindent);
- JSONObject.writeValue(writer, this.myArrayList.get(i), indentFactor, newindent);
- commanate = true;
- }
- if(indentFactor > 0)
- {
- writer.write('\n');
- }
- JSONObject.indent(writer, indent);
- }
- writer.write(']');
- return writer;
- } catch(IOException e)
- {
- throw new JSONException(e);
- }
- }
-}
diff --git a/src/main/java/ninja/bytecode/iris/util/JSONException.java b/src/main/java/ninja/bytecode/iris/util/JSONException.java
deleted file mode 100644
index d2364e501..000000000
--- a/src/main/java/ninja/bytecode/iris/util/JSONException.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package ninja.bytecode.iris.util;
-
-
-/**
- * The JSONException is thrown by the JSON.org classes when things are amiss.
- *
- * @author JSON.org
- * @version 2014-05-03
- */
-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.
- */
- public JSONException(String message)
- {
- super(message);
- }
-
- /**
- * Constructs a new JSONException with the specified cause.
- *
- * @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 Throwable getCause()
- {
- return this.cause;
- }
-}
diff --git a/src/main/java/ninja/bytecode/iris/util/JSONML.java b/src/main/java/ninja/bytecode/iris/util/JSONML.java
deleted file mode 100644
index 96ba0bb7c..000000000
--- a/src/main/java/ninja/bytecode/iris/util/JSONML.java
+++ /dev/null
@@ -1,555 +0,0 @@
-package ninja.bytecode.iris.util;
-
-
-/*
-Copyright (c) 2008 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-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.util.Iterator;
-
-/**
- * This provides static methods to convert an XML text into a JSONArray or
- * JSONObject, and to covert a JSONArray or JSONObject into an XML text using
- * the JsonML transform.
- *
- * @author JSON.org
- * @version 2014-05-03
- */
-public class JSONML
-{
-
- /**
- * Parse XML values and store them in a JSONArray.
- *
- * @param x
- * The XMLTokener containing the source string.
- * @param arrayForm
- * true if array form, false if object form.
- * @param ja
- * The JSONArray that is containing the current tag or null if we
- * are at the outermost level.
- * @return A JSONArray if the value is the outermost tag, otherwise null.
- * @throws JSONException
- */
- private static Object parse(XMLTokener x, boolean arrayForm, JSONArray ja) throws JSONException
- {
- String attribute;
- char c;
- String closeTag = null;
- int i;
- JSONArray newja = null;
- JSONObject newjo = null;
- Object token;
- String tagName = null;
-
- // Test for and skip past these forms:
- //
- //
- //
- //
-
- while(true)
- {
- if(!x.more())
- {
- throw x.syntaxError("Bad XML");
- }
- token = x.nextContent();
- if(token == XML.LT)
- {
- token = x.nextToken();
- if(token instanceof Character)
- {
- if(token == XML.SLASH)
- {
-
- // Close tag ");
- } else
- {
- x.back();
- }
- } else if(c == '[')
- {
- token = x.nextToken();
- if(token.equals("CDATA") && x.next() == '[')
- {
- if(ja != null)
- {
- ja.put(x.nextCDATA());
- }
- } else
- {
- throw x.syntaxError("Expected 'CDATA['");
- }
- } else
- {
- i = 1;
- do
- {
- token = x.nextMeta();
- if(token == null)
- {
- throw x.syntaxError("Missing '>' after ' 0);
- }
- } else if(token == XML.QUEST)
- {
-
- // ");
- } else
- {
- throw x.syntaxError("Misshaped tag");
- }
-
- // Open tag <
-
- } else
- {
- if(!(token instanceof String))
- {
- throw x.syntaxError("Bad tagName '" + token + "'.");
- }
- tagName = (String) token;
- newja = new JSONArray();
- newjo = new JSONObject();
- if(arrayForm)
- {
- newja.put(tagName);
- if(ja != null)
- {
- ja.put(newja);
- }
- } else
- {
- newjo.put("tagName", tagName);
- if(ja != null)
- {
- ja.put(newjo);
- }
- }
- token = null;
- for(;;)
- {
- if(token == null)
- {
- token = x.nextToken();
- }
- if(token == null)
- {
- throw x.syntaxError("Misshaped tag");
- }
- if(!(token instanceof String))
- {
- break;
- }
-
- // attribute = value
-
- attribute = (String) token;
- if(!arrayForm && ("tagName".equals(attribute) || "childNode".equals(attribute)))
- {
- throw x.syntaxError("Reserved attribute.");
- }
- token = x.nextToken();
- if(token == XML.EQ)
- {
- token = x.nextToken();
- if(!(token instanceof String))
- {
- throw x.syntaxError("Missing value");
- }
- newjo.accumulate(attribute, XML.stringToValue((String) token));
- token = null;
- } else
- {
- newjo.accumulate(attribute, "");
- }
- }
- if(arrayForm && newjo.length() > 0)
- {
- newja.put(newjo);
- }
-
- // Empty tag <.../>
-
- if(token == XML.SLASH)
- {
- if(x.nextToken() != XML.GT)
- {
- throw x.syntaxError("Misshaped tag");
- }
- if(ja == null)
- {
- if(arrayForm)
- {
- return newja;
- } else
- {
- return newjo;
- }
- }
-
- // Content, between <...> and
-
- } else
- {
- if(token != XML.GT)
- {
- throw x.syntaxError("Misshaped tag");
- }
- closeTag = (String) parse(x, arrayForm, newja);
- if(closeTag != null)
- {
- if(!closeTag.equals(tagName))
- {
- throw x.syntaxError("Mismatched '" + tagName + "' and '" + closeTag + "'");
- }
- tagName = null;
- if(!arrayForm && newja.length() > 0)
- {
- newjo.put("childNodes", newja);
- }
- if(ja == null)
- {
- if(arrayForm)
- {
- return newja;
- } else
- {
- return newjo;
- }
- }
- }
- }
- }
- } else
- {
- if(ja != null)
- {
- ja.put(token instanceof String ? XML.stringToValue((String) token) : token);
- }
- }
- }
- }
-
- /**
- * Convert a well-formed (but not necessarily valid) XML string into a
- * JSONArray using the JsonML transform. Each XML tag is represented as a
- * JSONArray in which the first element is the tag name. If the tag has
- * attributes, then the second element will be JSONObject containing the
- * name/value pairs. If the tag contains children, then strings and
- * JSONArrays will represent the child tags. Comments, prologs, DTDs, and
- * <[ [ ]]> are ignored.
- *
- * @param string
- * The source string.
- * @return A JSONArray containing the structured data from the XML string.
- * @throws JSONException
- */
- public static JSONArray toJSONArray(String string) throws JSONException
- {
- return toJSONArray(new XMLTokener(string));
- }
-
- /**
- * Convert a well-formed (but not necessarily valid) XML string into a
- * JSONArray using the JsonML transform. Each XML tag is represented as a
- * JSONArray in which the first element is the tag name. If the tag has
- * attributes, then the second element will be JSONObject containing the
- * name/value pairs. If the tag contains children, then strings and
- * JSONArrays will represent the child content and tags. Comments, prologs,
- * DTDs, and <[ [ ]]> are ignored.
- *
- * @param x
- * An XMLTokener.
- * @return A JSONArray containing the structured data from the XML string.
- * @throws JSONException
- */
- public static JSONArray toJSONArray(XMLTokener x) throws JSONException
- {
- return (JSONArray) parse(x, true, null);
- }
-
- /**
- * Convert a well-formed (but not necessarily valid) XML string into a
- * JSONObject using the JsonML transform. Each XML tag is represented as a
- * JSONObject with a "tagName" property. If the tag has attributes, then the
- * attributes will be in the JSONObject as properties. If the tag contains
- * children, the object will have a "childNodes" property which will be an
- * array of strings and JsonML JSONObjects.
- *
- * Comments, prologs, DTDs, and <[ [ ]]> are ignored.
- *
- * @param x
- * An XMLTokener of the XML source text.
- * @return A JSONObject containing the structured data from the XML string.
- * @throws JSONException
- */
- public static JSONObject toJSONObject(XMLTokener x) throws JSONException
- {
- return (JSONObject) parse(x, false, null);
- }
-
- /**
- * Convert a well-formed (but not necessarily valid) XML string into a
- * JSONObject using the JsonML transform. Each XML tag is represented as a
- * JSONObject with a "tagName" property. If the tag has attributes, then the
- * attributes will be in the JSONObject as properties. If the tag contains
- * children, the object will have a "childNodes" property which will be an
- * array of strings and JsonML JSONObjects.
- *
- * Comments, prologs, DTDs, and <[ [ ]]> are ignored.
- *
- * @param string
- * The XML source text.
- * @return A JSONObject containing the structured data from the XML string.
- * @throws JSONException
- */
- public static JSONObject toJSONObject(String string) throws JSONException
- {
- return toJSONObject(new XMLTokener(string));
- }
-
- /**
- * Reverse the JSONML transformation, making an XML text from a JSONArray.
- *
- * @param ja
- * A JSONArray.
- * @return An XML string.
- * @throws JSONException
- */
- public static String toString(JSONArray ja) throws JSONException
- {
- int i;
- JSONObject jo;
- String key;
- Iterator keys;
- int length;
- Object object;
- StringBuilder sb = new StringBuilder();
- String tagName;
- String value;
-
- // Emit = length)
- {
- sb.append('/');
- sb.append('>');
- } else
- {
- sb.append('>');
- do
- {
- object = ja.get(i);
- i += 1;
- if(object != null)
- {
- if(object instanceof String)
- {
- sb.append(XML.escape(object.toString()));
- } else if(object instanceof JSONObject)
- {
- sb.append(toString((JSONObject) object));
- } else if(object instanceof JSONArray)
- {
- sb.append(toString((JSONArray) object));
- } else
- {
- sb.append(object.toString());
- }
- }
- } while(i < length);
- sb.append('<');
- sb.append('/');
- sb.append(tagName);
- sb.append('>');
- }
- return sb.toString();
- }
-
- /**
- * Reverse the JSONML transformation, making an XML text from a JSONObject.
- * The JSONObject must contain a "tagName" property. If it has children,
- * then it must have a "childNodes" property containing an array of objects.
- * The other properties are attributes with string values.
- *
- * @param jo
- * A JSONObject.
- * @return An XML string.
- * @throws JSONException
- */
- public static String toString(JSONObject jo) throws JSONException
- {
- StringBuilder sb = new StringBuilder();
- int i;
- JSONArray ja;
- String key;
- Iterator keys;
- int length;
- Object object;
- String tagName;
- String value;
-
- // Emit ');
- } else
- {
- sb.append('>');
- length = ja.length();
- for(i = 0; i < length; i += 1)
- {
- object = ja.get(i);
- if(object != null)
- {
- if(object instanceof String)
- {
- sb.append(XML.escape(object.toString()));
- } else if(object instanceof JSONObject)
- {
- sb.append(toString((JSONObject) object));
- } else if(object instanceof JSONArray)
- {
- sb.append(toString((JSONArray) object));
- } else
- {
- sb.append(object.toString());
- }
- }
- }
- sb.append('<');
- sb.append('/');
- sb.append(tagName);
- sb.append('>');
- }
- return sb.toString();
- }
-}
diff --git a/src/main/java/ninja/bytecode/iris/util/JSONObject.java b/src/main/java/ninja/bytecode/iris/util/JSONObject.java
deleted file mode 100644
index dfd1259fd..000000000
--- a/src/main/java/ninja/bytecode/iris/util/JSONObject.java
+++ /dev/null
@@ -1,2072 +0,0 @@
-package ninja.bytecode.iris.util;
-
-
-/*
- Copyright (c) 2002 JSON.org
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
-
- The Software shall be used for Good, not Evil.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- 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.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.ResourceBundle;
-import java.util.Set;
-
-/**
- * A JSONObject is an unordered collection of name/value pairs. Its external
- * form is a string wrapped in curly braces with colons between the names and
- * values, and commas between the values and names. The internal form is an
- * object having get and opt methods for accessing the
- * values by name, and put methods for adding or replacing values
- * by name. The values can be any of these types: Boolean,
- * JSONArray, JSONObject, Number,
- * String, or the JSONObject.NULL object. A JSONObject
- * constructor can be used to convert an external form JSON text into an
- * internal form whose values can be retrieved with the get and
- * opt methods, or to convert values into a JSON text using the
- * put and toString methods. A get method
- * returns a value if one can be found, and throws an exception if one cannot be
- * found. An opt method returns a default value instead of throwing
- * an exception, and so is useful for obtaining optional values.
- *
- * The generic get() and opt() methods return an
- * object, which you can cast or query for type. There are also typed
- * get and opt methods that do type checking and type
- * coercion for you. The opt methods differ from the get methods in that they do
- * not throw. Instead, they return a specified value, such as null.
- *
- * The put methods add or replace values in an object. For example,
- *
- *
- * myString = new JSONObject().put("JSON", "Hello, World!").toString();
- *
- *
- * produces the string {"JSON": "Hello, World"}.
- *
- * The texts produced by the toString methods strictly conform to
- * the JSON syntax rules. The constructors are more forgiving in the texts they
- * will accept:
- *
- * An extra , (comma) may appear just
- * before the closing brace.
- * Strings may be quoted with ' (single
- * quote) .
- * Strings do not need to be quoted at all if they do not begin with a quote
- * or single quote, and if they do not contain leading or trailing spaces, and
- * if they do not contain any of these characters:
- * { } [ ] / \ : , # and if they do not look like numbers and if
- * they are not the reserved words true, false, or
- * null.
- *
- *
- * @author JSON.org
- * @version 2015-07-22
- */
-public class JSONObject
-{
- /**
- * 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.
- */
- @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".
- */
- public String toString()
- {
- return "null";
- }
- }
-
- /**
- * The map where the JSONObject's properties are kept.
- */
- private final Map map;
-
- /**
- * It is sometimes more convenient and less ambiguous to have a
- * NULL object than to use Java's null value.
- * JSONObject.NULL.equals(null) returns true.
- * JSONObject.NULL.toString() returns "null".
- */
- public static final Object NULL = new Null();
-
- /**
- * Construct an empty JSONObject.
- */
- public JSONObject()
- {
- this.map = new HashMap();
- }
-
- /**
- * Construct a JSONObject from a subset of another JSONObject. An array of
- * strings is used to identify the keys that should be copied. Missing keys
- * are ignored.
- *
- * @param jo
- * A JSONObject.
- * @param names
- * An array of strings.
- * @throws JSONException
- * @exception JSONException
- * If a value is a non-finite number or if a name is
- * duplicated.
- */
- public JSONObject(JSONObject jo, String[] names)
- {
- this();
- for(int i = 0; i < names.length; i += 1)
- {
- try
- {
- this.putOnce(names[i], jo.opt(names[i]));
- } catch(Exception ignore)
- {
- }
- }
- }
-
- /**
- * Construct a JSONObject from a JSONTokener.
- *
- * @param x
- * A JSONTokener object containing the source string.
- * @throws JSONException
- * If there is a syntax error in the source string or a
- * duplicated key.
- */
- public JSONObject(JSONTokener x) throws JSONException
- {
- this();
- char c;
- String key;
-
- if(x.nextClean() != '{')
- {
- throw x.syntaxError("A JSONObject text must begin with '{'");
- }
- for(;;)
- {
- c = x.nextClean();
- switch(c)
- {
- case 0:
- throw x.syntaxError("A JSONObject text must end with '}'");
- case '}':
- return;
- default:
- x.back();
- key = x.nextValue().toString();
- }
-
- // The key is followed by ':'.
-
- c = x.nextClean();
- if(c != ':')
- {
- throw x.syntaxError("Expected a ':' after a key");
- }
- this.putOnce(key, x.nextValue());
-
- // Pairs are separated by ','.
-
- switch(x.nextClean())
- {
- case ';':
- case ',':
- if(x.nextClean() == '}')
- {
- return;
- }
- x.back();
- break;
- case '}':
- return;
- default:
- throw x.syntaxError("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.
- * @throws JSONException
- */
- public JSONObject(Map map)
- {
- this.map = new HashMap();
- if(map != null)
- {
- Iterator> i = map.entrySet().iterator();
- while(i.hasNext())
- {
- Entry entry = i.next();
- Object value = entry.getValue();
- if(value != null)
- {
- this.map.put(entry.getKey(), wrap(value));
- }
- }
- }
- }
-
- /**
- * 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 "get" or
- * "is" 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 "get" or "is"
- * 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 "getName", and
- * if the result of calling object.getName() is
- * "Larry Fine", then the JSONObject will contain
- * "name": "Larry Fine".
- *
- * @param bean
- * An object that has getter methods that should be used to make
- * a JSONObject.
- */
- public JSONObject(Object bean)
- {
- this();
- this.populateMap(bean);
- }
-
- /**
- * Construct a JSONObject from an Object, using reflection to find the
- * public members. The resulting JSONObject's keys will be the strings from
- * the names array, and the values will be the field values associated with
- * those keys in the object. If a key is not found or not visible, then it
- * will not be copied into the new JSONObject.
- *
- * @param object
- * An object that has fields that should be used to make a
- * JSONObject.
- * @param names
- * An array of strings, the names of the fields to be obtained
- * from the object.
- */
- public JSONObject(Object object, String names[])
- {
- this();
- Class c = object.getClass();
- for(int i = 0; i < names.length; i += 1)
- {
- String name = names[i];
- try
- {
- this.putOpt(name, c.getField(name).get(object));
- } catch(Exception ignore)
- {
- }
- }
- }
-
- /**
- * Construct a JSONObject from a source JSON text string. This is the most
- * commonly used JSONObject constructor.
- *
- * @param source
- * A string beginning with { (left
- * brace) and ending with }
- * (right brace) .
- * @exception JSONException
- * If there is a syntax error in the source string or a
- * duplicated key.
- */
- public JSONObject(String source) throws JSONException
- {
- this(new JSONTokener(source));
- }
-
- /**
- * Construct a JSONObject from a ResourceBundle.
- *
- * @param baseName
- * The ResourceBundle base name.
- * @param locale
- * The Locale to load the ResourceBundle for.
- * @throws JSONException
- * If any JSONExceptions are detected.
- */
- public JSONObject(String baseName, Locale locale) throws JSONException
- {
- this();
- ResourceBundle bundle = ResourceBundle.getBundle(baseName, locale, Thread.currentThread().getContextClassLoader());
-
- // Iterate through the keys in the bundle.
-
- Enumeration keys = bundle.getKeys();
- while(keys.hasMoreElements())
- {
- Object key = keys.nextElement();
- if(key != null)
- {
-
- // Go through the path, ensuring that there is a nested
- // JSONObject for each
- // segment except the last. Add the value using the last
- // segment's name into
- // the deepest nested JSONObject.
-
- String[] path = ((String) key).split("\\.");
- int last = path.length - 1;
- JSONObject target = this;
- for(int i = 0; i < last; i += 1)
- {
- String segment = path[i];
- JSONObject nextTarget = target.optJSONObject(segment);
- if(nextTarget == null)
- {
- nextTarget = new JSONObject();
- target.put(segment, nextTarget);
- }
- target = nextTarget;
- }
- target.put(path[last], bundle.getString((String) key));
- }
- }
- }
-
- /**
- * 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 JSONArray
- * is stored under the key to hold all of the accumulated values. If there
- * is already a JSONArray, then the new value is appended to it. In
- * contrast, the put method replaces the previous value.
- *
- * If only one value is accumulated that is not a JSONArray, then the result
- * will be the same as using put. But if multiple values are accumulated,
- * then the result will be like append.
- *
- * @param key
- * A key string.
- * @param value
- * An object to be accumulated under the key.
- * @return this.
- * @throws JSONException
- * If the value is an invalid number or if the key is null.
- */
- public JSONObject accumulate(String key, Object value) throws JSONException
- {
- testValidity(value);
- Object object = this.opt(key);
- if(object == null)
- {
- this.put(key, value instanceof JSONArray ? new JSONArray().put(value) : value);
- } else if(object instanceof JSONArray)
- {
- ((JSONArray) object).put(value);
- } else
- {
- this.put(key, new JSONArray().put(object).put(value));
- }
- 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
- * JSONArray containing the value parameter. If the key was already
- * associated with a JSONArray, then the value parameter is appended to it.
- *
- * @param key
- * A key string.
- * @param value
- * An object to be accumulated under the key.
- * @return this.
- * @throws JSONException
- * If the key is null or if the current value associated with
- * the key is not a JSONArray.
- */
- public JSONObject append(String key, Object value) throws JSONException
- {
- testValidity(value);
- Object object = this.opt(key);
- if(object == null)
- {
- this.put(key, new JSONArray().put(value));
- } else if(object instanceof JSONArray)
- {
- this.put(key, ((JSONArray) object).put(value));
- } else
- {
- throw new JSONException("JSONObject[" + key + "] is not a JSONArray.");
- }
- 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.
- */
- public static 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;
- }
-
- /**
- * Get the value object associated with a key.
- *
- * @param key
- * A key string.
- * @return The object associated with the key.
- * @throws JSONException
- * if the key is not found.
- */
- public Object get(String key) throws JSONException
- {
- if(key == null)
- {
- throw new JSONException("Null key.");
- }
- Object object = this.opt(key);
- if(object == null)
- {
- throw new JSONException("JSONObject[" + quote(key) + "] not found.");
- }
- return object;
- }
-
- /**
- * Get the enum value associated with a key.
- *
- * @param clazz
- * The type of enum to retrieve.
- * @param key
- * A key string.
- * @return The enum value associated with the key
- * @throws JSONException
- * if the key is not found or if the value cannot be converted
- * to an enum.
- */
- public > E getEnum(Class clazz, String key) throws JSONException
- {
- E val = optEnum(clazz, key);
- if(val == null)
- {
- // JSONException should really take a throwable argument.
- // If it did, I would re-implement this with the Enum.valueOf
- // method and place any thrown exception in the JSONException
- throw new JSONException("JSONObject[" + quote(key) + "] is not an enum of type " + quote(clazz.getSimpleName()) + ".");
- }
- return val;
- }
-
- /**
- * Get the boolean value associated with a key.
- *
- * @param key
- * A key string.
- * @return The truth.
- * @throws JSONException
- * if the value is not a Boolean or the String "true" or
- * "false".
- */
- public boolean getBoolean(String key) throws JSONException
- {
- 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 JSONException("JSONObject[" + quote(key) + "] is not a Boolean.");
- }
-
- /**
- * Get the BigInteger value associated with a key.
- *
- * @param key
- * A key string.
- * @return The numeric value.
- * @throws JSONException
- * if the key is not found or if the value cannot be converted
- * to BigInteger.
- */
- public BigInteger getBigInteger(String key) throws JSONException
- {
- Object object = this.get(key);
- try
- {
- return new BigInteger(object.toString());
- } catch(Exception e)
- {
- throw new JSONException("JSONObject[" + quote(key) + "] could not be converted to BigInteger.");
- }
- }
-
- /**
- * Get the BigDecimal value associated with a key.
- *
- * @param key
- * A key string.
- * @return The numeric value.
- * @throws JSONException
- * if the key is not found or if the value cannot be converted
- * to BigDecimal.
- */
- public BigDecimal getBigDecimal(String key) throws JSONException
- {
- Object object = this.get(key);
- try
- {
- return new BigDecimal(object.toString());
- } catch(Exception e)
- {
- throw new JSONException("JSONObject[" + quote(key) + "] could not be converted to BigDecimal.");
- }
- }
-
- /**
- * Get the double value associated with a key.
- *
- * @param key
- * A key string.
- * @return The numeric value.
- * @throws JSONException
- * 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) throws JSONException
- {
- Object object = this.get(key);
- try
- {
- return object instanceof Number ? ((Number) object).doubleValue() : Double.parseDouble((String) object);
- } catch(Exception e)
- {
- throw new JSONException("JSONObject[" + quote(key) + "] is not a number.");
- }
- }
-
- /**
- * Get the int value associated with a key.
- *
- * @param key
- * A key string.
- * @return The integer value.
- * @throws JSONException
- * if the key is not found or if the value cannot be converted
- * to an integer.
- */
- public int getInt(String key) throws JSONException
- {
- Object object = this.get(key);
- try
- {
- return object instanceof Number ? ((Number) object).intValue() : Integer.parseInt((String) object);
- } catch(Exception e)
- {
- throw new JSONException("JSONObject[" + quote(key) + "] is not an int.");
- }
- }
-
- /**
- * Get the JSONArray value associated with a key.
- *
- * @param key
- * A key string.
- * @return A JSONArray which is the value.
- * @throws JSONException
- * if the key is not found or if the value is not a JSONArray.
- */
- public JSONArray getJSONArray(String key) throws JSONException
- {
- Object object = this.get(key);
- if(object instanceof JSONArray)
- {
- return (JSONArray) object;
- }
- throw new JSONException("JSONObject[" + quote(key) + "] is not a JSONArray.");
- }
-
- /**
- * Get the JSONObject value associated with a key.
- *
- * @param key
- * A key string.
- * @return A JSONObject which is the value.
- * @throws JSONException
- * if the key is not found or if the value is not a JSONObject.
- */
- public JSONObject getJSONObject(String key) throws JSONException
- {
- Object object = this.get(key);
- if(object instanceof JSONObject)
- {
- return (JSONObject) object;
- }
- throw new JSONException("JSONObject[" + quote(key) + "] is not a JSONObject.");
- }
-
- /**
- * Get the long value associated with a key.
- *
- * @param key
- * A key string.
- * @return The long value.
- * @throws JSONException
- * if the key is not found or if the value cannot be converted
- * to a long.
- */
- public long getLong(String key) throws JSONException
- {
- Object object = this.get(key);
- try
- {
- return object instanceof Number ? ((Number) object).longValue() : Long.parseLong((String) object);
- } catch(Exception e)
- {
- throw new JSONException("JSONObject[" + quote(key) + "] is not a long.");
- }
- }
-
- /**
- * Get an array of field names from a JSONObject.
- *
- * @return An array of field names, or null if there are no names.
- */
- public static String[] getNames(JSONObject jo)
- {
- int length = jo.length();
- if(length == 0)
- {
- return null;
- }
- Iterator iterator = jo.keys();
- String[] names = new String[length];
- int i = 0;
- while(iterator.hasNext())
- {
- names[i] = iterator.next();
- i += 1;
- }
- return names;
- }
-
- /**
- * Get an array of field names from an Object.
- *
- * @return An array of field names, or null if there are no names.
- */
- public static String[] getNames(Object object)
- {
- if(object == null)
- {
- return null;
- }
- Class klass = object.getClass();
- Field[] fields = klass.getFields();
- int length = fields.length;
- if(length == 0)
- {
- return null;
- }
- String[] names = new String[length];
- for(int i = 0; i < length; i += 1)
- {
- names[i] = fields[i].getName();
- }
- return names;
- }
-
- /**
- * Get the string associated with a key.
- *
- * @param key
- * A key string.
- * @return A string which is the value.
- * @throws JSONException
- * if there is no string value for the key.
- */
- public String getString(String key) throws JSONException
- {
- Object object = this.get(key);
- if(object instanceof String)
- {
- return (String) object;
- }
- throw new JSONException("JSONObject[" + quote(key) + "] not a string.");
- }
-
- /**
- * Determine if the JSONObject contains a specific key.
- *
- * @param key
- * A key string.
- * @return true if the key exists in the JSONObject.
- */
- public boolean has(String key)
- {
- return this.map.containsKey(key);
- }
-
- /**
- * Increment a property of a JSONObject. If there is no such property,
- * create one with a value of 1. If there is such a property, and if it is
- * an Integer, Long, Double, or Float, then add one to it.
- *
- * @param key
- * A key string.
- * @return this.
- * @throws JSONException
- * If there is already a property with this name that is not an
- * Integer, Long, Double, or Float.
- */
- public JSONObject increment(String key) throws JSONException
- {
- Object value = this.opt(key);
- if(value == null)
- {
- this.put(key, 1);
- } else if(value instanceof BigInteger)
- {
- this.put(key, ((BigInteger) value).add(BigInteger.ONE));
- } else if(value instanceof BigDecimal)
- {
- this.put(key, ((BigDecimal) value).add(BigDecimal.ONE));
- } else if(value instanceof Integer)
- {
- this.put(key, (Integer) value + 1);
- } else if(value instanceof Long)
- {
- this.put(key, (Long) value + 1);
- } else if(value instanceof Double)
- {
- this.put(key, (Double) value + 1);
- } else if(value instanceof Float)
- {
- this.put(key, (Float) value + 1);
- } else
- {
- throw new JSONException("Unable to increment [" + quote(key) + "].");
- }
- return this;
- }
-
- /**
- * Determine if the value associated with the key is null or if there is no
- * value.
- *
- * @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 keys()
- {
- return this.keySet().iterator();
- }
-
- /**
- * Get a set of keys of the JSONObject.
- *
- * @return A keySet.
- */
- public Set keySet()
- {
- return this.map.keySet();
- }
-
- /**
- * Get the number of keys stored in the JSONObject.
- *
- * @return The number of keys in the JSONObject.
- */
- public int length()
- {
- return this.map.size();
- }
-
- /**
- * Produce a JSONArray containing the names of the elements of this
- * JSONObject.
- *
- * @return A JSONArray containing the key strings, or null if the JSONObject
- * is empty.
- */
- public JSONArray names()
- {
- JSONArray ja = new JSONArray();
- Iterator keys = this.keys();
- while(keys.hasNext())
- {
- ja.put(keys.next());
- }
- return ja.length() == 0 ? null : ja;
- }
-
- /**
- * Produce a string from a Number.
- *
- * @param number
- * A Number
- * @return A String.
- * @throws JSONException
- * If n is a non-finite number.
- */
- public static String numberToString(Number number) throws JSONException
- {
- if(number == null)
- {
- throw new JSONException("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;
- }
-
- /**
- * 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.
- */
- public Object opt(String key)
- {
- return key == null ? null : this.map.get(key);
- }
-
- /**
- * Get the enum value associated with a key.
- *
- * @param clazz
- * The type of enum to retrieve.
- * @param key
- * A key string.
- * @return The enum value associated with the key or null if not found
- */
- public > E optEnum(Class clazz, String key)
- {
- return this.optEnum(clazz, key, null);
- }
-
- /**
- * Get the enum value associated with a key.
- *
- * @param clazz
- * The type of enum to retrieve.
- * @param key
- * A key string.
- * @param defaultValue
- * The default in case the value is not found
- * @return The enum value associated with the key or defaultValue if the
- * value is not found or cannot be assigned to clazz
- */
- public > E optEnum(Class clazz, String key, E defaultValue)
- {
- try
- {
- Object val = this.opt(key);
- if(NULL.equals(val))
- {
- return defaultValue;
- }
- if(clazz.isAssignableFrom(val.getClass()))
- {
- // we just checked it!
- @SuppressWarnings("unchecked")
- E myE = (E) val;
- return myE;
- }
- return Enum.valueOf(clazz, val.toString());
- }
-
- catch(IllegalArgumentException e)
- {
- return defaultValue;
- }
-
- catch(NullPointerException e)
- {
- return defaultValue;
- }
- }
-
- /**
- * Get an optional boolean associated with a key. It returns false if there
- * is no such key, or if the value is not Boolean.TRUE or the String "true".
- *
- * @param key
- * A key string.
- * @return The truth.
- */
- public boolean optBoolean(String key)
- {
- return this.optBoolean(key, false);
- }
-
- /**
- * 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 optBoolean(String key, boolean defaultValue)
- {
- try
- {
- return this.getBoolean(key);
- } catch(Exception e)
- {
- return defaultValue;
- }
- }
-
- /**
- * Get an optional double associated with a key, or NaN 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 string which is the key.
- * @return An object which is the value.
- */
- public double optDouble(String key)
- {
- return this.optDouble(key, Double.NaN);
- }
-
- /**
- * Get an optional BigInteger 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 BigInteger optBigInteger(String key, BigInteger defaultValue)
- {
- try
- {
- return this.getBigInteger(key);
- } catch(Exception e)
- {
- return defaultValue;
- }
- }
-
- /**
- * Get an optional BigDecimal 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 BigDecimal optBigDecimal(String key, BigDecimal defaultValue)
- {
- try
- {
- return this.getBigDecimal(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 optDouble(String key, double defaultValue)
- {
- try
- {
- return this.getDouble(key);
- } catch(Exception e)
- {
- return defaultValue;
- }
- }
-
- /**
- * 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. If the value is a string, an
- * attempt will be made to evaluate it as a number.
- *
- * @param key
- * A key string.
- * @return An object which is the value.
- */
- public int optInt(String key)
- {
- return this.optInt(key, 0);
- }
-
- /**
- * 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 optInt(String key, int defaultValue)
- {
- try
- {
- return this.getInt(key);
- } catch(Exception e)
- {
- return defaultValue;
- }
- }
-
- /**
- * Get an optional JSONArray associated with a key. It returns null if there
- * is no such key, or if its value is not a JSONArray.
- *
- * @param key
- * A key string.
- * @return A JSONArray which is the value.
- */
- public JSONArray optJSONArray(String key)
- {
- 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 JSONObject.
- *
- * @param key
- * A key string.
- * @return A JSONObject which is the value.
- */
- public JSONObject optJSONObject(String key)
- {
- 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. If the value is a string, an
- * attempt will be made to evaluate it as a number.
- *
- * @param key
- * A key string.
- * @return An object which is the value.
- */
- public long optLong(String key)
- {
- return this.optLong(key, 0);
- }
-
- /**
- * 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 optLong(String key, long defaultValue)
- {
- try
- {
- return this.getLong(key);
- } catch(Exception e)
- {
- return defaultValue;
- }
- }
-
- /**
- * Get an optional string associated with a key. It returns an empty string
- * if there is no such key. If the value is not a string and is not null,
- * then it is converted to a string.
- *
- * @param key
- * A key string.
- * @return A string which is the value.
- */
- public String optString(String key)
- {
- return this.optString(key, "");
- }
-
- /**
- * 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 optString(String key, String defaultValue)
- {
- Object object = this.opt(key);
- return NULL.equals(object) ? defaultValue : object.toString();
- }
-
- 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)
- {
- }
- }
- }
-
- /**
- * Put a key/boolean pair in the JSONObject.
- *
- * @param key
- * A key string.
- * @param value
- * A boolean which is the value.
- * @return this.
- * @throws JSONException
- * If the key is null.
- */
- public JSONObject put(String key, boolean value) throws JSONException
- {
- this.put(key, value ? Boolean.TRUE : Boolean.FALSE);
- return this;
- }
-
- /**
- * Put a key/value pair in the JSONObject, where the value will be a
- * JSONArray which is produced from a Collection.
- *
- * @param key
- * A key string.
- * @param value
- * A Collection value.
- * @return this.
- * @throws JSONException
- */
- public JSONObject put(String key, Collection value) throws JSONException
- {
- this.put(key, new JSONArray(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 JSONException
- * If the key is null or if the number is invalid.
- */
- public JSONObject put(String key, double value) throws JSONException
- {
- this.put(key, new Double(value));
- return this;
- }
-
- /**
- * Put a key/int pair in the JSONObject.
- *
- * @param key
- * A key string.
- * @param value
- * An int which is the value.
- * @return this.
- * @throws JSONException
- * If the key is null.
- */
- public JSONObject put(String key, int value) throws JSONException
- {
- this.put(key, new Integer(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 JSONException
- * If the key is null.
- */
- public JSONObject put(String key, long value) throws JSONException
- {
- this.put(key, new Long(value));
- return this;
- }
-
- /**
- * Put a key/value pair in the JSONObject, where the value will be a
- * JSONObject which is produced from a Map.
- *
- * @param key
- * A key string.
- * @param value
- * A Map value.
- * @return this.
- * @throws JSONException
- */
- public JSONObject put(String key, Map value) throws JSONException
- {
- 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 JSONException
- * If the value is non-finite number or if the key is null.
- */
- public JSONObject put(String key, Object value) throws JSONException
- {
- if(key == null)
- {
- throw new NullPointerException("Null key.");
- }
- if(value != null)
- {
- testValidity(value);
- 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
- * string
- * @param value
- * object
- * @return this.
- * @throws JSONException
- * if the key is a duplicate
- */
- public JSONObject putOnce(String key, Object value) throws JSONException
- {
- if(key != null && value != null)
- {
- if(this.opt(key) != null)
- {
- throw new JSONException("Duplicate key \"" + key + "\"");
- }
- this.put(key, value);
- }
- return this;
- }
-
- /**
- * Put a key/value pair in the JSONObject, but only if the key and the value
- * are both non-null.
- *
- * @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 JSONException
- * If the value is a non-finite number.
- */
- public JSONObject putOpt(String key, Object value) throws JSONException
- {
- if(key != null && value != null)
- {
- this.put(key, value);
- }
- return this;
- }
-
- /**
- * Produce a string in double quotes with backslash sequences in all the
- * right places. A backslash will be inserted within = '\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;
- }
-
- /**
- * 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);
- }
-
- /**
- * Determine if two JSONObjects are similar. They must contain the same set
- * of names which must be associated with similar values.
- *
- * @param other
- * The other JSONObject
- * @return true if they are equal
- */
- public boolean similar(Object other)
- {
- try
- {
- if(!(other instanceof JSONObject))
- {
- return false;
- }
- Set set = this.keySet();
- if(!set.equals(((JSONObject) other).keySet()))
- {
- return false;
- }
- Iterator iterator = set.iterator();
- while(iterator.hasNext())
- {
- String name = iterator.next();
- Object valueThis = this.get(name);
- Object valueOther = ((JSONObject) other).get(name);
- if(valueThis instanceof JSONObject)
- {
- if(!((JSONObject) valueThis).similar(valueOther))
- {
- return false;
- }
- } else if(valueThis instanceof JSONArray)
- {
- if(!((JSONArray) valueThis).similar(valueOther))
- {
- return false;
- }
- } else if(!valueThis.equals(valueOther))
- {
- return false;
- }
- }
- return true;
- } catch(Throwable exception)
- {
- return false;
- }
- }
-
- /**
- * 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.
- */
- public static 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.
- */
-
- char b = string.charAt(0);
- if((b >= '0' && b <= '9') || 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 = new Long(string);
- if(string.equals(myLong.toString()))
- {
- if(myLong == myLong.intValue())
- {
- return myLong.intValue();
- } else
- {
- return myLong;
- }
- }
- }
- } catch(Exception ignore)
- {
- }
- }
- return string;
- }
-
- /**
- * Throw an exception if the object is a NaN or infinite number.
- *
- * @param o
- * The object to test.
- * @throws JSONException
- * If o is a non-finite number.
- */
- public static void testValidity(Object o) throws JSONException
- {
- if(o != null)
- {
- if(o instanceof Double)
- {
- if(((Double) o).isInfinite() || ((Double) o).isNaN())
- {
- throw new JSONException("JSON does not allow non-finite numbers.");
- }
- } else if(o instanceof Float)
- {
- if(((Float) o).isInfinite() || ((Float) o).isNaN())
- {
- throw new JSONException("JSON does not allow non-finite numbers.");
- }
- }
- }
- }
-
- /**
- * Produce a JSONArray containing the values of the members of this
- * JSONObject.
- *
- * @param names
- * A JSONArray containing a list of key strings. This determines
- * the sequence of the values in the result.
- * @return A JSONArray of values.
- * @throws JSONException
- * If any of the values are non-finite numbers.
- */
- public JSONArray toJSONArray(JSONArray names) throws JSONException
- {
- if(names == null || names.length() == 0)
- {
- return null;
- }
- JSONArray ja = new JSONArray();
- for(int i = 0; i < names.length(); i += 1)
- {
- ja.put(this.opt(names.getString(i)));
- }
- return ja;
- }
-
- /**
- * Make a JSON text of this JSONObject. For compactness, no whitespace is
- * added. If this would not result in a syntactically correct JSON text,
- * then null will be returned instead.
- *
- * Warning: This method assumes that the data structure is acyclical.
- *
- * @return a printable, displayable, portable, transmittable representation
- * of the object, beginning with { (left
- * brace) and ending with } (right
- * brace) .
- */
- public String toString()
- {
- try
- {
- return this.toString(0);
- } catch(Exception e)
- {
- return null;
- }
- }
-
- /**
- * Make a prettyprinted JSON text of this JSONObject.
- *
- * 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 { (left
- * brace) and ending with } (right
- * brace) .
- * @throws JSONException
- * If the object contains an invalid number.
- */
- public String toString(int indentFactor) throws JSONException
- {
- StringWriter w = new StringWriter();
- synchronized(w.getBuffer())
- {
- return this.write(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.
- *
- *
- * 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 { (left
- * brace) and ending with } (right
- * brace) .
- * @throws JSONException
- * If the value is or contains an invalid number.
- */
- public static String valueToString(Object value) throws JSONException
- {
- if(value == null || value.equals(null))
- {
- return "null";
- }
- if(value instanceof JSONString)
- {
- Object object;
- try
- {
- object = ((JSONString) value).toJSONString();
- } catch(Exception e)
- {
- throw new JSONException(e);
- }
- if(object instanceof String)
- {
- return (String) object;
- }
- throw new JSONException("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)
- {
- @SuppressWarnings("unchecked")
- Map map = (Map) value;
- return new JSONObject(map).toString();
- }
- if(value instanceof Collection)
- {
- @SuppressWarnings("unchecked")
- Collection coll = (Collection) value;
- return new JSONArray(coll).toString();
- }
- if(value.getClass().isArray())
- {
- return new JSONArray(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
- */
- public static 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 || object instanceof BigInteger || object instanceof BigDecimal)
- {
- return object;
- }
-
- if(object instanceof Collection)
- {
- @SuppressWarnings("unchecked")
- Collection coll = (Collection) object;
- return new JSONArray(coll);
- }
- if(object.getClass().isArray())
- {
- return new JSONArray(object);
- }
- if(object instanceof Map)
- {
- @SuppressWarnings("unchecked")
- Map map = (Map) object;
- return new JSONObject(map);
- }
- 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;
- }
- }
-
- /**
- * Write the contents of the JSONObject as JSON text to a writer. For
- * compactness, no whitespace is added.
- *
- * Warning: This method assumes that the data structure is acyclical.
- *
- * @return The writer.
- * @throws JSONException
- */
- public Writer write(Writer writer) throws JSONException
- {
- return this.write(writer, 0, 0);
- }
-
- static final Writer writeValue(Writer writer, Object value, int indentFactor, int indent) throws JSONException, IOException
- {
- if(value == null || value.equals(null))
- {
- writer.write("null");
- } else if(value instanceof JSONObject)
- {
- ((JSONObject) value).write(writer, indentFactor, indent);
- } else if(value instanceof JSONArray)
- {
- ((JSONArray) value).write(writer, indentFactor, indent);
- } else if(value instanceof Map)
- {
- @SuppressWarnings("unchecked")
- Map map = (Map) value;
- new JSONObject(map).write(writer, indentFactor, indent);
- } else if(value instanceof Collection)
- {
- @SuppressWarnings("unchecked")
- Collection coll = (Collection) value;
- new JSONArray(coll).write(writer, indentFactor, indent);
- } else if(value.getClass().isArray())
- {
- new JSONArray(value).write(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
- {
- o = ((JSONString) value).toJSONString();
- } catch(Exception e)
- {
- throw new JSONException(e);
- }
- writer.write(o != null ? o.toString() : quote(value.toString()));
- } else
- {
- quote(value.toString(), 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. For
- * compactness, no whitespace is added.
- *
- * Warning: This method assumes that the data structure is acyclical.
- *
- * @return The writer.
- * @throws JSONException
- */
- Writer write(Writer writer, int indentFactor, int indent) throws JSONException
- {
- try
- {
- boolean commanate = false;
- final int length = this.length();
- Iterator keys = this.keys();
- writer.write('{');
-
- if(length == 1)
- {
- Object key = keys.next();
- writer.write(quote(key.toString()));
- writer.write(':');
- if(indentFactor > 0)
- {
- writer.write(' ');
- }
- writeValue(writer, this.map.get(key), indentFactor, indent);
- } else if(length != 0)
- {
- final int newindent = indent + indentFactor;
- while(keys.hasNext())
- {
- Object key = keys.next();
- if(commanate)
- {
- writer.write(',');
- }
- if(indentFactor > 0)
- {
- writer.write('\n');
- }
- indent(writer, newindent);
- writer.write(quote(key.toString()));
- writer.write(':');
- if(indentFactor > 0)
- {
- writer.write(' ');
- }
- writeValue(writer, this.map.get(key), indentFactor, newindent);
- commanate = true;
- }
- if(indentFactor > 0)
- {
- writer.write('\n');
- }
- indent(writer, indent);
- }
- writer.write('}');
- return writer;
- } catch(IOException exception)
- {
- throw new JSONException(exception);
- }
- }
-}
diff --git a/src/main/java/ninja/bytecode/iris/util/JSONString.java b/src/main/java/ninja/bytecode/iris/util/JSONString.java
deleted file mode 100644
index 168634476..000000000
--- a/src/main/java/ninja/bytecode/iris/util/JSONString.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package ninja.bytecode.iris.util;
-
-
-/**
- * The JSONString interface allows a toJSONString()
- * method so that a class can change the behavior of
- * JSONObject.toString(), JSONArray.toString(), and
- * JSONWriter.value(Object). The
- * toJSONString method will be used instead of the default behavior
- * of using the Object's toString() method and quoting the result.
- */
-public interface JSONString
-{
- /**
- * The toJSONString method allows a class to produce its own
- * JSON serialization.
- *
- * @return A strictly syntactically correct JSON text.
- */
- public String toJSONString();
-}
diff --git a/src/main/java/ninja/bytecode/iris/util/JSONStringer.java b/src/main/java/ninja/bytecode/iris/util/JSONStringer.java
deleted file mode 100644
index bf2d783a8..000000000
--- a/src/main/java/ninja/bytecode/iris/util/JSONStringer.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package ninja.bytecode.iris.util;
-
-
-/*
-Copyright (c) 2006 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-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.StringWriter;
-
-/**
- * JSONStringer provides a quick and convenient way of producing JSON text. The
- * texts produced strictly conform to JSON syntax rules. No whitespace is added,
- * so the results are ready for transmission or storage. Each instance of
- * JSONStringer can produce one JSON text.
- *
- * A JSONStringer instance provides a value method for appending
- * values to the text, and a key method for adding keys before
- * values in objects. There are array and endArray
- * methods that make and bound array values, and object and
- * endObject methods which make and bound object values. All of
- * these methods return the JSONWriter instance, permitting cascade style. For
- * example,
- *
- *
- * myString = new JSONStringer().object().key("JSON").value("Hello, World!").endObject().toString();
- *
- *
- * which produces the string
- *
- *
- * {"JSON":"Hello, World!"}
- *
- *
- * The first method called must be array or object.
- * There are no methods for adding commas or colons. JSONStringer adds them for
- * you. Objects and arrays can be nested up to 20 levels deep.
- *
- * This can sometimes be easier than using a JSONObject to build a string.
- *
- * @author JSON.org
- * @version 2008-09-18
- */
-public class JSONStringer extends JSONWriter
-{
- /**
- * Make a fresh JSONStringer. It can be used to build one JSON text.
- */
- public JSONStringer()
- {
- super(new StringWriter());
- }
-
- /**
- * Return the JSON text. This method is used to obtain the product of the
- * JSONStringer instance. It will return null if there was a
- * problem in the construction of the JSON text (such as the calls to
- * array were not properly balanced with calls to
- * endArray).
- *
- * @return The JSON text.
- */
- public String toString()
- {
- return this.mode == 'd' ? this.writer.toString() : null;
- }
-}
diff --git a/src/main/java/ninja/bytecode/iris/util/JSONTokener.java b/src/main/java/ninja/bytecode/iris/util/JSONTokener.java
deleted file mode 100644
index b1bd2dc3d..000000000
--- a/src/main/java/ninja/bytecode/iris/util/JSONTokener.java
+++ /dev/null
@@ -1,504 +0,0 @@
-package ninja.bytecode.iris.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;
-
-/*
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-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.
-*/
-
-/**
- * A JSONTokener takes a source string and extracts characters and tokens from
- * it. It is used by the JSONObject and JSONArray constructors to parse JSON
- * source strings.
- *
- * @author JSON.org
- * @version 2014-05-03
- */
-public class JSONTokener
-{
-
- private long character;
- private boolean eof;
- private long index;
- private long line;
- private char previous;
- private Reader reader;
- private boolean usePrevious;
-
- /**
- * Construct a JSONTokener from a Reader.
- *
- * @param reader
- * A reader.
- */
- public JSONTokener(Reader reader)
- {
- this.reader = reader.markSupported() ? reader : new BufferedReader(reader);
- this.eof = false;
- this.usePrevious = false;
- this.previous = 0;
- this.index = 0;
- this.character = 1;
- this.line = 1;
- }
-
- /**
- * 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.
- *
- * @param s
- * A source string.
- */
- public JSONTokener(String s)
- {
- this(new StringReader(s));
- }
-
- /**
- * Back up one character. This provides a sort of lookahead capability, so
- * that you can test for a digit or letter before attempting to parse the
- * next number or identifier.
- */
- public void back() throws JSONException
- {
- if(this.usePrevious || this.index <= 0)
- {
- throw new JSONException("Stepping back two steps is not supported");
- }
- this.index -= 1;
- this.character -= 1;
- this.usePrevious = true;
- this.eof = false;
- }
-
- /**
- * Get the hex value of a character (base16).
- *
- * @param c
- * A character between '0' and '9' or between 'A' and 'F' or
- * between 'a' and 'f'.
- * @return An int between 0 and 15, or -1 if c was not a hex digit.
- */
- public static int dehexchar(char c)
- {
- if(c >= '0' && c <= '9')
- {
- return c - '0';
- }
- if(c >= 'A' && c <= 'F')
- {
- return c - ('A' - 10);
- }
- if(c >= 'a' && c <= 'f')
- {
- return c - ('a' - 10);
- }
- return -1;
- }
-
- public boolean end()
- {
- return this.eof && !this.usePrevious;
- }
-
- /**
- * Determine if the source string still contains characters that next() can
- * consume.
- *
- * @return true if not yet at the end of the source.
- */
- public boolean more() throws JSONException
- {
- this.next();
- if(this.end())
- {
- return false;
- }
- this.back();
- return true;
- }
-
- /**
- * Get the next character in the source string.
- *
- * @return The next character, or 0 if past the end of the source string.
- */
- public char next() throws JSONException
- {
- int c;
- if(this.usePrevious)
- {
- this.usePrevious = false;
- c = this.previous;
- } else
- {
- try
- {
- c = this.reader.read();
- } catch(IOException exception)
- {
- throw new JSONException(exception);
- }
-
- if(c <= 0)
- { // End of stream
- this.eof = true;
- 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.previous = (char) c;
- return this.previous;
- }
-
- /**
- * Consume the next character, and check that it matches a specified
- * character.
- *
- * @param c
- * The character to match.
- * @return The character.
- * @throws JSONException
- * if the character does not match.
- */
- public char next(char c) throws JSONException
- {
- char n = this.next();
- if(n != c)
- {
- throw this.syntaxError("Expected '" + c + "' and instead saw '" + n + "'");
- }
- return n;
- }
-
- /**
- * Get the next n characters.
- *
- * @param n
- * The number of characters to take.
- * @return A string of n characters.
- * @throws JSONException
- * Substring bounds error if there are not n characters
- * remaining in the source string.
- */
- public String next(int n) throws JSONException
- {
- if(n == 0)
- {
- return "";
- }
-
- char[] chars = new char[n];
- int pos = 0;
-
- while(pos < n)
- {
- chars[pos] = this.next();
- if(this.end())
- {
- throw this.syntaxError("Substring bounds error");
- }
- pos += 1;
- }
- return new String(chars);
- }
-
- /**
- * Get the next char in the string, skipping whitespace.
- *
- * @throws JSONException
- * @return A character, or 0 if there are no more characters.
- */
- public char nextClean() throws JSONException
- {
- for(;;)
- {
- char c = this.next();
- if(c == 0 || c > ' ')
- {
- return c;
- }
- }
- }
-
- /**
- * Return the characters up to the next close quote character. Backslash
- * processing is done. The formal JSON format does not allow strings in
- * single quotes, but an implementation is allowed to accept them.
- *
- * @param quote
- * The quoting character, either "
- * (double quote) or '
- * (single quote) .
- * @return A String.
- * @throws JSONException
- * Unterminated string.
- */
- public String nextString(char quote) throws JSONException
- {
- char c;
- StringBuilder sb = new StringBuilder();
- for(;;)
- {
- c = this.next();
- switch(c)
- {
- case 0:
- case '\n':
- case '\r':
- throw this.syntaxError("Unterminated string");
- case '\\':
- c = this.next();
- switch(c)
- {
- case 'b':
- sb.append('\b');
- break;
- case 't':
- sb.append('\t');
- break;
- case 'n':
- sb.append('\n');
- break;
- case 'f':
- sb.append('\f');
- break;
- case 'r':
- sb.append('\r');
- break;
- case 'u':
- sb.append((char) Integer.parseInt(this.next(4), 16));
- break;
- case '"':
- case '\'':
- case '\\':
- case '/':
- sb.append(c);
- break;
- default:
- throw this.syntaxError("Illegal escape.");
- }
- break;
- default:
- if(c == quote)
- {
- return sb.toString();
- }
- sb.append(c);
- }
- }
- }
-
- /**
- * Get the text up but not including the specified character or the end of
- * line, whichever comes first.
- *
- * @param delimiter
- * A delimiter character.
- * @return A string.
- */
- public String nextTo(char delimiter) throws JSONException
- {
- StringBuilder sb = new StringBuilder();
- for(;;)
- {
- char c = this.next();
- if(c == delimiter || c == 0 || c == '\n' || c == '\r')
- {
- if(c != 0)
- {
- this.back();
- }
- return sb.toString().trim();
- }
- sb.append(c);
- }
- }
-
- /**
- * Get the text up but not including one of the specified delimiter
- * characters or the end of line, whichever comes first.
- *
- * @param delimiters
- * A set of delimiter characters.
- * @return A string, trimmed.
- */
- public String nextTo(String delimiters) throws JSONException
- {
- char c;
- StringBuilder sb = new StringBuilder();
- for(;;)
- {
- c = this.next();
- if(delimiters.indexOf(c) >= 0 || c == 0 || c == '\n' || c == '\r')
- {
- if(c != 0)
- {
- this.back();
- }
- return sb.toString().trim();
- }
- sb.append(c);
- }
- }
-
- /**
- * Get the next value. The value can be a Boolean, Double, Integer,
- * JSONArray, JSONObject, Long, or String, or the JSONObject.NULL object.
- *
- * @throws JSONException
- * If syntax error.
- *
- * @return An object.
- */
- public Object nextValue() throws JSONException
- {
- char c = this.nextClean();
- String string;
-
- switch(c)
- {
- case '"':
- case '\'':
- return this.nextString(c);
- case '{':
- this.back();
- return new JSONObject(this);
- case '[':
- this.back();
- return new JSONArray(this);
- }
-
- /*
- * Handle unquoted text. This could be the values true, false, or null,
- * or it can be a number. An implementation (such as this one) is
- * allowed to also accept non-standard forms.
- *
- * Accumulate characters until we reach the end of the text or a
- * formatting character.
- */
-
- StringBuilder sb = new StringBuilder();
- while(c >= ' ' && ",:]}/\\\"[{;=#".indexOf(c) < 0)
- {
- sb.append(c);
- c = this.next();
- }
- this.back();
-
- string = sb.toString().trim();
- if("".equals(string))
- {
- throw this.syntaxError("Missing value");
- }
- return JSONObject.stringToValue(string);
- }
-
- /**
- * Skip characters until the next character is the requested character. If
- * the requested character is not found, no characters are skipped.
- *
- * @param to
- * A character to skip to.
- * @return The requested character, or zero if the requested character is
- * not found.
- */
- public char skipTo(char to) throws JSONException
- {
- char c;
- try
- {
- long startIndex = this.index;
- long startCharacter = this.character;
- long startLine = this.line;
- this.reader.mark(1000000);
- do
- {
- c = this.next();
- if(c == 0)
- {
- this.reader.reset();
- this.index = startIndex;
- this.character = startCharacter;
- this.line = startLine;
- return c;
- }
- } while(c != to);
- } catch(IOException exception)
- {
- throw new JSONException(exception);
- }
- this.back();
- return c;
- }
-
- /**
- * Make a JSONException to signal a syntax error.
- *
- * @param message
- * The error message.
- * @return A JSONException object, suitable for throwing
- */
- public JSONException syntaxError(String message)
- {
- return new JSONException(message + this.toString());
- }
-
- /**
- * Make a printable string of this JSONTokener.
- *
- * @return " at {index} [character {character} line {line}]"
- */
- public String toString()
- {
- return " at " + this.index + " [character " + this.character + " line " + this.line + "]";
- }
-}
diff --git a/src/main/java/ninja/bytecode/iris/util/JSONWriter.java b/src/main/java/ninja/bytecode/iris/util/JSONWriter.java
deleted file mode 100644
index f38284517..000000000
--- a/src/main/java/ninja/bytecode/iris/util/JSONWriter.java
+++ /dev/null
@@ -1,388 +0,0 @@
-package ninja.bytecode.iris.util;
-
-
-import java.io.IOException;
-import java.io.Writer;
-
-/*
-Copyright (c) 2006 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-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.
-*/
-
-/**
- * JSONWriter provides a quick and convenient way of producing JSON text. The
- * texts produced strictly conform to JSON syntax rules. No whitespace is added,
- * so the results are ready for transmission or storage. Each instance of
- * JSONWriter can produce one JSON text.
- *
- * A JSONWriter instance provides a value method for appending
- * values to the text, and a key method for adding keys before
- * values in objects. There are array and endArray
- * methods that make and bound array values, and object and
- * endObject methods which make and bound object values. All of
- * these methods return the JSONWriter instance, permitting a cascade style. For
- * example,
- *
- *
- * new JSONWriter(myWriter).object().key("JSON").value("Hello, World!").endObject();
- *
- *
- * which writes
- *
- *
- * {"JSON":"Hello, World!"}
- *
- *
- * The first method called must be array or object.
- * There are no methods for adding commas or colons. JSONWriter adds them for
- * you. Objects and arrays can be nested up to 20 levels deep.
- *
- * This can sometimes be easier than using a JSONObject to build a string.
- *
- * @author JSON.org
- * @version 2011-11-24
- */
-public class JSONWriter
-{
- private static final int maxdepth = 200;
-
- /**
- * The comma flag determines if a comma should be output before the next
- * value.
- */
- private boolean comma;
-
- /**
- * The current mode. Values: 'a' (array), 'd' (done), 'i' (initial), 'k'
- * (key), 'o' (object).
- */
- protected char mode;
-
- /**
- * The object/array stack.
- */
- private final JSONObject stack[];
-
- /**
- * The stack top index. A value of 0 indicates that the stack is empty.
- */
- private int top;
-
- /**
- * The writer that will receive the output.
- */
- protected Writer writer;
-
- /**
- * Make a fresh JSONWriter. It can be used to build one JSON text.
- */
- public JSONWriter(Writer w)
- {
- this.comma = false;
- this.mode = 'i';
- this.stack = new JSONObject[maxdepth];
- this.top = 0;
- this.writer = w;
- }
-
- /**
- * Append a value.
- *
- * @param string
- * A string value.
- * @return this
- * @throws JSONException
- * If the value is out of sequence.
- */
- private JSONWriter append(String string) throws JSONException
- {
- if(string == null)
- {
- throw new JSONException("Null pointer");
- }
- if(this.mode == 'o' || this.mode == 'a')
- {
- try
- {
- if(this.comma && this.mode == 'a')
- {
- this.writer.write(',');
- }
- this.writer.write(string);
- } catch(IOException e)
- {
- throw new JSONException(e);
- }
- if(this.mode == 'o')
- {
- this.mode = 'k';
- }
- this.comma = true;
- return this;
- }
- throw new JSONException("Value out of sequence.");
- }
-
- /**
- * Begin appending a new array. All values until the balancing
- * endArray will be appended to this array. The
- * endArray method must be called to mark the array's end.
- *
- * @return this
- * @throws JSONException
- * If the nesting is too deep, or if the object is started in
- * the wrong place (for example as a key or after the end of the
- * outermost array or object).
- */
- public JSONWriter array() throws JSONException
- {
- if(this.mode == 'i' || this.mode == 'o' || this.mode == 'a')
- {
- this.push(null);
- this.append("[");
- this.comma = false;
- return this;
- }
- throw new JSONException("Misplaced array.");
- }
-
- /**
- * End something.
- *
- * @param mode
- * Mode
- * @param c
- * Closing character
- * @return this
- * @throws JSONException
- * If unbalanced.
- */
- private JSONWriter end(char mode, char c) throws JSONException
- {
- if(this.mode != mode)
- {
- throw new JSONException(mode == 'a' ? "Misplaced endArray." : "Misplaced endObject.");
- }
- this.pop(mode);
- try
- {
- this.writer.write(c);
- } catch(IOException e)
- {
- throw new JSONException(e);
- }
- this.comma = true;
- return this;
- }
-
- /**
- * End an array. This method most be called to balance calls to
- * array.
- *
- * @return this
- * @throws JSONException
- * If incorrectly nested.
- */
- public JSONWriter endArray() throws JSONException
- {
- return this.end('a', ']');
- }
-
- /**
- * End an object. This method most be called to balance calls to
- * object.
- *
- * @return this
- * @throws JSONException
- * If incorrectly nested.
- */
- public JSONWriter endObject() throws JSONException
- {
- return this.end('k', '}');
- }
-
- /**
- * Append a key. The key will be associated with the next value. In an
- * object, every value must be preceded by a key.
- *
- * @param string
- * A key string.
- * @return this
- * @throws JSONException
- * If the key is out of place. For example, keys do not belong
- * in arrays or if the key is null.
- */
- public JSONWriter key(String string) throws JSONException
- {
- if(string == null)
- {
- throw new JSONException("Null key.");
- }
- if(this.mode == 'k')
- {
- try
- {
- this.stack[this.top - 1].putOnce(string, Boolean.TRUE);
- if(this.comma)
- {
- this.writer.write(',');
- }
- this.writer.write(JSONObject.quote(string));
- this.writer.write(':');
- this.comma = false;
- this.mode = 'o';
- return this;
- } catch(IOException e)
- {
- throw new JSONException(e);
- }
- }
- throw new JSONException("Misplaced key.");
- }
-
- /**
- * Begin appending a new object. All keys and values until the balancing
- * endObject will be appended to this object. The
- * endObject method must be called to mark the object's end.
- *
- * @return this
- * @throws JSONException
- * If the nesting is too deep, or if the object is started in
- * the wrong place (for example as a key or after the end of the
- * outermost array or object).
- */
- public JSONWriter object() throws JSONException
- {
- if(this.mode == 'i')
- {
- this.mode = 'o';
- }
- if(this.mode == 'o' || this.mode == 'a')
- {
- this.append("{");
- this.push(new JSONObject());
- this.comma = false;
- return this;
- }
- throw new JSONException("Misplaced object.");
-
- }
-
- /**
- * Pop an array or object scope.
- *
- * @param c
- * The scope to close.
- * @throws JSONException
- * If nesting is wrong.
- */
- private void pop(char c) throws JSONException
- {
- if(this.top <= 0)
- {
- throw new JSONException("Nesting error.");
- }
- char m = this.stack[this.top - 1] == null ? 'a' : 'k';
- if(m != c)
- {
- throw new JSONException("Nesting error.");
- }
- this.top -= 1;
- this.mode = this.top == 0 ? 'd' : this.stack[this.top - 1] == null ? 'a' : 'k';
- }
-
- /**
- * Push an array or object scope.
- *
- * @param jo
- * The scope to open.
- * @throws JSONException
- * If nesting is too deep.
- */
- private void push(JSONObject jo) throws JSONException
- {
- if(this.top >= maxdepth)
- {
- throw new JSONException("Nesting too deep.");
- }
- this.stack[this.top] = jo;
- this.mode = jo == null ? 'a' : 'k';
- this.top += 1;
- }
-
- /**
- * Append either the value true or the value false
- * .
- *
- * @param b
- * A boolean.
- * @return this
- * @throws JSONException
- */
- public JSONWriter value(boolean b) throws JSONException
- {
- return this.append(b ? "true" : "false");
- }
-
- /**
- * Append a double value.
- *
- * @param d
- * A double.
- * @return this
- * @throws JSONException
- * If the number is not finite.
- */
- public JSONWriter value(double d) throws JSONException
- {
- return this.value(new Double(d));
- }
-
- /**
- * Append a long value.
- *
- * @param l
- * A long.
- * @return this
- * @throws JSONException
- */
- public JSONWriter value(long l) throws JSONException
- {
- return this.append(Long.toString(l));
- }
-
- /**
- * Append an object value.
- *
- * @param object
- * The object to append. It can be null, or a Boolean, Number,
- * String, JSONObject, or JSONArray, or an object that implements
- * JSONString.
- * @return this
- * @throws JSONException
- * If the value is out of sequence.
- */
- public JSONWriter value(Object object) throws JSONException
- {
- return this.append(JSONObject.valueToString(object));
- }
-}
diff --git a/src/main/java/ninja/bytecode/iris/util/KList.java b/src/main/java/ninja/bytecode/iris/util/KList.java
deleted file mode 100644
index 2778aa750..000000000
--- a/src/main/java/ninja/bytecode/iris/util/KList.java
+++ /dev/null
@@ -1,648 +0,0 @@
-package ninja.bytecode.iris.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.function.Function;
-
-public class KList extends ArrayList implements List
-{
- private static final long serialVersionUID = -2892550695744823337L;
-
- @SafeVarargs
- public KList(T... ts)
- {
- super();
- add(ts);
- }
-
- public KList()
- {
- super();
- }
-
- public KList(Collection values)
- {
- super();
- add(values);
- }
-
- public KList(Enumeration e)
- {
- super();
- add(e);
- }
-
- public Chunker chunk()
- {
- return new Chunker(this);
- }
-
- /**
- * Remove the last element
- */
- public KList removeLast()
- {
- remove(last());
-
- return this;
- }
-
- public Queue enqueue()
- {
- return Queue.create(this);
- }
-
- private KList add(Enumeration e)
- {
- while(e.hasMoreElements())
- {
- add(e.nextElement());
- }
-
- return this;
- }
-
- public KList add(Collection values)
- {
- addAll(values);
- return this;
- }
-
- /**
- * Create a Map out of this list where this list becomes the values of the
- * returned map. You must specify each key for each value in this list. In the
- * function, returning null will not add the keyval pair.
- *
- * @param
- * the inferred key type
- * @param f
- * the function
- * @return the new map
- */
- public KMap asValues(Function f)
- {
- KMap m = new KMap();
- forEach((i) -> m.putNonNull(f.apply(i), i));
- return m;
- }
-
- /**
- * Create a Map out of this list where this list becomes the keys of the
- * returned map. You must specify each value for each key in this list. In the
- * function, returning null will not add the keyval pair.
- *
- * @param
- * the inferred value type
- * @param f
- * the function
- * @return the new map
- */
- public KMap asKeys(Function f)
- {
- KMap m = new KMap();
- forEach((i) -> m.putNonNull(i, f.apply(i)));
- return m;
- }
-
- /**
- * Cut this list into targetCount sublists
- *
- * @param targetCount
- * the target count of sublists
- * @return the list of sublists
- */
- public KList> divide(int targetCount)
- {
- return split(size() / targetCount);
- }
-
- /**
- * Split this list into a list of sublists with roughly targetSize elements of T
- * per sublist
- *
- * @param targetSize
- * the target size
- * @return the list of sublists
- */
- public KList> split(int targetSize)
- {
- targetSize = targetSize < 1 ? 1 : targetSize;
- KList> gg = new KList<>();
- KList b = new KList<>();
-
- for(T i : this)
- {
- if(b.size() >= targetSize)
- {
- gg.add(b.copy());
- b.clear();
- }
-
- b.add(i);
- }
-
- if(!b.isEmpty())
- {
- gg.add(b);
- }
-
- return gg;
- }
-
- /**
- * Rewrite this list by checking each value and changing the value (or not).
- * Return null to remove the element in the function
- *
- * @param t
- * the function
- * @return the same list (not a copy)
- */
- public KList rewrite(Function t)
- {
- KList m = copy();
- clear();
-
- for(T i : m)
- {
- addNonNull(t.apply(i));
- }
-
- return this;
- }
-
- /**
- * To array
- *
- * @return the array
- */
- @SuppressWarnings("unchecked")
- public T[] array()
- {
- return (T[]) toArray();
- }
-
- /**
- * Return a copy of this list
- *
- * @return the copy
- */
- public KList copy()
- {
- return new KList().add(this);
- }
-
- /**
- * Shuffle the list
- *
- * @return the same list
- */
- public KList shuffle()
- {
- Collections.shuffle(this);
- return this;
- }
-
- /**
- * Sort the list (based on toString comparison)
- *
- * @return the same list
- */
- public KList sort()
- {
- Collections.sort(this, (a, b) -> a.toString().compareTo(b.toString()));
- return this;
- }
-
- /**
- * Reverse this list
- *
- * @return the same list
- */
- public KList reverse()
- {
- Collections.reverse(this);
- return this;
- }
-
- @Override
- public String toString()
- {
- return "[" + toString(", ") + "]";
- }
-
- /**
- * Tostring with a seperator for each item in the list
- *
- * @param split
- * the seperator
- * @return the string representing this object
- */
- public String toString(String split)
- {
- if(isEmpty())
- {
- return "";
- }
-
- if(size() == 1)
- {
- return get(0).toString();
- }
-
- StringBuilder b = new StringBuilder();
-
- for(String i : toStringList())
- {
- b.append(split + i);
- }
-
- return b.toString().substring(split.length());
- }
-
- /**
- * Invoke tostring on each value in the list into a string list
- *
- * @return the string list
- */
- public KList toStringList()
- {
- return convert((t) -> t.toString());
- }
-
- /**
- * Convert a list into another list type. Such as GList to
- * GList. list.convert((i) -> "" + i);
- *
- * @param
- * @param converter
- * @return
- */
- public KList convert(Function converter)
- {
- KList v = new KList();
- forEach((t) -> v.addNonNull(converter.apply(t)));
- return v;
- }
-
- /**
- * Adds T to the list, ignores if null
- *
- * @param t
- * the value to add
- * @return the same list
- */
- public KList addNonNull(T t)
- {
- if(t != null)
- {
- super.add(t);
- }
-
- return this;
- }
-
- /**
- * Swaps the values of index a and b. For example "hello", "world", "!" swap(1,
- * 2) would change the list to "hello", "!", "world"
- *
- * @param a
- * the first index
- * @param b
- * the second index
- * @return the same list (builder), not a copy
- */
- public KList swapIndexes(int a, int b)
- {
- T aa = remove(a);
- T bb = get(b);
- add(a, bb);
- remove(b);
- add(b, aa);
-
- return this;
- }
-
- /**
- * Remove a number of elements from the list
- *
- * @param t
- * the elements
- * @return this list
- */
- @SuppressWarnings("unchecked")
- public KList remove(T... t)
- {
- for(T i : t)
- {
- super.remove(i);
- }
-
- return this;
- }
-
- /**
- * Add another glist's contents to this one (addall builder)
- *
- * @param t
- * the list
- * @return the same list
- */
- public KList add(KList t)
- {
- super.addAll(t);
- return this;
- }
-
- /**
- * Add a number of values to this list
- *
- * @param t
- * the list
- * @return this list
- */
- @SuppressWarnings("unchecked")
- public KList add(T... t)
- {
- for(T i : t)
- {
- super.add(i);
- }
-
- return this;
- }
-
- /**
- * Check if this list has an index at the given index
- *
- * @param index
- * the given index
- * @return true if size > index
- */
- public boolean hasIndex(int index)
- {
- return size() > index;
- }
-
- /**
- * Get the last index of this list (size - 1)
- *
- * @return the last index of this list
- */
- public int last()
- {
- return size() - 1;
- }
-
- /**
- * Deduplicate this list by converting to linked hash set and back
- *
- * @return the deduplicated list
- */
- public KList dedupe()
- {
- return qclear().add(new LinkedHashSet(this));
- }
-
- /**
- * Clear this list (and return it)
- *
- * @return the same list
- */
- public KList qclear()
- {
- super.clear();
- return this;
- }
-
- /**
- * Simply !isEmpty()
- *
- * @return true if this list has 1 or more element(s)
- */
- public boolean hasElements()
- {
- return !isEmpty();
- }
-
- /**
- * Pop the first item off this list and return it
- *
- * @return the popped off item or null if the list is empty
- */
- public T pop()
- {
- if(isEmpty())
- {
- return null;
- }
-
- return remove(0);
- }
-
- /**
- * Pop the last item off this list and return it
- *
- * @return the popped off item or null if the list is empty
- */
- public T popLast()
- {
- if(isEmpty())
- {
- return null;
- }
-
- return remove(last());
- }
-
- public T popRandom()
- {
- if(isEmpty())
- {
- return null;
- }
-
- if(size() == 1)
- {
- return pop();
- }
-
- return remove(M.irand(0, last()));
- }
-
- public static KList fromJSONAny(JSONArray oo)
- {
- KList s = new KList();
-
- for(int i = 0; i < oo.length(); i++)
- {
- s.add(oo.get(i).toString());
- }
-
- return s;
- }
-
- public KList sub(int f, int t)
- {
- KList g = new KList<>();
-
- for(int i = f; i < M.min(size(), t); i++)
- {
- g.add(get(i));
- }
-
- return g;
- }
-
- public JSONArray toJSONStringArray()
- {
- JSONArray j = new JSONArray();
-
- for(Object i : this)
- {
- j.put(i.toString());
- }
-
- return j;
- }
-
- public static KList asStringList(List oo)
- {
- KList s = new KList();
-
- for(Object i : oo)
- {
- s.add(i.toString());
- }
-
- return s;
- }
-
- @SuppressWarnings("unchecked")
- public KList forceAdd(Object[] values)
- {
- for(Object i : values)
- {
- add((T) i);
- }
-
- return this;
- }
-
- @SuppressWarnings("unchecked")
- public KList forceAdd(int[] values)
- {
- for(Object i : values)
- {
- add((T) i);
- }
-
- return this;
- }
-
- @SuppressWarnings("unchecked")
- public KList forceAdd(double[] values)
- {
- for(Object i : values)
- {
- add((T) i);
- }
-
- return this;
- }
-
- @SuppressWarnings("unchecked")
- public KList forceAdd(float[] values)
- {
- for(Object i : values)
- {
- add((T) i);
- }
-
- return this;
- }
-
- @SuppressWarnings("unchecked")
- public KList forceAdd(byte[] values)
- {
- for(Object i : values)
- {
- add((T) i);
- }
-
- return this;
- }
-
- @SuppressWarnings("unchecked")
- public KList forceAdd(short[] values)
- {
- for(Object i : values)
- {
- add((T) i);
- }
-
- return this;
- }
-
- @SuppressWarnings("unchecked")
- public KList forceAdd(long[] values)
- {
- for(Object i : values)
- {
- add((T) i);
- }
-
- return this;
- }
-
- @SuppressWarnings("unchecked")
- public KList forceAdd(boolean[] values)
- {
- for(Object i : values)
- {
- add((T) i);
- }
-
- return this;
- }
-
- public T middleValue()
- {
- return get(middleIndex());
- }
-
- private int middleIndex()
- {
- return size() % 2 == 0 ? (size() / 2) : ((size() / 2) + 1);
- }
-
- public T getRandom()
- {
- if(isEmpty())
- {
- return null;
- }
-
- if(size() == 1)
- {
- return get(0);
- }
-
- return get(M.irand(0, last()));
- }
-
- public KList qdel(T t)
- {
- remove(t);
- return this;
- }
-
- public KList qadd(T t)
- {
- add(t);
- return this;
- }
-}
diff --git a/src/main/java/ninja/bytecode/iris/util/KMap.java b/src/main/java/ninja/bytecode/iris/util/KMap.java
deleted file mode 100644
index 46711be5a..000000000
--- a/src/main/java/ninja/bytecode/iris/util/KMap.java
+++ /dev/null
@@ -1,424 +0,0 @@
-package ninja.bytecode.iris.util;
-
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-public class KMap extends ConcurrentHashMap
-{
- private static final long serialVersionUID = 7288942695300448163L;
-
- public KMap()
- {
- super();
- }
-
- public KMap(KMap gMap)
- {
- this();
- put(gMap);
- }
-
- /**
- * Puts a value into a map-value-list based on the key such that if GMap> where V is GList
- *
- * @param
- * the list type in the value type
- * @param k
- * the key to look for
- * @param vs
- * the values to put into the list of the given key
- * @return the same list (builder)
- */
- @SuppressWarnings("unchecked")
- public KMap putValueList(K k, S... vs)
- {
- try
- {
- KMap> s = (KMap>) this;
-
- if(!s.containsKey(k))
- {
- s.put(k, new KList());
- }
-
- s.get(k).add(vs);
- }
-
- catch(Throwable e)
- {
-
- }
-
- return this;
- }
-
- /**
- * Returns a sorted list of keys from this map, based on the sorting order of
- * the values.
- *
- * @return the value-sorted key list
- */
- public KList sortK()
- {
- KList k = new KList();
- KList v = v();
-
- Collections.sort(v, new Comparator()
- {
- @Override
- public int compare(V v, V t1)
- {
- return v.toString().compareTo(t1.toString());
- }
- });
-
- for(V i : v)
- {
- for(K j : k())
- {
- if(get(j).equals(i))
- {
- k.add(j);
- }
- }
- }
-
- k.dedupe();
- return k;
- }
-
- /**
- * Returns a sorted list of keys from this map, based on the sorting order of
- * the values. Sorting is based on numerical values
- *
- * @return the value-sorted key list
- */
- public KList sortKNumber()
- {
- KList k = new KList();
- KList v = v();
-
- Collections.sort(v, new Comparator()
- {
- @Override
- public int compare(V v, V t1)
- {
- Number n1 = (Number) v;
- Number n2 = (Number) t1;
-
- return (int) ((n1.doubleValue() - n2.doubleValue()) * 1000);
- }
- });
-
- for(V i : v)
- {
- for(K j : k())
- {
- if(get(j).equals(i))
- {
- k.add(j);
- }
- }
- }
-
- k.dedupe();
- return k;
- }
-
- /**
- * Put another map's values into this map
- *
- * @param m
- * the map to insert
- * @return this map (builder)
- */
- public KMap put(Map m)
- {
- putAll(m);
- return this;
- }
-
- /**
- * Return a copy of this map
- *
- * @return the copied map
- */
- public KMap copy()
- {
- return new KMap(this);
- }
-
- /**
- * Loop through each keyvalue set (copy of it) with the map parameter
- *
- * @param f
- * the function
- * @return the same gmap
- */
- public KMap rewrite(Consumer3> f)
- {
- KMap m = copy();
-
- for(K i : m.k())
- {
- f.accept(i, get(i), this);
- }
-
- return this;
- }
-
- /**
- * Loop through each keyvalue set (copy of it)
- *
- * @param f
- * the function
- * @return the same gmap
- */
- public KMap each(Consumer2 f)
- {
- for(K i : k())
- {
- f.accept(i, get(i));
- }
-
- return this;
- }
-
- /**
- * Flip the hashmap and flatten the value list even if there are multiple keys
- *
- * @return the flipped and flattened hashmap
- */
- public KMap flipFlatten()
- {
- KMap> f = flip();
- KMap m = new KMap<>();
-
- for(V i : f.k())
- {
- m.putNonNull(i, m.isEmpty() ? null : m.get(0));
- }
-
- return m;
- }
-
- /**
- * Flip the hashmap so keys are now list-keys in the value position
- *
- * @return the flipped hashmap
- */
- public KMap> flip()
- {
- KMap> flipped = new KMap>();
-
- for(K i : keySet())
- {
- if(i == null)
- {
- continue;
- }
-
- if(!flipped.containsKey(get(i)))
- {
- flipped.put(get(i), new KList());
- }
-
- flipped.get(get(i)).add(i);
- }
-
- return flipped;
- }
-
- /**
- * Sort values based on the keys sorting order
- *
- * @return the values (sorted)
- */
- public KList sortV()
- {
- KList v = new KList();
- KList k = k();
-
- Collections.sort(k, new Comparator()
- {
- @Override
- public int compare(K v, K t1)
- {
- return v.toString().compareTo(t1.toString());
- }
- });
-
- for(K i : k)
- {
- for(V j : v())
- {
- if(get(i).equals(j))
- {
- v.add(j);
- }
- }
- }
-
- v.dedupe();
- return v;
- }
-
- public KList sortVNoDedupe()
- {
- KList v = new KList();
- KList k = k();
-
- Collections.sort(k, new Comparator()
- {
- @Override
- public int compare(K v, K t1)
- {
- return v.toString().compareTo(t1.toString());
- }
- });
-
- for(K i : k)
- {
- for(V j : v())
- {
- if(get(i).equals(j))
- {
- v.add(j);
- }
- }
- }
-
- return v;
- }
-
- /**
- * Get a copy of this maps keys
- *
- * @return the keys
- */
- public KList k()
- {
- KList k = new KList();
- Enumeration kk = keys();
-
- while(kk.hasMoreElements())
- {
- K kkk = kk.nextElement();
- k.add(kkk);
- }
-
- return k;
- }
-
- /**
- * Get a copy of this maps values
- *
- * @return the values
- */
- public KList v()
- {
- return new KList(values());
- }
-
- /**
- * Still works as it normally should except it returns itself (builder)
- *
- * @param key
- * the key
- * @param value
- * the value (single only supported)
- * @return
- */
- public KMap qput(K key, V value)
- {
- super.put(key, value);
- return this;
- }
-
- /**
- * Works just like put, except it wont put anything unless the key and value are
- * nonnull
- *
- * @param key
- * the nonnull key
- * @param value
- * the nonnull value
- * @return the same map
- */
- public KMap putNonNull(K key, V value)
- {
- if(key != null || value != null)
- {
- put(key, value);
- }
-
- return this;
- }
-
- public V putThen(K key, V valueIfKeyNotPresent)
- {
- if(!containsKey(key))
- {
- put(key, valueIfKeyNotPresent);
- }
-
- return get(key);
- }
-
- /**
- * Clear this map and return it
- *
- * @return the cleared map
- */
- public KMap