erik/JSON-java
erik/JSON-java
1
0
Fork 0
mirror of https://github.com/ethauvin/JSON-java.git synced 2025-06-17 07:50:52 -07:00
Code Releases Activity
160 commits 11 branches 11 tags 1.9 MiB
Commit graph

47 commits

Author SHA1 Message Date
Sean Leary
cad23423ab Update JSONObject.java 
Forgot to update date of last change
 2016-05-02 22:11:20 -05:00
stleary
1ca8933a8f fix to compile with 1.6.0_45 2016-04-28 22:12:16 -05:00
Sean Leary
25a87975be Update date of merge. 2016-03-05 15:20:20 -06:00
Joe Ferner
f024b52108 Adds JSONArray toList method and JSONObject toMap method 2016-02-27 11:20:25 -05:00
skreutzer
60349ece54 Java 1.6 compatibility. 2016-02-08 23:30:27 -05:00
Sean Leary
93c79ca566 Version date 2016-01-30 15:44:41 -06: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
stleary
8688494876 change to public, write(writer, indentfactor, indent) 2015-12-23 19:53:30 -06:00
Siyuan Ren
23cf659730 Remove executable permission bit from file mode 2015-12-09 09:50:59 +08:00
Sean Leary
39e3ccc671 Update version 
Update version after merge of https://github.com/douglascrockford/JSON-java/pull/179
 2015-12-05 20:14:15 -06:00
Andrew Fletcher
cadba9400c Update JavaDoc for JSONObject Constructors 
Two JSONObject constructors incorrectly specify a @throws JSONException
tag in the JavaDoc for those constructors. Remove the relevant JavaDoc.
 2015-12-02 10:49:54 -08:00
Sean Leary
33ae025e78 Update JSONObject.java 
Update version for https://github.com/douglascrockford/JSON-java/pull/153
 2015-10-29 18:24:46 -05:00
Lukas Treyer
5ddc515679 removed 6 unnecessary @SuppressWarnings("unchecked") annotations. 2015-10-12 23:52:14 +02:00
Lukas Treyer
25b5aa7ef2 changed Map<String, ?> method parameters to Map<?,?> 
changed Iterator to foreach loop in JSONArray ctor
JSONArray(Collection<?> collection) and JSONObject ctor
JSONObject(Map<?,?> map)
 2015-10-11 12:21:12 +02:00
Lukas Treyer
409eb9f292 changed all method signatures containing collections and maps to accept 
wildcard generic types, e.g. Collection<?> instead of
Collection<Object>. This was proposed by other pull requests (#111,
#112) already. Consider this commit as merge with #111 and #112.

JSONArray:
	- put(Collection<?> value) {...}
	- put(Map<String, ?> value) {...}
	- put(int index, Collection<?> value) throws JSONException {...}
	- put(int index, Map<String, ?> value) throws JSONException {...}

JSONObject:
	- put(String key, Collection<?> value) throws JSONException {...}
	- put(String key, Map<String, ?> value) throws JSONException {...}


Changed all code affected by new JSONObject and JSONArray constructors:
	
JSONObject:
	- valueToString(Object value) throws JSONException {
		- value instanceof Map
		- value instanceof Collection
	  }
	- wrap(Object object) {
		- value instanceof Map
		- value instanceof Collection
	  }
	- writeValue(Writer writer, Object value,
			 int indentFactor, int indent){
        - value instanceof Map
        - value instanceof Collection
      }
 2015-10-11 11:20:08 +02:00
Lukas Treyer
0afd26623c JSONObject and JSONArray initialization: 
JSONObject(Map<String, ?> map) allows to initialize the JSONObject with
a Map<String, String>

JSONArray(Collection<?> collection) allows to initialize a JSONArray
with a Collection<JSONObject>
 2015-10-04 23:17:30 +02:00
stleary
5fc22e32a8 fix edit dates for enum support 2015-07-22 20:18:30 -05:00
stleary
9785b4ff0b enum support 2015-07-22 20:16:02 -05:00
stleary
ca3001629a latest 2015-07-22 20:11:07 -05:00
stleary
71d9ad2b99 update version dates 2015-07-06 22:27:10 -05:00
stleary
474f285cc8 Merge branch 'big-numbers' of https://github.com/douglascrockford/JSON-Java into local-big-numbers 2015-07-03 22:05:05 -05:00
stleary
6ab6f063c8 latest 2015-07-03 20:41:47 -05:00
stleary
a76d7262d1 support BigInteger and BigDecimal 2015-06-20 16:20:00 -05:00
stleary
b39ccc2a67 support BigDecimal and BigInteger 2015-06-20 15:20:56 -05:00
stleary
5d6bf7d132 support BigInteger and BigDecimal 2015-06-20 15:18:22 -05:00
stleary
a851bf0951 Replaced tab chars, updated versions 2015-05-05 20:11:28 -05:00
Douglas Crockford
a9a0762383 Java 1.8. 2014-05-05 15:09:32 -07:00
Douglas Crockford
7ff3fa4e40 similar 2014-04-21 16:11:51 -07:00
Douglas Crockford
34f327e6d0 out of the pool 2013-06-17 17:10:27 -07:00
Douglas Crockford
a73066f6ba Disallow ; and => 2013-04-19 11:10:02 -07:00
Douglas Crockford
50c3afb216 keyPool 2012-12-02 16:00:54 -08:00
Douglas Crockford
71c7539dd3 keySet 2012-10-27 04:14:06 -07:00
Douglas Crockford
7c14a3d8c2 dontenum 2012-10-26 01:19:30 -07:00
Douglas Crockford
d15e77697a instanceof Enum 2012-07-03 09:56:32 -07:00
Douglas Crockford
5b18f02eee null first 2012-05-30 10:22:09 -07:00
Douglas Crockford
9115ada84d Performance improvments by Valentin Valchev 2012-04-22 16:52:45 -07:00
ajayk
9420bb7e8b AjayKemparaj: Tabs to spaces and minor java code fixups 2012-01-13 13:10:10 +05:30
Douglas Crockford
806900e0d1 Remove 0x- 2011-11-24 07:45:34 -08:00
Douglas Crockford
88f27f3168 non-number numbers 2011-10-16 10:24:08 -07:00
Douglas Crockford
f4cb14728f .getString(...) now throws if there is no property or if it is not a string 2011-05-09 10:08:10 -07:00
Douglas Crockford
9a0471d5a1 JSONObject's keys are unordered 2011-01-31 14:58:12 -08:00
Douglas Crockford
449641a01e getString("null") 2010-12-28 06:23:18 -08:00
Douglas Crockford
87c4b1d59d Season's Greetings 2010-12-25 14:12:07 -08:00
Douglas Crockford
68de4feaec hygiene 2010-12-23 12:39:11 -08:00
Douglas Crockford
667813de3c first commit 2010-12-21 10:51:19 -08:00