Commit Graph

  • 93704371bb Updates to the Javadoc for exceptions John J. Aylward 2016-07-18 14:12:06 -04:00
  • 42e0944708 Brings in changes from PR #70 to be updated to HEAD Jakob Stemberger 2012-11-14 20:37:36 +01:00
  • 71c1eba1e7 Merge pull request #51 from johnjaylward/VerifyOptConversions Sean Leary 2016-07-08 22:31:48 -05:00
  • c2de224711 Verify opt method conversions for JSONArray and JSONObject John J. Aylward 2016-07-08 16:58:58 -04:00
  • 7627d40d10 reduces the use of unnecessary exceptions Simulant 2016-07-08 22:17:05 +02:00
  • 04181fb6e2 Merge pull request #246 from johnjaylward/LicenseFile Sean Leary 2016-07-02 13:20:54 -05:00
  • 239e0b7070 Merge pull request #242 from johnjaylward/issue240 Sean Leary 2016-07-02 13:20:21 -05:00
  • a8a71898a3 Create LICENSE johnjaylward 2016-06-22 14:49:52 -04:00
  • 86e8f7b313 Update README johnjaylward 2016-06-17 16:39:11 -04:00
  • 01af31718e Merge pull request #50 from johnjaylward/issue240 Sean Leary 2016-06-17 09:36:42 -05:00
  • 1204ea9dcf fixes a typo John J. Aylward 2016-06-17 00:04:27 -04:00
  • c5deff636b updates README for new project layout John J. Aylward 2016-06-16 23:59:34 -04:00
  • 46a1c9acf9 Adds test case to confirm the parsing of control characters John J. Aylward 2016-06-16 13:02:08 -04:00
  • 42791ab12d Updates README to note that the parser does allow some invalid JSON John J. Aylward 2016-06-16 13:01:22 -04:00
  • 80f9e48e64 Moves src folder to simplify build.gradle configuration. If JSON-Java source is merged, it's src fold would now be src/main/java/org.json/ instead of src/main/org.json as well. John J. Aylward 2016-06-16 12:20:54 -04:00
  • 0e0f3f2167 Merge pull request #1 from stleary/master johnjaylward 2016-06-16 11:44:09 -04:00
  • b3abaa5b4c Merge pull request #1 from stleary/master johnjaylward 2016-06-16 11:43:05 -04:00
  • 40f170b508 Merge pull request #49 from madsager/master Sean Leary 2016-06-07 21:29:25 -05:00
  • eb569b58fc Merge pull request #236 from madsager/master Sean Leary 2016-06-07 21:29:02 -05:00
  • c7fdada0fd Add test that an invalid escape sequence results in a JSONException and not a NumberFormatException. Mads Ager 2016-06-02 16:41:43 +02:00
  • 16a86d73df Pass in the throwable that caused the error. Mads Ager 2016-06-02 16:11:15 +02:00
  • dfa651e777 Make nextString throw a JSONException instead of a NumberFormatException for malformed input. Mads Ager 2016-06-02 15:56:48 +02:00
  • 51bcbebaa8 Merge pull request #48 from erosb/master Sean Leary 2016-05-20 21:12:12 -05:00
  • 612dafc750 Update JSONObject.java Sean Leary 2016-05-20 21:10:17 -05:00
  • 808320801a Update JSONArray.java Sean Leary 2016-05-20 21:09:53 -05:00
  • b2bde1f468 Merge pull request #234 from erosb/master Sean Leary 2016-05-20 21:03:06 -05:00
  • a1893ebc02 unittests for stlear/JSON-Java#233 Bence Erős 2016-05-16 14:54:01 +02:00
  • 56be31e7a8 fixing stleary/JSON-Java#233 Bence Erős 2016-05-16 14:53:34 +02:00
  • 8ed0362683 convert remaining JsonPath expressions to JSONPointer stleary 2016-05-14 13:38:46 -05:00
  • 15f48a0500 convert tests to use JSONPointer where practical stleary 2016-05-14 11:59:24 -05:00
  • 9a81b40334 added some JavaDocs stleary 2016-05-14 11:09:51 -05:00
  • 45cbc66f5b add coverage for JSONObject, JSONArray queryFrom() stleary 2016-05-14 09:26:03 -05:00
  • 4a458a9f1c add timestamps to recent commits, javadocs for JSONObject, JSONArray queryFrom() methods stleary 2016-05-14 09:22:18 -05:00
  • 06ae87c456 exclude resources from test stleary 2016-05-13 23:22:54 -05:00
  • 7038ea884e Merge pull request #47 from stleary/add-to-test-suite-and-fix-resource Sean Leary 2016-05-13 23:17:10 -05:00
  • 0112d82755 add JSONPointerTest to test suite, fix resource for gradle build stleary 2016-05-13 23:13:06 -05:00
  • 46044bfc51 Merge pull request #46 from erosb/master Sean Leary 2016-05-13 22:47:14 -05:00
  • 8a72509e6e Merge pull request #222 from erosb/master Sean Leary 2016-05-13 22:46:52 -05:00
  • a9ff159c78 Update README.md Sean Leary 2016-05-13 15:17:22 -05:00
  • b843d67a92 Update README.md Sean Leary 2016-05-07 07:03:50 -05:00
  • 691734f342 Update README.md Sean Leary 2016-05-07 07:03:30 -05:00
  • ccc7a7af29 Update README.md Sean Leary 2016-05-07 07:02:50 -05:00
  • adb3118d31 added test for checking if the JSONPointer is immutable Bence Erős 2016-05-05 16:00:15 +02:00
  • c044eb14dd added copying to JSONPointer constructor Bence Erős 2016-05-05 15:59:43 +02:00
  • 2eed4be5fc one more test for null-check in Builder#append(String) Bence Erős 2016-05-03 23:42:26 +02:00
  • 5ae6a66e38 added javadoc & null check in Builder#append(String) Bence Erős 2016-05-03 23:41:51 +02:00
  • 6edc093803 adding unittests for JSPONPointer#toString(), toURIFragment() and its builder class Bence Erős 2016-05-03 23:20:17 +02:00
  • d833c2d8de added builder class for JSONPointer, and implemented toString() and toURIFragment() Bence Erős 2016-05-03 23:18:05 +02:00
  • f21ffbe189 Update CDL.java Sean Leary 2016-05-02 22:12:29 -05:00
  • cad23423ab Update JSONObject.java Sean Leary 2016-05-02 22:11:20 -05:00
  • ebf08f5651 Merge pull request #226 from stleary/restore-1.6-compatibility Sean Leary 2016-05-01 22:59:29 -05:00
  • 77d0873abd Merge pull request #45 from captainIowa/master Sean Leary 2016-05-01 22:55:49 -05:00
  • f239dc75ad Merge pull request #219 from captainIowa/master Sean Leary 2016-05-01 22:55:13 -05:00
  • 052ce94a34 Update README.md Sean Leary 2016-05-01 22:53:53 -05:00
  • 4a3565afb3 unit test integration stleary 2016-05-01 22:47:23 -05:00
  • 1ca8933a8f fix to compile with 1.6.0_45 stleary 2016-04-28 22:12:16 -05:00
  • cbb1546c53 README improvements for stleary/JSON-Java#218 Bence Erős 2016-04-28 16:45:17 +02:00
  • c1a789a70c adding missing license headers Bence Erős 2016-04-27 00:11:47 +02:00
  • bff352791c removed @author tag from JSONPointerException Bence Erős 2016-04-27 00:10:45 +02:00
  • 5223aadd67 added some javadoc to JSONPointer Bence Erős 2016-04-27 00:10:06 +02:00
  • 45bd72c15d added JSONObject#query() and JSONPointer#query() methods Bence Erős 2016-04-26 23:48:14 +02:00
  • 792c6f6a9c improved failure handling Bence Erős 2016-04-26 23:32:15 +02:00
  • e748c60eb1 tests for improved failure handling Bence Erős 2016-04-26 23:31:43 +02:00
  • f857dda5d8 removing some deprecated commented code Bence Erős 2016-04-26 23:03:01 +02:00
  • 66f740eb45 rolling back unwanted gitignore change in previous commit Bence Erős 2016-04-26 23:02:26 +02:00
  • 6211384f87 tests for url fragment notation handling, moving test document to separate file Bence Erős 2016-04-26 23:01:18 +02:00
  • 5bee7e3b45 escape handling improvements & URL fragment notation handling Bence Erős 2016-04-26 23:00:16 +02:00
  • e00191798e Added unit tests for escaped quotes. Brian Russell 2016-04-24 23:04:12 -04:00
  • 9c47ba299d initial test for JSONPointer class Bence Erős 2016-04-18 21:49:14 +02:00
  • 612e41950c initial implementation of JSONPointer Bence Erős 2016-04-17 23:21:38 +02:00
  • 86cbfbc864 Added CSV change to CDL.java Brian Russell 2016-04-12 14:13:15 -04:00
  • 25a87975be Update date of merge. Sean Leary 2016-03-05 15:20:20 -06:00
  • 2f3af56535 Update date of merge. Sean Leary 2016-03-05 15:19:45 -06:00
  • 26477f4e76 Merge pull request #203 from joeferner/to-java Sean Leary 2016-03-05 15:18:38 -06:00
  • f024b52108 Adds JSONArray toList method and JSONObject toMap method Joe Ferner 2016-02-26 23:46:41 -05:00
  • 2657915293 Update README Sean Leary 2016-02-13 22:26:45 -06:00
  • 07a0f60b6e Merge pull request #195 from publishing-systems/master Sean Leary 2016-02-12 18:10:13 -06:00
  • 60349ece54 Java 1.6 compatibility. skreutzer 2016-02-08 23:30:27 -05:00
  • 8f16e065c5 Merge pull request #39 from johnjaylward/FixNegativeZero Sean Leary 2016-01-30 15:47:06 -06:00
  • ba2585fe6c Version date Sean Leary 2016-01-30 15:45:11 -06:00
  • 93c79ca566 Version date Sean Leary 2016-01-30 15:44:41 -06:00
  • 62486fdea4 Version date Sean Leary 2016-01-30 15:44:08 -06:00
  • 97f1b2744f Merge pull request #188 from johnjaylward/FixNegativeZero Sean Leary 2016-01-30 15:42:34 -06:00
  • c2b3f2bdb1 adds back in the XML.stringToValue method, but deprecates it. John J. Aylward 2016-01-27 15:21:11 -05:00
  • 3007fc8ebe Removes custom XML stringToValue method in favor of keeping a consistent implementation in JSONObject John J. Aylward 2016-01-27 15:03:19 -05:00
  • 974c09b22a Fixes typo in assert John J. Aylward 2016-01-27 15:02:37 -05:00
  • bd958e0830 fixes formatting John J. Aylward 2016-01-27 11:36:15 -05:00
  • 67d888e9be Adds test cases to verify that -0 and -0.0 are processed as Double John J. Aylward 2016-01-27 11:32:11 -05:00
  • 39b1c0cb66 fixes error in -0 check John J. Aylward 2016-01-27 10:45:23 -05:00
  • 07b2d65e30 Fixes #187 -0 now returns as a double. John J. Aylward 2016-01-27 10:39:31 -05:00
  • 5b67330b71 Merge branch 'master' of https://github.com/douglascrockford/JSON-java John J. Aylward 2016-01-27 09:53:03 -05:00
  • d3b197b1b9 Merge pull request #37 from stleary/move-files-to-maven-friendly-dirs Sean Leary 2016-01-05 20:46:43 -06:00
  • 706d898648 latest stleary 2016-01-03 21:39:44 -06:00
  • ace08f1944 latest stleary 2016-01-03 21:39:30 -06:00
  • 9950350f12 Merge pull request #186 from douglascrockford/update-readme-with-number-info Sean Leary 2016-01-03 14:52:50 -06:00
  • 2b2fac3eb1 Broke up some overly long lines. Sean Leary 2016-01-01 16:17:30 -06:00
  • e2a0bb16a2 Update README with number information Sean Leary 2016-01-01 14:11:02 -06:00
  • 280ce71285 tabs to spaces stleary 2016-01-01 13:54:47 -06:00
  • a971736f5b Update version string for https://github.com/douglascrockford/JSON-java/pull/170 Sean Leary 2016-01-01 13:52:12 -06:00
  • 147343c51b Merge pull request #29 from johnjaylward/HandleArraysConsistently Sean Leary 2016-01-01 13:46:02 -06:00