Merge branch 'master' of https://github.com/douglascrockford/JSON-java

John J. Aylward · John J. Aylward · commit 48302592cfa8 · 2015-12-09T10:07:36.000-05:00
diff --git a/CDL.java b/CDL.java
@@ -41,7 +41,7 @@ of this software and associated documentation files (the "Software"), to deal
  * The names for the elements in the JSONObjects can be taken from the names
  * in the first row.
  * @author JSON.org
- * @version 2015-05-01
+ * @version 2015-12-09
  */
 public class CDL {
 
diff --git a/Cookie.java b/Cookie.java
@@ -28,7 +28,7 @@ of this software and associated documentation files (the "Software"), to deal
  * 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 2014-05-03
+ * @version 2015-12-09
  */
 public class Cookie {
 
diff --git a/CookieList.java b/CookieList.java
@@ -29,7 +29,7 @@ of this software and associated documentation files (the "Software"), to deal
 /**
  * Convert a web browser cookie list string to a JSONObject and back.
  * @author JSON.org
- * @version 2014-05-03
+ * @version 2015-12-09
  */
 public class CookieList {
 
diff --git a/HTTP.java b/HTTP.java
@@ -29,7 +29,7 @@ of this software and associated documentation files (the "Software"), to deal
 /**
  * Convert an HTTP header to a JSONObject and back.
  * @author JSON.org
- * @version 2014-05-03
+ * @version 2015-12-09
  */
 public class HTTP {
 
diff --git a/HTTPTokener.java b/HTTPTokener.java
@@ -28,7 +28,7 @@ of this software and associated documentation files (the "Software"), to deal
  * The HTTPTokener extends the JSONTokener to provide additional methods
  * for the parsing of HTTP headers.
  * @author JSON.org
- * @version 2014-05-03
+ * @version 2015-12-09
  */
 public class HTTPTokener extends JSONTokener {
 
diff --git a/JSONException.java b/JSONException.java
@@ -4,7 +4,7 @@
  * The JSONException is thrown by the JSON.org classes when things are amiss.
  *
  * @author JSON.org
- * @version 2015-10-18
+ * @version 2015-12-09
  */
 public class JSONException extends RuntimeException {
     /** Serialization ID */
diff --git a/JSONML.java b/JSONML.java
@@ -33,7 +33,7 @@ of this software and associated documentation files (the "Software"), to deal
  * the JsonML transform.
  *
  * @author JSON.org
- * @version 2014-05-03
+ * @version 2015-12-09
  */
 public class JSONML {
 
diff --git a/JSONObject.java b/JSONObject.java
@@ -92,7 +92,7 @@ of this software and associated documentation files (the "Software"), to deal
  * </ul>
  *
  * @author JSON.org
- * @version 2015-12-05
+ * @version 2015-12-09
  */
 public class JSONObject {
     /**
diff --git a/JSONString.java b/JSONString.java
diff --git a/JSONStringer.java b/JSONStringer.java
@@ -54,7 +54,7 @@ of this software and associated documentation files (the "Software"), to deal
  * <p>
  * This can sometimes be easier than using a JSONObject to build a string.
  * @author JSON.org
- * @version 2008-09-18
+ * @version 2015-12-09
  */
 public class JSONStringer extends JSONWriter {
     /**
diff --git a/JSONWriter.java b/JSONWriter.java
@@ -54,7 +54,7 @@ of this software and associated documentation files (the "Software"), to deal
  * <p>
  * This can sometimes be easier than using a JSONObject to build a string.
  * @author JSON.org
- * @version 2011-11-24
+ * @version 2015-12-09
  */
 public class JSONWriter {
     private static final int maxdepth = 200;
diff --git a/README b/README
diff --git a/XML.java b/XML.java
@@ -31,7 +31,7 @@ of this software and associated documentation files (the "Software"), to deal
  * covert a JSONObject into an XML text.
  * 
  * @author JSON.org
- * @version 2015-10-18
+ * @version 2015-12-09
  */
 @SuppressWarnings("boxing")
 public class XML {
diff --git a/XMLTokener.java b/XMLTokener.java
@@ -28,7 +28,7 @@ of this software and associated documentation files (the "Software"), to deal
  * The XMLTokener extends the JSONTokener to provide additional methods
  * for the parsing of XML texts.
  * @author JSON.org
- * @version 2014-05-03
+ * @version 2015-12-09
  */
 public class XMLTokener extends JSONTokener {
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`* The JSONException is thrown by the JSON.org classes when things are amiss.`
`5`	`5`	`*`
`6`	`6`	`* @author JSON.org`
`7`		`- * @version 2015-10-18`
	`7`	`+ * @version 2015-12-09`
`8`	`8`	`*/`
`9`	`9`	`public class JSONException extends RuntimeException {`
`10`	`10`	`/** Serialization ID */`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ of this software and associated documentation files (the "Software"), to deal`
`33`	`33`	`* the JsonML transform.`
`34`	`34`	`*`
`35`	`35`	`* @author JSON.org`
`36`		`- * @version 2014-05-03`
	`36`	`+ * @version 2015-12-09`
`37`	`37`	`*/`
`38`	`38`	`public class JSONML {`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ of this software and associated documentation files (the "Software"), to deal`
`92`	`92`	`* </ul>`
`93`	`93`	`*`
`94`	`94`	`* @author JSON.org`
`95`		`- * @version 2015-12-05`
	`95`	`+ * @version 2015-12-09`
`96`	`96`	`*/`
`97`	`97`	`public class JSONObject {`
`98`	`98`	`/**`