[UWS,TAP] Externalize `org.json`.

`org.json` was included in the sources of UWS-/TAP-Lib because of a manual
small correction. This is no longer needed. So this library is now a dependency
(included in the generated JAR). This has also been upgraded to the version of
August 2018.

_This commit aims to reproduce the original content of the Pull Request #38
 by @vforchi ._

README.md

@@ -29,7 +29,7 @@ Repository content
 ------------------
 
 ### Libraries
-Each library has its own package (`adql` for ADQL, `uws` for UWS and `tap` for TAP). These packages are independent except `tap` which needs the two other packages. In addition to these packages, you will also find `cds` and `org.json` which are dependencies for the libraries.
+Each library has its own package (`adql` for ADQL, `uws` for UWS and `tap` for TAP). These packages are independent except `tap` which needs the two other packages. In addition to these packages, you will also find `cds` which is a dependency for the libraries.
 
 ### Dependencies
 Below are summed up the dependencies of each library:
@@ -40,15 +40,16 @@ Below are summed up the dependencies of each library:
 | Package `cds.utils`    |  X   |     |  X  |
 | Postgres JDBC Driver   |  X   |     |  X  |
 | Package `uws`          |      |  X  |  X  |
-| Package `org.json`     |      |  X  |  X  |
+| JSON library            |      |  X  |  X  |
 | HTTP Servlet API       |      |  X  |  X  |
 | HTTP Multipart Library |      |  X  |  X  |
 | Packages `cds.*`       |      |     |  X  |
 | STIL Library           |      |     |  X  |
 
-In the `lib` directory, you will find 2 JAR files:
+In the `lib` directory, you will find 3 JAR files:
 * The *HTTP Multipart Library*: `commons-fileupload-1.3.3.jar` (and `commons-io-2.6.jar`). This library helps dealing with uploads.
-* The *[STIL Library](http://www.star.bris.ac.uk/~mbt/stil/)*: `stil_3.3-2.jar` (i.e. packages `nom.tap`, `org.apache.tools.bzip2`, `uk.ac.starlink`). This library helps supporting VOTable (read and write) and some other output formats. 
+* The *[STIL Library](http://www.star.bris.ac.uk/~mbt/stil/)*: `stil_3.3-2.jar` (i.e. packages `nom.tap`, `org.apache.tools.bzip2`, `uk.ac.starlink`). This library helps supporting VOTable (read and write) and some other output formats.
+* The *JSON Library*: `json-20180813.jar` (i.e. the former included package `org.json`). This library helps manipulating JSON content. _This library was already used (before v4.4 of UWS-Lib and v2.3 of TAP-Lib) but it was included in the sources instead of being considered as an external library._
 
 The *Postgres JDBC Driver* is needed ONLY IF you want to use (and keep) `adql.translator.PgSphereTranslator`. You can get this driver on the [PostgreSQL website](https://jdbc.postgresql.org/download.html). The required package for the ADQL and TAP libraries is `org.postgresql` (and particularly the class `org.postgresql.Driver`).
 

build.gradle

@@ -14,6 +14,7 @@ dependencies {
     compile 'org.slf4j:slf4j-api:1.7.25'
     compile 'commons-io:commons-io:2.6'
     compile 'commons-fileupload:commons-fileupload:1.3.3'
+    compile 'org.json:json:20180813'
 
     testCompile 'junit:junit:4.12'
     testCompile 'com.h2database:h2:1.4.193'

buildTAP.xml

@@ -22,6 +22,9 @@
 
 	<property name="slf4jApiJarName" value="slf4j-api-1.7.25.jar" />
 	<property name="slf4jApiJar" value="${libDir}/${slf4jApiJarName}" />
+	
+	<property name="jsonJarName" value="json-20180813.jar" />
+	<property name="jsonJar" value="${libDir}/${jsonJarName}" />
 
 	<property name="sqliteJarName" value="sqlite-jdbc-3.16.1.jar" />
 	<property name="sqliteJar" value="${libDir}/${sqliteJarName}" />
@@ -35,9 +38,9 @@
 	<property name="astroh2JarName" value="astroh2-0.3.jar" />
 	<property name="astroh2Jar" value="${libDir}/${astroh2JarName}" />
 		
-	<property name="tapPath" value="tap/**,adql/**,uws/**,cds/**,datalink/**,puzzlibs/**" />
+	<property name="tapPath" value="tap/**,adql/**,uws/**,cds/**" />
 	<property name="jsonPath" value="org/json/**" />
-	<property name="extLibsPath" value="com/oreilly/servlet/**,nom/tam/**,org/apache/tools/bzip2/**,uk/ac/starlink/**" />
+	<property name="extLibsPath" value="org/slf4j/**,org/apache/commons/fileupload/**,org/apache/commons/io/**,nom/tam/**,org/apache/tools/bzip2/**,edu/jhu/**,gov/fnal/eag/healpix/**,uk/ac/**" />
 	<property name="licensePath" value="COPYING.LESSER" />
 	<property name="includesList" value="${tapPath},${jsonPath},${extLibsPath}" />
 
@@ -180,12 +183,14 @@
 	<target name="buildLib" depends="compileLib,junitValidation" description="After 'clean', build the library JAR (only classes).">
 		<echo>Generate the library:</echo>
 		<jar basedir="${classesDir}" destfile="${libJarFileWithSTIL}" includes="${includesList}">
+			<zipfileset src="${jsonJar}" excludes="META-INF/*" />
 			<zipfileset src="${commonsIOJar}" excludes="META-INF/**" />
 			<zipfileset src="${commonsFileUploadJar}" excludes="META-INF/**" />
 			<zipfileset src="${stilJar}" excludes="META-INF/*" />
 			<zipfileset dir="${srcDir}" includes="${licensePath}" />
 		</jar>
 		<jar basedir="${classesDir}" destfile="${libJarFile}" includes="${includesList}">
+			<zipfileset src="${jsonJar}" excludes="META-INF/**" />
 			<zipfileset src="${commonsIOJar}" excludes="META-INF/**" />
 			<zipfileset src="${commonsFileUploadJar}" excludes="META-INF/**" />
 			<zipfileset dir="${srcDir}" includes="${licensePath}" />
@@ -196,12 +201,14 @@
 	<target name="buildLibAndSrc" depends="buildLib" description="After 'clean' and 'buildLib', build the sources JAR (only .java).">
 		<jar compress="false" destfile="${srcJarFileWithSTIL}">
 			<zipfileset dir="${srcDir}" includes="${includesList},${licensePath}" prefix="${srcDir}" />
+			<zipfileset dir="${libDir}" includes="${jsonJarName}" fullPath="${jsonJar}" />
 			<zipfileset dir="${libDir}" includes="${commonsIOJarName}" fullPath="${commonsIOJar}" />
 			<zipfileset dir="${libDir}" includes="${commonsFileUploadJarName}" fullPath="${commonsFileUploadJar}" />
 			<zipfileset dir="${libDir}" includes="${stilJarName}" fullPath="${stilJar}" />
 		</jar>
 		<jar compress="false" destfile="${srcJarFile}">
 			<zipfileset dir="${srcDir}" includes="${includesList},${licensePath}" prefix="${srcDir}" />
+			<zipfileset dir="${libDir}" includes="${jsonJarName}" fullPath="${jsonJar}" />
 			<zipfileset dir="${libDir}" includes="${commonsIOJarName}" fullPath="${commonsIOJar}" />
 			<zipfileset dir="${libDir}" includes="${commonsFileUploadJarName}" fullPath="${commonsFileUploadJar}" />
 		</jar>

buildUWS.xml

@@ -20,6 +20,9 @@
 	<property name="slf4jApiJarName" value="slf4j-api-1.7.25.jar" />
 	<property name="slf4jApiJar" value="${libDir}/${slf4jApiJarName}" />
 	
+	<property name="jsonJarName" value="json-20180813.jar" />
+	<property name="jsonJar" value="${libDir}/${jsonJarName}" />
+	
 	<property name="uwsPath" value="uws/**" />
 	<property name="jsonPath" value="org/json/**" />
 	<property name="licensePath" value="COPYING.LESSER" />
@@ -43,6 +46,7 @@
 		<pathelement location="${commonsIOJar}" />
 		<pathelement location="${commonsFileUploadJar}" />
 		<pathelement location="${slf4jApiJar}" />
+		<pathelement location="${jsonJar}" />
 		<pathelement location="${SERVLET-API}" />
 	</path>
 	
@@ -113,6 +117,7 @@
 	<target name="buildLib" depends="compileLib,junitValidation" description="After 'clean', build the library JAR (only classes).">
 		<echo>Generate the library:</echo>
 		<jar basedir="${classesDir}" destfile="${libJarFile}" includes="${includesList}">
+			<zipfileset src="${jsonJar}" excludes="META-INF/*" />
 			<zipfileset src="${commonsIOJar}" excludes="META-INF/**" />
 			<zipfileset src="${commonsFileUploadJar}" excludes="META-INF/**" />
 			<zipfileset dir="${srcDir}" includes="${licensePath}" />
@@ -123,6 +128,7 @@
 	<target name="buildLibAndSrc" depends="buildLib" description="After 'clean' and 'buildLib', build the sources JAR (only .java).">
 		<jar compress="false" destfile="${srcJarFile}">
 			<zipfileset dir="${srcDir}" includes="${includesList},${licensePath}" prefix="${srcDir}" />
+			<zipfileset dir="${libDir}" includes="${jsonJarName}" fullPath="${jsonJar}" />
 			<zipfileset dir="${libDir}" includes="${commonsIOJarName}" fullPath="${commonsIOJar}" />
 			<zipfileset dir="${libDir}" includes="${commonsFileUploadJarName}" fullPath="${commonsFileUploadJar}" />
 		</jar>

src/org/json/CDL.java

-package org.json;
-
-/*
-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.
-*/
-
-/**
- * This provides static methods to convert comma delimited text into a
- * JSONArray, and to covert a JSONArray into comma delimited text. Comma
- * delimited text is a very popular format for data interchange. It is
- * understood by most database, spreadsheet, and organizer programs.
- * <p>
- * Each row of text represents a row in a table or a data record. Each row
- * ends with a NEWLINE character. Each row contains one or more values.
- * Values are separated by commas. A value can contain any character except
- * for comma, unless is is wrapped in single quotes or double quotes.
- * <p>
- * The first row usually contains the names of the columns.
- * <p>
- * A comma delimited list can be converted into a JSONArray of JSONObjects.
- * The names for the elements in the JSONObjects can be taken from the names
- * in the first row.
- * @author JSON.org
- * @version 2010-12-24
- */
-public class CDL {
-
-	/**
-	 * Get the next value. The value can be wrapped in quotes. The value can
-	 * be empty.
-	 * @param x A JSONTokener of the source text.
-	 * @return The value string, or null if empty.
-	 * @throws JSONException if the quoted string is badly formed.
-	 */
-	private static String getValue(JSONTokener x) throws JSONException{
-		char c;
-		char q;
-		StringBuffer sb;
-		do{
-			c = x.next();
-		}while(c == ' ' || c == '\t');
-		switch(c){
-			case 0:
-				return null;
-			case '"':
-			case '\'':
-				q = c;
-				sb = new StringBuffer();
-				for(;;){
-					c = x.next();
-					if (c == q){
-						break;
-					}
-					if (c == 0 || c == '\n' || c == '\r'){
-						throw x.syntaxError("Missing close quote '" + q + "'.");
-					}
-					sb.append(c);
-				}
-				return sb.toString();
-			case ',':
-				x.back();
-				return "";
-			default:
-				x.back();
-				return x.nextTo(',');
-		}
-	}
-
-	/**
-	 * Produce a JSONArray of strings from a row of comma delimited values.
-	 * @param x A JSONTokener of the source text.
-	 * @return A JSONArray of strings.
-	 * @throws JSONException
-	 */
-	public static JSONArray rowToJSONArray(JSONTokener x) throws JSONException{
-		JSONArray ja = new JSONArray();
-		for(;;){
-			String value = getValue(x);
-			char c = x.next();
-			if (value == null || (ja.length() == 0 && value.length() == 0 && c != ',')){
-				return null;
-			}
-			ja.put(value);
-			for(;;){
-				if (c == ','){
-					break;
-				}
-				if (c != ' '){
-					if (c == '\n' || c == '\r' || c == 0){
-						return ja;
-					}
-					throw x.syntaxError("Bad character '" + c + "' (" + (int)c + ").");
-				}
-				c = x.next();
-			}
-		}
-	}
-
-	/**
-	 * Produce a JSONObject from a row of comma delimited text, using a
-	 * parallel JSONArray of strings to provides the names of the elements.
-	 * @param names A JSONArray of names. This is commonly obtained from the
-	 *  first row of a comma delimited text file using the rowToJSONArray
-	 *  method.
-	 * @param x A JSONTokener of the source text.
-	 * @return A JSONObject combining the names and values.
-	 * @throws JSONException
-	 */
-	public static JSONObject rowToJSONObject(JSONArray names, JSONTokener x) throws JSONException{
-		JSONArray ja = rowToJSONArray(x);
-		return ja != null ? ja.toJSONObject(names) : null;
-	}
-
-	/**
-	 * Produce a comma delimited text row from a JSONArray. Values containing
-	 * the comma character will be quoted. Troublesome characters may be 
-	 * removed.
-	 * @param ja A JSONArray of strings.
-	 * @return A string ending in NEWLINE.
-	 */
-	public static String rowToString(JSONArray ja){
-		StringBuffer sb = new StringBuffer();
-		for(int i = 0; i < ja.length(); i += 1){
-			if (i > 0){
-				sb.append(',');
-			}
-			Object object = ja.opt(i);
-			if (object != null){
-				String string = object.toString();
-				if (string.length() > 0 && (string.indexOf(',') >= 0 || string.indexOf('\n') >= 0 || string.indexOf('\r') >= 0 || string.indexOf(0) >= 0 || string.charAt(0) == '"')){
-					sb.append('"');
-					int length = string.length();
-					for(int j = 0; j < length; j += 1){
-						char c = string.charAt(j);
-						if (c >= ' ' && c != '"'){
-							sb.append(c);
-						}
-					}
-					sb.append('"');
-				}else{
-					sb.append(string);
-				}
-			}
-		}
-		sb.append('\n');
-		return sb.toString();
-	}
-
-	/**
-	 * Produce a JSONArray of JSONObjects from a comma delimited text string,
-	 * using the first row as a source of names.
-	 * @param string The comma delimited text.
-	 * @return A JSONArray of JSONObjects.
-	 * @throws JSONException
-	 */
-	public static JSONArray toJSONArray(String string) throws JSONException{
-		return toJSONArray(new JSONTokener(string));
-	}
-
-	/**
-	 * Produce a JSONArray of JSONObjects from a comma delimited text string,
-	 * using the first row as a source of names.
-	 * @param x The JSONTokener containing the comma delimited text.
-	 * @return A JSONArray of JSONObjects.
-	 * @throws JSONException
-	 */
-	public static JSONArray toJSONArray(JSONTokener x) throws JSONException{
-		return toJSONArray(rowToJSONArray(x), x);
-	}
-
-	/**
-	 * Produce a JSONArray of JSONObjects from a comma delimited text string
-	 * using a supplied JSONArray as the source of element names.
-	 * @param names A JSONArray of strings.
-	 * @param string The comma delimited text.
-	 * @return A JSONArray of JSONObjects.
-	 * @throws JSONException
-	 */
-	public static JSONArray toJSONArray(JSONArray names, String string) throws JSONException{
-		return toJSONArray(names, new JSONTokener(string));
-	}
-
-	/**
-	 * Produce a JSONArray of JSONObjects from a comma delimited text string
-	 * using a supplied JSONArray as the source of element names.
-	 * @param names A JSONArray of strings.
-	 * @param x A JSONTokener of the source text.
-	 * @return A JSONArray of JSONObjects.
-	 * @throws JSONException
-	 */
-	public static JSONArray toJSONArray(JSONArray names, JSONTokener x) throws JSONException{
-		if (names == null || names.length() == 0){
-			return null;
-		}
-		JSONArray ja = new JSONArray();
-		for(;;){
-			JSONObject jo = rowToJSONObject(names, x);
-			if (jo == null){
-				break;
-			}
-			ja.put(jo);
-		}
-		if (ja.length() == 0){
-			return null;
-		}
-		return ja;
-	}
-
-	/**
-	 * Produce a comma delimited text from a JSONArray of JSONObjects. The
-	 * first row will be a list of names obtained by inspecting the first
-	 * JSONObject.
-	 * @param ja A JSONArray of JSONObjects.
-	 * @return A comma delimited text.
-	 * @throws JSONException
-	 */
-	public static String toString(JSONArray ja) throws JSONException{
-		JSONObject jo = ja.optJSONObject(0);
-		if (jo != null){
-			JSONArray names = jo.names();
-			if (names != null){
-				return rowToString(names) + toString(names, ja);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Produce a comma delimited text from a JSONArray of JSONObjects using
-	 * a provided list of names. The list of names is not included in the
-	 * output.
-	 * @param names A JSONArray of strings.
-	 * @param ja A JSONArray of JSONObjects.
-	 * @return A comma delimited text.
-	 * @throws JSONException
-	 */
-	public static String toString(JSONArray names, JSONArray ja) throws JSONException{
-		if (names == null || names.length() == 0){
-			return null;
-		}
-		StringBuffer sb = new StringBuffer();
-		for(int i = 0; i < ja.length(); i += 1){
-			JSONObject jo = ja.optJSONObject(i);
-			if (jo != null){
-				sb.append(rowToString(jo.toJSONArray(names)));
-			}
-		}
-		return sb.toString();
-	}
-}

src/org/json/Cookie.java

-package org.json;
-
-/*
-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.
-*/
-
-/**
- * Convert a web browser cookie specification to a JSONObject and back.
- * JSON and Cookies are both notations for name/value pairs.
- * @author JSON.org
- * @version 2010-12-24
- */
-public class Cookie {
-
-	/**
-	 * Produce a copy of a string in which the characters '+', '%', '=', ';'
-	 * and control characters are replaced with "%hh". This is a gentle form
-	 * of URL encoding, attempting to cause as little distortion to the
-	 * string as possible. The characters '=' and ';' are meta characters in
-	 * cookies. By convention, they are escaped using the URL-encoding. This is
-	 * only a convention, not a standard. Often, cookies are expected to have
-	 * encoded values. We encode '=' and ';' because we must. We encode '%' and
-	 * '+' because they are meta characters in URL encoding.
-	 * @param string The source string.
-	 * @return       The escaped result.
-	 */
-	public static String escape(String string){
-		char c;
-		String s = string.trim();
-		StringBuffer sb = new StringBuffer();
-		int length = s.length();
-		for(int i = 0; i < length; i += 1){
-			c = s.charAt(i);
-			if (c < ' ' || c == '+' || c == '%' || c == '=' || c == ';'){
-				sb.append('%');
-				sb.append(Character.forDigit((char)((c >>> 4) & 0x0f), 16));
-				sb.append(Character.forDigit((char)(c & 0x0f), 16));
-			}else{
-				sb.append(c);
-			}
-		}
-		return sb.toString();
-	}
-
-	/**
-	 * Convert a cookie specification string into a JSONObject. The string
-	 * will contain a name value pair separated by '='. The name and the value
-	 * will be unescaped, possibly converting '+' and '%' sequences. The
-	 * cookie properties may follow, separated by ';', also represented as
-	 * name=value (except the secure property, which does not have a value).
-	 * The name will be stored under the key "name", and the value will be
-	 * stored under the key "value". This method does not do checking or
-	 * validation of the parameters. It only converts the cookie string into
-	 * a JSONObject.
-	 * @param string The cookie specification string.
-	 * @return A JSONObject containing "name", "value", and possibly other
-	 *  members.
-	 * @throws JSONException
-	 */
-	public static JSONObject toJSONObject(String string) throws JSONException{
-		String name;
-		JSONObject jo = new JSONObject();
-		Object value;
-		JSONTokener x = new JSONTokener(string);
-		jo.put("name", x.nextTo('='));
-		x.next('=');
-		jo.put("value", x.nextTo(';'));
-		x.next();
-		while(x.more()){
-			name = unescape(x.nextTo("=;"));
-			if (x.next() != '='){
-				if (name.equals("secure")){
-					value = Boolean.TRUE;
-				}else{
-					throw x.syntaxError("Missing '=' in cookie parameter.");
-				}
-			}else{
-				value = unescape(x.nextTo(';'));
-				x.next();
-			}
-			jo.put(name, value);
-		}
-		return jo;
-	}
-
-	/**
-	 * Convert a JSONObject into a cookie specification string. The JSONObject
-	 * must contain "name" and "value" members.
-	 * If the JSONObject contains "expires", "domain", "path", or "secure"
-	 * members, they will be appended to the cookie specification string.
-	 * All other members are ignored.
-	 * @param jo A JSONObject
-	 * @return A cookie specification string
-	 * @throws JSONException
-	 */
-	public static String toString(JSONObject jo) throws JSONException{
-		StringBuffer sb = new StringBuffer();
-
-		sb.append(escape(jo.getString("name")));
-		sb.append("=");
-		sb.append(escape(jo.getString("value")));
-		if (jo.has("expires")){
-			sb.append(";expires=");
-			sb.append(jo.getString("expires"));
-		}
-		if (jo.has("domain")){
-			sb.append(";domain=");
-			sb.append(escape(jo.getString("domain")));
-		}
-		if (jo.has("path")){
-			sb.append(";path=");
-			sb.append(escape(jo.getString("path")));
-		}
-		if (jo.optBoolean("secure")){
-			sb.append(";secure");
-		}
-		return sb.toString();
-	}
-
-	/**
-	 * Convert <code>%</code><i>hh</i> sequences to single characters, and
-	 * convert plus to space.
-	 * @param string A string that may contain
-	 *      <code>+</code>&nbsp;<small>(plus)</small> and
-	 *      <code>%</code><i>hh</i> sequences.
-	 * @return The unescaped string.
-	 */
-	public static String unescape(String string){
-		int length = string.length();
-		StringBuffer sb = new StringBuffer();
-		for(int i = 0; i < length; ++i){
-			char c = string.charAt(i);
-			if (c == '+'){
-				c = ' ';
-			}else if (c == '%' && i + 2 < length){
-				int d = JSONTokener.dehexchar(string.charAt(i + 1));
-				int e = JSONTokener.dehexchar(string.charAt(i + 2));
-				if (d >= 0 && e >= 0){
-					c = (char)(d * 16 + e);
-					i += 2;
-				}
-			}
-			sb.append(c);
-		}
-		return sb.toString();
-	}
-}

src/org/json/CookieList.java

-package org.json;
-
-/*
-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.util.Iterator;
-
-/**
- * Convert a web browser cookie list string to a JSONObject and back.
- * @author JSON.org
- * @version 2010-12-24
- */
-public class CookieList {
-
-	/**
-	 * Convert a cookie list into a JSONObject. A cookie list is a sequence
-	 * of name/value pairs. The names are separated from the values by '='.
-	 * The pairs are separated by ';'. The names and the values
-	 * will be unescaped, possibly converting '+' and '%' sequences.
-	 *
-	 * To add a cookie to a cooklist,
-	 * cookielistJSONObject.put(cookieJSONObject.getString("name"),
-	 *     cookieJSONObject.getString("value"));
-	 * @param string  A cookie list string
-	 * @return A JSONObject
-	 * @throws JSONException
-	 */
-	public static JSONObject toJSONObject(String string) throws JSONException{
-		JSONObject jo = new JSONObject();
-		JSONTokener x = new JSONTokener(string);
-		while(x.more()){
-			String name = Cookie.unescape(x.nextTo('='));
-			x.next('=');
-			jo.put(name, Cookie.unescape(x.nextTo(';')));
-			x.next();
-		}
-		return jo;
-	}
-
-	/**
-	 * Convert a JSONObject into a cookie list. A cookie list is a sequence
-	 * of name/value pairs. The names are separated from the values by '='.
-	 * The pairs are separated by ';'. The characters '%', '+', '=', and ';'
-	 * in the names and values are replaced by "%hh".
-	 * @param jo A JSONObject
-	 * @return A cookie list string
-	 * @throws JSONException
-	 */
-	public static String toString(JSONObject jo) throws JSONException{
-		boolean b = false;
-		Iterator keys = jo.keys();
-		String string;
-		StringBuffer sb = new StringBuffer();
-		while(keys.hasNext()){
-			string = keys.next().toString();
-			if (!jo.isNull(string)){
-				if (b){
-					sb.append(';');
-				}
-				sb.append(Cookie.escape(string));
-				sb.append("=");
-				sb.append(Cookie.escape(jo.getString(string)));
-				b = true;
-			}
-		}
-		return sb.toString();
-	}
-}

src/org/json/HTTP.java

-package org.json;
-
-/*
-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.util.Iterator;
-
-/**
- * Convert an HTTP header to a JSONObject and back.
- * @author JSON.org
- * @version 2010-12-24
- */
-public class HTTP {
-
-	/** Carriage return/line feed. */
-	public static final String CRLF = "\r\n";
-
-	/**
-	 * Convert an HTTP header string into a JSONObject. It can be a request
-	 * header or a response header. A request header will contain
-	 * <pre>{
-	 *    Method: "POST" (for example),
-	 *    "Request-URI": "/" (for example),
-	 *    "HTTP-Version": "HTTP/1.1" (for example)
-	 * }</pre>
-	 * A response header will contain
-	 * <pre>{
-	 *    "HTTP-Version": "HTTP/1.1" (for example),
-	 *    "Status-Code": "200" (for example),
-	 *    "Reason-Phrase": "OK" (for example)
-	 * }</pre>
-	 * In addition, the other parameters in the header will be captured, using
-	 * the HTTP field names as JSON names, so that <pre>
-	 *    Date: Sun, 26 May 2002 18:06:04 GMT
-	 *    Cookie: Q=q2=PPEAsg--; B=677gi6ouf29bn&b=2&f=s
-	 *    Cache-Control: no-cache</pre>
-	 * become
-	 * <pre>{...
-	 *    Date: "Sun, 26 May 2002 18:06:04 GMT",
-	 *    Cookie: "Q=q2=PPEAsg--; B=677gi6ouf29bn&b=2&f=s",
-	 *    "Cache-Control": "no-cache",
-	 * ...}</pre>
-	 * It does no further checking or conversion. It does not parse dates.
-	 * It does not do '%' transforms on URLs.
-	 * @param string An HTTP header string.
-	 * @return A JSONObject containing the elements and attributes
-	 * of the XML string.
-	 * @throws JSONException
-	 */
-	public static JSONObject toJSONObject(String string) throws JSONException{
-		JSONObject jo = new JSONObject();
-		HTTPTokener x = new HTTPTokener(string);
-		String token;
-
-		token = x.nextToken();
-		if (token.toUpperCase().startsWith("HTTP")){
-
-			// Response
-
-			jo.put("HTTP-Version", token);
-			jo.put("Status-Code", x.nextToken());
-			jo.put("Reason-Phrase", x.nextTo('\0'));
-			x.next();
-
-		}else{
-
-			// Request
-
-			jo.put("Method", token);
-			jo.put("Request-URI", x.nextToken());
-			jo.put("HTTP-Version", x.nextToken());
-		}
-
-		// Fields
-
-		while(x.more()){
-			String name = x.nextTo(':');
-			x.next(':');
-			jo.put(name, x.nextTo('\0'));
-			x.next();
-		}
-		return jo;
-	}
-
-	/**
-	 * Convert a JSONObject into an HTTP header. A request header must contain
-	 * <pre>{
-	 *    Method: "POST" (for example),
-	 *    "Request-URI": "/" (for example),
-	 *    "HTTP-Version": "HTTP/1.1" (for example)
-	 * }</pre>
-	 * A response header must contain
-	 * <pre>{
-	 *    "HTTP-Version": "HTTP/1.1" (for example),
-	 *    "Status-Code": "200" (for example),
-	 *    "Reason-Phrase": "OK" (for example)
-	 * }</pre>
-	 * Any other members of the JSONObject will be output as HTTP fields.
-	 * The result will end with two CRLF pairs.
-	 * @param jo A JSONObject
-	 * @return An HTTP header string.
-	 * @throws JSONException if the object does not contain enough
-	 *  information.
-	 */
-	public static String toString(JSONObject jo) throws JSONException{
-		Iterator keys = jo.keys();
-		String string;
-		StringBuffer sb = new StringBuffer();
-		if (jo.has("Status-Code") && jo.has("Reason-Phrase")){
-			sb.append(jo.getString("HTTP-Version"));
-			sb.append(' ');
-			sb.append(jo.getString("Status-Code"));
-			sb.append(' ');
-			sb.append(jo.getString("Reason-Phrase"));
-		}else if (jo.has("Method") && jo.has("Request-URI")){
-			sb.append(jo.getString("Method"));
-			sb.append(' ');
-			sb.append('"');
-			sb.append(jo.getString("Request-URI"));
-			sb.append('"');
-			sb.append(' ');
-			sb.append(jo.getString("HTTP-Version"));
-		}else{
-			throw new JSONException("Not enough material for an HTTP header.");
-		}
-		sb.append(CRLF);
-		while(keys.hasNext()){
-			string = keys.next().toString();
-			if (!"HTTP-Version".equals(string) && !"Status-Code".equals(string) && !"Reason-Phrase".equals(string) && !"Method".equals(string) && !"Request-URI".equals(string) && !jo.isNull(string)){
-				sb.append(string);
-				sb.append(": ");
-				sb.append(jo.getString(string));
-				sb.append(CRLF);
-			}
-		}
-		sb.append(CRLF);
-		return sb.toString();
-	}
-}

src/org/json/HTTPTokener.java

-package org.json;
-
-/*
-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.
-*/
-
-/**
- * The HTTPTokener extends the JSONTokener to provide additional methods
- * for the parsing of HTTP headers.
- * @author JSON.org
- * @version 2010-12-24
- */
-public class HTTPTokener extends JSONTokener {
-
-	/**
-	 * Construct an HTTPTokener from a string.
-	 * @param string A source string.
-	 */
-	public HTTPTokener(String string){
-		super(string);
-	}
-
-	/**
-	 * Get the next token or string. This is used in parsing HTTP headers.
-	 * @throws JSONException
-	 * @return A String.
-	 */
-	public String nextToken() throws JSONException{
-		char c;
-		char q;
-		StringBuffer sb = new StringBuffer();
-		do{
-			c = next();
-		}while(Character.isWhitespace(c));
-		if (c == '"' || c == '\''){
-			q = c;
-			for(;;){
-				c = next();
-				if (c < ' '){
-					throw syntaxError("Unterminated string.");
-				}
-				if (c == q){
-					return sb.toString();
-				}
-				sb.append(c);
-			}
-		}
-		for(;;){
-			if (c == 0 || Character.isWhitespace(c)){
-				return sb.toString();
-			}
-			sb.append(c);
-			c = next();
-		}
-	}
-}

src/org/json/JSONException.java

-package org.json;
-
-/**
- * The JSONException is thrown by the JSON.org classes when things are amiss.
- * @author JSON.org
- * @version 2010-12-24
- */
-public class JSONException extends Exception {
-	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);
-	}
-
-	public JSONException(Throwable cause){
-		super(cause.getMessage());
-		this.cause = cause;
-	}
-
-	public Throwable getCause(){
-		return this.cause;
-	}
-}

src/org/json/JSONML.java

-package org.json;
-
-/*
-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 2011-11-24
- */
-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 </
-
-						token = x.nextToken();
-						if (!(token instanceof String)){
-							throw new JSONException("Expected a closing name instead of '" + token + "'.");
-						}
-						if (x.nextToken() != XML.GT){
-							throw x.syntaxError("Misshaped close tag");
-						}
-						return token;
-					}else if (token == XML.BANG){
-
-						// <!
-
-						c = x.next();
-						if (c == '-'){
-							if (x.next() == '-'){
-								x.skipPast("-->");
-							}
-							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 '<!'.");
-								}else if (token == XML.LT){
-									i += 1;
-								}else if (token == XML.GT){
-									i -= 1;
-								}
-							}while(i > 0);
-						}
-					}else if (token == XML.QUEST){
-
-						// <?
-
-						x.skipPast("?>");
-					}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 <code>&lt;[ [ ]]></code> 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 <code>&lt;[ [ ]]></code> 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 <code>&lt;[ [ ]]></code> 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 <code>&lt;[ [ ]]></code> 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;
-		StringBuffer sb = new StringBuffer();
-		String tagName;
-		String value;
-
-		// Emit <tagName
-
-		tagName = ja.getString(0);
-		XML.noSpace(tagName);
-		tagName = XML.escape(tagName);
-		sb.append('<');
-		sb.append(tagName);
-
-		object = ja.opt(1);
-		if (object instanceof JSONObject){
-			i = 2;
-			jo = (JSONObject)object;
-
-			// Emit the attributes
-
-			keys = jo.keys();
-			while(keys.hasNext()){
-				key = keys.next().toString();
-				XML.noSpace(key);
-				value = jo.optString(key);
-				if (value != null){
-					sb.append(' ');
-					sb.append(XML.escape(key));
-					sb.append('=');
-					sb.append('"');
-					sb.append(XML.escape(value));
-					sb.append('"');
-				}
-			}
-		}else{
-			i = 1;
-		}
-
-		//Emit content in body
-
-		length = ja.length();
-		if (i >= 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));
-					}
-				}
-			}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{
-		StringBuffer sb = new StringBuffer();
-		int i;
-		JSONArray ja;
-		String key;
-		Iterator keys;
-		int length;
-		Object object;
-		String tagName;
-		String value;
-
-		//Emit <tagName
-
-		tagName = jo.optString("tagName");
-		if (tagName == null){
-			return XML.escape(jo.toString());
-		}
-		XML.noSpace(tagName);
-		tagName = XML.escape(tagName);
-		sb.append('<');
-		sb.append(tagName);
-
-		//Emit the attributes
-
-		keys = jo.keys();
-		while(keys.hasNext()){
-			key = keys.next().toString();
-			if (!"tagName".equals(key) && !"childNodes".equals(key)){
-				XML.noSpace(key);
-				value = jo.optString(key);
-				if (value != null){
-					sb.append(' ');
-					sb.append(XML.escape(key));
-					sb.append('=');
-					sb.append('"');
-					sb.append(XML.escape(value));
-					sb.append('"');
-				}
-			}
-		}
-
-		//Emit content in body
-
-		ja = jo.optJSONArray("childNodes");
-		if (ja == null){
-			sb.append('/');
-			sb.append('>');
-		}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();
-	}
-}

src/org/json/JSONString.java

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

src/org/json/JSONStringer.java

-package org.json;
-
-/*
-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.
- * <p>
- * A JSONStringer instance provides a <code>value</code> method for appending
- * values to the
- * text, and a <code>key</code>
- * method for adding keys before values in objects. There are <code>array</code>
- * and <code>endArray</code> methods that make and bound array values, and
- * <code>object</code> and <code>endObject</code> methods which make and bound
- * object values. All of these methods return the JSONWriter instance,
- * permitting cascade style. For example, <pre>
- * myString = new JSONStringer()
- *     .object()
- *         .key("JSON")
- *         .value("Hello, World!")
- *     .endObject()
- *     .toString();</pre> which produces the string <pre>
- * {"JSON":"Hello, World!"}</pre>
- * <p>
- * The first method called must be <code>array</code> or <code>object</code>.
- * 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.
- * <p>
- * 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 <code>null</code> if there was a
-	 * problem in the construction of the JSON text (such as the calls to
-	 * <code>array</code> were not properly balanced with calls to
-	 * <code>endArray</code>).
-	 * @return The JSON text.
-	 */
-	public String toString(){
-		return this.mode == 'd' ? this.writer.toString() : null;
-	}
-}

src/org/json/JSONTokener.java

-package org.json;
-
-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 2012-02-16
- */
-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.
-	 */
-	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
-	 *      <code>"</code>&nbsp;<small>(double quote)</small> or
-	 *      <code>'</code>&nbsp;<small>(single quote)</small>.
-	 * @return      A String.
-	 * @throws JSONException Unterminated string.
-	 */
-	public String nextString(char quote) throws JSONException{
-		char c;
-		StringBuffer sb = new StringBuffer();
-		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{
-		StringBuffer sb = new StringBuffer();
-		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;
-		StringBuffer sb = new StringBuffer();
-		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.
-		 */
-
-		StringBuffer sb = new StringBuffer();
-		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 exc){
-			throw new JSONException(exc);
-		}
-
-		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 + "]";
-	}
-}

src/org/json/JSONWriter.java

-package org.json;
-
-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.
- * <p>
- * A JSONWriter instance provides a <code>value</code> method for appending
- * values to the
- * text, and a <code>key</code>
- * method for adding keys before values in objects. There are <code>array</code>
- * and <code>endArray</code> methods that make and bound array values, and
- * <code>object</code> and <code>endObject</code> methods which make and bound
- * object values. All of these methods return the JSONWriter instance,
- * permitting a cascade style. For example, <pre>
- * new JSONWriter(myWriter)
- *     .object()
- *         .key("JSON")
- *         .value("Hello, World!")
- *     .endObject();</pre> which writes <pre>
- * {"JSON":"Hello, World!"}</pre>
- * <p>
- * The first method called must be <code>array</code> or <code>object</code>.
- * 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.
- * <p>
- * 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
-	 * <code>endArray</code> will be appended to this array. The
-	 * <code>endArray</code> 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
-	 * <code>array</code>.
-	 * @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
-	 * <code>object</code>.
-	 * @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
-	 * <code>endObject</code> will be appended to this object. The
-	 * <code>endObject</code> 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 c 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 <code>true</code> or the value
-	 * <code>false</code>.
-	 * @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));
-	}
-}

src/org/json/README

-JSON in Java [package org.json]
-
-Douglas Crockford
-douglas@crockford.com
-
-2011-02-02
-
-
-JSON is a light-weight, language independent, data interchange format.
-See http://www.JSON.org/
-
-The files in this package implement JSON encoders/decoders in Java. 
-It also includes the capability to convert between JSON and XML, HTTP 
-headers, Cookies, and CDL. 
-
-This is a reference implementation. There is a large number of JSON packages
-in Java. Perhaps someday the Java community will standardize on one. Until 
-then, choose carefully.
-
-The license includes this restriction: "The software shall be used for good, 
-not evil." If your conscience cannot live with that, then choose a different
-package.
-
-The package compiles on Java 1.2 thru Java 1.4.
-
-
-JSONObject.java: The JSONObject can parse text from a String or a JSONTokener
-to produce a map-like object. The object provides methods for manipulating its
-contents, and for producing a JSON compliant object serialization.
-
-JSONArray.java: The JSONObject can parse text from a String or a JSONTokener
-to produce a vector-like object. The object provides methods for manipulating 
-its contents, and for producing a JSON compliant array serialization.
-
-JSONTokener.java: The JSONTokener breaks a text into a sequence of individual
-tokens. It can be constructed from a String, Reader, or InputStream.
-
-JSONException.java: The JSONException is the standard exception type thrown
-by this package.
-
-
-JSONString.java: The JSONString interface requires a toJSONString method, 
-allowing an object to provide its own serialization.
-
-JSONStringer.java: The JSONStringer provides a convenient facility for 
-building JSON strings.
-
-JSONWriter.java: The JSONWriter provides a convenient facility for building 
-JSON text through a writer.
- 
-
-CDL.java: CDL provides support for converting between JSON and comma
-delimited lists.
-
-Cookie.java: Cookie provides support for converting between JSON and cookies.
-
-CookieList.java: CookieList provides support for converting between JSON and
-cookie lists.
-
-HTTP.java: HTTP provides support for converting between JSON and HTTP headers.
-
-HTTPTokener.java: HTTPTokener extends JSONTokener for parsing HTTP headers.
-
-XML.java: XML provides support for converting between JSON and XML.
-
-JSONML.java: JSONML provides support for converting between JSONML and XML.
-
-XMLTokener.java: XMLTokener extends JSONTokener for parsing XML text.
\ No newline at end of file