updating fork#1

Merged

effad merged 133 commits intoeffad:masterfrom

May 16, 2017

Commits on Oct 4, 2015

JSONObject and JSONArray initialization:
Lukas Treyer
committed

Commits on Oct 11, 2015

changed all method signatures containing collections and maps to accept
Lukas Treyer
committed
changed Map<String, ?> method parameters to Map<?,?>
Lukas Treyer
committed

Commits on Oct 12, 2015

Properly overrides the Exception class.
John J. Aylward
committed
Fixes possible NPE
John J. Aylward
committed
Allows a custom message to be passed with a cause.
John J. Aylward
committed
Expands javadoc
John J. Aylward
committed
makes params final
John J. Aylward
committed
removed 6 unnecessary @SuppressWarnings("unchecked") annotations.
Lukas Treyer
committed

Commits on Oct 14, 2015

Commits on Oct 25, 2015

Include latest Maven release information
stleary
committed

Commits on Oct 26, 2015

Modifies XML output to be handled the same for a native java array as well as a JSONArray.
John J. Aylward
committed
Changes JSONArray for loops to use the new iterators.
John J. Aylward
committed
Formatting
John J. Aylward
committed

Commits on Nov 21, 2015

Update readme with proposed release information
stleary
committed

Commits on Nov 24, 2015

Merge pull request #175 from douglascrockford/release-20151123
stleary
committed

Commits on Dec 2, 2015

Update JavaDoc for JSONObject Constructors
andrew-fletcher
committed

Commits on Dec 6, 2015

Commits on Dec 8, 2015

Merge branch 'master' of https://github.com/douglascrockford/JSON-java
John J. Aylward
committed

Commits on Dec 9, 2015

Commits on Dec 24, 2015

change to public, write(writer, indentfactor, indent)
stleary
committed

Commits on Dec 30, 2015

Merge pull request #185 from douglascrockford/write-with-indent-params
stleary
committed

Commits on Jan 3, 2016

Merge pull request #186 from douglascrockford/update-readme-with-number-info
stleary
committed

Commits on Jan 27, 2016

Merge branch 'master' of https://github.com/douglascrockford/JSON-java
John J. Aylward
committed
Fixes #187 -0 now returns as a double.
John J. Aylward
committed
fixes error in -0 check
John J. Aylward
committed
Removes custom XML stringToValue method in favor of keeping a consistent
John J. Aylward
committed
adds back in the XML.stringToValue method, but deprecates it.
John J. Aylward
committed

Commits on Jan 30, 2016

Commits on Feb 9, 2016

Java 1.6 compatibility.
skreutzer
committed

Commits on Feb 13, 2016

Merge pull request #195 from publishing-systems/master
stleary
committed

Commits on Feb 14, 2016

Update README
stleary
committed

Commits on Feb 27, 2016

Adds JSONArray toList method and JSONObject toMap method
joeferner
committed

Commits on Mar 5, 2016

Commits on Apr 12, 2016

Added CSV change to CDL.java
brianrussell2
committed

Commits on Apr 17, 2016

initial implementation of JSONPointer
erosb
committed

Commits on Apr 28, 2016

README improvements for stleary/JSON-Java#218
erosb
committed

Commits on Apr 29, 2016

fix to compile with 1.6.0_45
stleary
committed

Commits on May 2, 2016

Commits on May 5, 2016

added copying to JSONPointer constructor
erosb
committed

Commits on May 14, 2016

Commits on May 16, 2016

fixing stleary/JSON-Java#233
erosb
committed

Commits on May 21, 2016

Commits on Jun 2, 2016

Commits on Jun 8, 2016

Merge pull request #236 from madsager/master
stleary
committed

Commits on Jun 16, 2016

Commits on Jun 17, 2016

Update README
johnjaylward
authored

Commits on Jun 22, 2016

Create LICENSE
johnjaylward
authored

Commits on Jul 2, 2016

Commits on Jul 8, 2016

reduces the use of unnecessary exceptions
xxxertetet
committed

Commits on Jul 18, 2016

Brings in changes from PR #70 to be updated to HEAD

yaccob
authored and
John J. Aylward
committed
Updates to the Javadoc for exceptions
John J. Aylward
committed
Cleans up the JSONML changes and adds similar changes to the XML class
John J. Aylward
committed

Commits on Jul 19, 2016

Revert "reduces the use of unnecessary exceptions"
Nils Faupel
committed
reduce the use of unnecessary exceptions
Nils Faupel
committed

Commits on Jul 27, 2016

Merge pull request #249 from Simulant87/master
stleary
authored

Commits on Aug 1, 2016

Merge pull request #253 from johnjaylward/OptionalTypeConversion
stleary
authored

Commits on Aug 7, 2016

Update README
stleary
authored

Commits on Aug 8, 2016

JSONWriter uses Appendable.
run2000
committed

Commits on Aug 9, 2016

Revert "reduces the use of unnecessary exceptions"
stleary
authored

Commits on Aug 10, 2016

Commits on Aug 11, 2016

Commits on Aug 15, 2016

Update JSONArray.java
stleary
authored
Update JSONObject.java
stleary
authored
revert back changes to Number support
John J. Aylward
committed
Merge remote-tracking branch 'upstream/master' into EnumCleanup
John J. Aylward
committed

Commits on Aug 17, 2016

Fix for number output bug.
John J. Aylward
committed

Commits on Aug 19, 2016

Merge pull request #271 from johnjaylward/EnumCleanup
stleary
authored

Commits on Aug 26, 2016

Merge branch 'master' of github.com:stleary/JSON-java into NumberOutputFix
John J. Aylward
committed

Commits on Sep 9, 2016

Merge pull request #274 from johnjaylward/NumberOutputFix
stleary
authored

Commits on Sep 22, 2016

Implements unicode escaping similar to JSONObject.
John J. Aylward
committed
Updates to iterate on code points instead of characters and changes the encoding to only encode control characters as defined by ISO standard.
John J. Aylward
committed
Adds more javadoc.
John J. Aylward
committed
Fixes code point output when unescaping code points. XML escapes are an entire code point, not surrogate pairs like in JSON.
John J. Aylward
committed
fixes code point appends to string builder
John J. Aylward
committed
properly unescape tokens in JSONML for reversability.
John J. Aylward
committed

Commits on Sep 29, 2016

Changes encoding to better match the XML spec section 2.2
John J. Aylward
committed
fixes object comparison
John J. Aylward
committed
fixes spacing
John J. Aylward
committed

Commits on Oct 5, 2016

fixing #291
erosb
committed

Commits on Oct 8, 2016

Merge pull request #292 from erosb/master
stleary
authored

Commits on Nov 24, 2016

Merge pull request #288 from johnjaylward/XmlEscape
stleary
authored

Commits on Dec 5, 2016

Commits on Feb 10, 2017

make sure locale independent data is not upper/lowercased incorrectly. See #315
John J. Aylward
committed

Commits on Feb 20, 2017

Merge pull request #317 from johnjaylward/fixLocale
stleary
authored

Commits on Feb 25, 2017

Commits on Mar 28, 2017

Merge pull request #324 from dtalex/JSONPointerOnBeans
stleary
authored

Commits on Apr 18, 2017

Update LICENSE
stleary
authored

Commits on May 16, 2017

Update README
stleary
authored