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

134 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Sean Leary
03dd662e72 Merge pull request #180 from netheril96/my 
Remove executable bit
 2015-12-09 01:08:47 -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
Sean Leary
2ec538f420 Merge pull request #179 from andrew-fletcher/UpdateJavaDocForJSONOBject 
Remove throws JSONException JavaDoc from 2 methods that do not throw this exception.
 2015-12-05 20:11:40 -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
44275e3b3c Merge pull request #175 from douglascrockford/release-20151123 
Update readme for 20151123 release
 2015-11-24 01:53:19 -06:00
stleary
5f2e77f9dd Update readme with proposed release information 2015-11-21 11:50:31 -06:00
Sean Leary
a109f581c8 Update JSONArray.java 
Update version for https://github.com/douglascrockford/JSON-java/pull/153
 2015-10-29 18:25:27 -05: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
Sean Leary
564ad2c2fb Merge pull request #153 from treyerl/master 
JSONObject and JSONArray initialization for Map<?,?> and Collection<?>
 2015-10-29 18:07:43 -05:00
Sean Leary
dfd19116d3 Merge pull request #168 from douglascrockford/readme-maven-info 
Include latest Maven release information
 2015-10-29 18:04:31 -05:00
John J. Aylward
105426b53f Formatting 2015-10-26 18:35:40 -04:00
John J. Aylward
7886c96204 Changes JSONArray for loops to use the new iterators. 2015-10-26 18:30:41 -04:00
John J. Aylward
91c6f09be8 Modifies XML output to be handled the same for a native java array as well as a JSONArray. 2015-10-26 18:17:37 -04:00
stleary
a07d391eae Include latest Maven release information 2015-10-25 11:05:16 -05:00
Sean Leary
e7f4eb5f67 Set version date to match commit date, convert tabs to spaces. 2015-10-18 11:05:29 -05:00
Sean Leary
b0a9507add Merge pull request #159 from johnjaylward/FixExceptionInheritance 
Properly overrides the Exception class.
 2015-10-18 11:02:11 -05:00
Sean Leary
6757e04c0a Fix NullPointerException in XML.toString(object, tagName) 
Setting version date to match commit date.
 2015-10-18 10:23:43 -05:00
Sean Leary
09b6af4712 Merge pull request #160 from johnjaylward/FixXMLNPE 
Fixes possible NullPointerException in XML.toString(object, tagName)
 2015-10-18 10:21:36 -05:00
John Aylward
637c1fe2b9 updates file dates 2015-10-14 00:48:01 -04:00
John Aylward
1448163981 fixes file date 2015-10-14 00:41:38 -04:00
Lukas Treyer
5ddc515679 removed 6 unnecessary @SuppressWarnings("unchecked") annotations. 2015-10-12 23:52:14 +02:00
John J. Aylward
1b06a802cf makes params final 2015-10-12 14:54:30 -04:00
John J. Aylward
0e13241528 Expands javadoc 2015-10-12 14:53:03 -04:00
John J. Aylward
e239e1967a Allows a custom message to be passed with a cause. 2015-10-12 14:52:17 -04:00
John J. Aylward
ceba8e8c3d Fixes possible NPE 2015-10-12 14:25:18 -04:00
John J. Aylward
4e77383472 Properly overrides the Exception class. 2015-10-12 14:23:05 -04: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