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
103 commits 11 branches 11 tags 1.9 MiB
Commit graph

103 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Sean Leary
b0191a6acf Update README 2015-07-29 19:50:14 -05:00
Sean Leary
ce2de45f64 Merge pull request #140 from douglascrockford/enum-support 
Enum support
 2015-07-28 19:33:29 -05: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
Sean Leary
96b2e38459 Update README 2015-07-20 10:02:21 -05:00
Sean Leary
4f8b25d527 Merge pull request #135 from douglascrockford/big-numbers 
Proposed BigInteger, BigDecimal support
 2015-07-11 12:52:36 -05:00
stleary
71d9ad2b99 update version dates 2015-07-06 22:27:10 -05:00
stleary
410afaff14 latest 2015-07-06 22:20:19 -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
03c4fc72ba Merge branch 'big-numbers' of https://github.com/douglascrockford/JSON-Java into local-big-numbers 2015-06-20 16:15:25 -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
8bc62cc34c support for BigInteger and BigDecimal 2015-06-20 13:26:55 -05:00
Sean Leary
04eab1662c Merge pull request #132 from douglascrockford/iterable-JSONArray 
made JSONArray iterable.
 2015-06-07 10:50:27 -05:00
stleary
d2cd1a8df5 iterable 2015-06-04 22:26:16 -05:00
Sean Leary
0cf7491a37 Merge pull request #122 from douglascrockford/merge-branch-for-issue-110 
Merge branch for issue #110
 2015-05-05 21:50:27 -05:00
stleary
a851bf0951 Replaced tab chars, updated versions 2015-05-05 20:11:28 -05:00
Sean Leary
b56fe9fea9 Merge pull request #118 from douglascrockford/fix-for-JSONML-toString-JSONArray 
fix toString(JSONArray) to emit object.toString() values
 2015-05-02 14:16:13 -05:00
Sean Leary
03807e22bb Merge pull request #120 from douglascrockford/Spelling-error-in-CDL 
Fix spelling error in CDL.java comment
 2015-05-01 16:37:16 -05:00
stleary
37f099ed4b s/covert/convert/ 2015-05-01 12:52:23 -05:00
stleary
d6ba31819c fix toString(JSONArray) to emit object.toString() values 2015-04-19 17:53:40 -05:00
Douglas Crockford
9b6872b6e5 This package needs a new owner. 2015-02-06 09:02:41 -08:00
Douglas Crockford
8114b976ce deleted 2014-05-21 20:59:05 -07:00
Douglas Crockford
aab1017e66 this.namehuffext.generate 2014-05-20 15:22:05 -07:00
Douglas Crockford
1272d80a03 education 2014-05-20 14:39:51 -07:00
Douglas Crockford
a9a0762383 Java 1.8. 2014-05-05 15:09:32 -07:00
Douglas Crockford
48d31b7f5c JSONzip value 2014-04-28 13:22:05 -07:00
Douglas Crockford
b7a1aee4e1 log 2014-04-21 16:13:10 -07:00
Douglas Crockford
7ff3fa4e40 similar 2014-04-21 16:11:51 -07:00
Douglas Crockford
cdaaf12557 JSONArray.remove 2014-04-18 16:16:03 -07:00
Douglas Crockford
4d86b05d3c stringToValue 2013-11-14 11:18:16 -08:00
Douglas Crockford
34f327e6d0 out of the pool 2013-06-17 17:10:27 -07:00
Douglas Crockford
1f7056edc2 kensenjohn 2013-05-26 00:25:41 -07:00
Douglas Crockford
1a85fe7f57 comments 2013-04-24 11:34:50 -07:00
Douglas Crockford
0cdef7d816 JSONzip 2013-04-19 14:04:06 -07:00
Douglas Crockford
327e9a56fd Kim 2013-04-19 11:10:37 -07:00
Douglas Crockford
a73066f6ba Disallow ; and => 2013-04-19 11:10:02 -07:00
Douglas Crockford
a360c40b74 Disallow ; and => 2013-04-19 11:09:16 -07:00
Douglas Crockford
72cde1ff04 zip 2013-04-19 10:50:05 -07:00
Douglas Crockford
b883a848a6 backout 2013-02-19 18:26:31 -08:00
Douglas Crockford
b676742539 none 2013-02-19 04:52:25 -08:00
Douglas Crockford
dedbd0db46 javadoc 2013-02-19 04:50:52 -08:00
Douglas Crockford
ae8d12c5f4 iterator 2013-02-19 04:49:21 -08:00