Commit Graph

329 Commits

Author SHA1 Message Date
Mads Ager dfa651e777 Make nextString throw a JSONException instead of a NumberFormatException for malformed input. 2016-06-02 15:56:48 +02:00
Sean Leary 612dafc750 Update JSONObject.java 2016-05-20 21:10:17 -05:00
Sean Leary 808320801a Update JSONArray.java
Update version timestamp
2016-05-20 21:09:53 -05:00
Sean Leary b2bde1f468 Merge pull request #234 from erosb/master
fixing stleary/JSON-Java#233
2016-05-20 21:03:06 -05:00
Bence Erős 56be31e7a8 fixing stleary/JSON-Java#233 2016-05-16 14:53:34 +02:00
stleary 9a81b40334 added some JavaDocs 2016-05-14 11:09:51 -05:00
stleary 4a458a9f1c add timestamps to recent commits, javadocs for JSONObject, JSONArray queryFrom() methods 2016-05-14 09:22:18 -05:00
Sean Leary 8a72509e6e Merge pull request #222 from erosb/master
JSON Pointer implementation
2016-05-13 22:46:52 -05:00
Bence Erős c044eb14dd added copying to JSONPointer constructor 2016-05-05 15:59:43 +02:00
Bence Erős 5ae6a66e38 added javadoc & null check in Builder#append(String) 2016-05-03 23:41:51 +02:00
Bence Erős d833c2d8de added builder class for JSONPointer, and implemented toString() and toURIFragment() 2016-05-03 23:18:05 +02:00
Sean Leary f21ffbe189 Update CDL.java
Date of last change.
2016-05-02 22:12:29 -05:00
Sean Leary cad23423ab Update JSONObject.java
Forgot to update date of last change
2016-05-02 22:11:20 -05:00
Sean Leary ebf08f5651 Merge pull request #226 from stleary/restore-1.6-compatibility
fix to compile with 1.6.0_45
2016-05-01 22:59:29 -05:00
Sean Leary f239dc75ad Merge pull request #219 from captainIowa/master
Added CSV change to CDL.java
2016-05-01 22:55:13 -05:00
stleary 1ca8933a8f fix to compile with 1.6.0_45 2016-04-28 22:12:16 -05:00
Bence Erős cbb1546c53 README improvements for stleary/JSON-Java#218 2016-04-28 16:45:17 +02:00
Bence Erős c1a789a70c adding missing license headers 2016-04-27 00:11:47 +02:00
Bence Erős bff352791c removed @author tag from JSONPointerException 2016-04-27 00:10:45 +02:00
Bence Erős 5223aadd67 added some javadoc to JSONPointer 2016-04-27 00:10:06 +02:00
Bence Erős 45bd72c15d added JSONObject#query() and JSONPointer#query() methods 2016-04-26 23:48:14 +02:00
Bence Erős 792c6f6a9c improved failure handling 2016-04-26 23:32:15 +02:00
Bence Erős 5bee7e3b45 escape handling improvements & URL fragment notation handling 2016-04-26 23:00:16 +02:00
Bence Erős 612e41950c initial implementation of JSONPointer 2016-04-17 23:21:38 +02:00
Brian Russell 86cbfbc864 Added CSV change to CDL.java 2016-04-12 14:13:15 -04:00
Sean Leary 25a87975be Update date of merge. 2016-03-05 15:20:20 -06:00
Sean Leary 2f3af56535 Update date of merge. 2016-03-05 15:19:45 -06:00
Sean Leary 26477f4e76 Merge pull request #203 from joeferner/to-java
Adds JSONArray toList method and JSONObject toMap method
2016-03-05 15:18:38 -06:00
Joe Ferner f024b52108 Adds JSONArray toList method and JSONObject toMap method 2016-02-27 11:20:25 -05:00
Sean Leary 2657915293 Update README
Include some text about 1.6 compatibility and add the latest release information.
2016-02-13 22:26:45 -06:00
Sean Leary 07a0f60b6e Merge pull request #195 from publishing-systems/master
Java 1.6 compatibility.
20160212
2016-02-12 18:10:13 -06:00
skreutzer 60349ece54 Java 1.6 compatibility. 2016-02-08 23:30:27 -05:00
Sean Leary ba2585fe6c Version date 2016-01-30 15:45:11 -06:00
Sean Leary 93c79ca566 Version date 2016-01-30 15:44:41 -06:00
Sean Leary 62486fdea4 Version date 2016-01-30 15:44:08 -06:00
Sean Leary 97f1b2744f Merge pull request #188 from johnjaylward/FixNegativeZero
Fix negative zero
2016-01-30 15:42:34 -06:00
John J. Aylward c2b3f2bdb1 adds back in the XML.stringToValue method, but deprecates it. 2016-01-27 15:21:11 -05:00
John J. Aylward 3007fc8ebe Removes custom XML stringToValue method in favor of keeping a consistent
implementation in JSONObject
2016-01-27 15:03:19 -05:00
John J. Aylward 39b1c0cb66 fixes error in -0 check 2016-01-27 10:45:23 -05:00
John J. Aylward 07b2d65e30 Fixes #187 -0 now returns as a double. 2016-01-27 10:39:31 -05:00
John J. Aylward 5b67330b71 Merge branch 'master' of https://github.com/douglascrockford/JSON-java 2016-01-27 09:53:03 -05:00
Sean Leary 9950350f12 Merge pull request #186 from douglascrockford/update-readme-with-number-info
Update README with number information
2016-01-03 14:52:50 -06:00
Sean Leary 2b2fac3eb1 Broke up some overly long lines. 2016-01-01 16:17:30 -06:00
Sean Leary e2a0bb16a2 Update README with number information
See https://github.com/douglascrockford/JSON-java/issues/162
2016-01-01 14:11:02 -06:00
Sean Leary a971736f5b Update version string for https://github.com/douglascrockford/JSON-java/pull/170 2016-01-01 13:52:12 -06:00
Sean Leary 757fd566ab Merge pull request #170 from johnjaylward/HandleArraysConsistently
Handle arrays consistently
2016-01-01 13:44:57 -06:00
Sean Leary e6f5047742 Merge pull request #185 from douglascrockford/write-with-indent-params
change to public: write(writer, indentfactor, indent)
2015-12-30 15:06:07 -06:00
stleary 8688494876 change to public, write(writer, indentfactor, indent) 2015-12-23 19:53:30 -06:00
John J. Aylward 48302592cf Merge branch 'master' of https://github.com/douglascrockford/JSON-java 2015-12-09 10:07:36 -05:00
Sean Leary 03dd662e72 Merge pull request #180 from netheril96/my
Remove executable bit
2015-12-09 01:08:47 -06:00