mirror of
https://github.com/ethauvin/JSON-java.git
synced 2025-06-17 07:50:52 -07:00
Added putAll(Collection) and putAll(Array) methods.
This commit is contained in:
parent
9de97438ac
commit
aa0a5a7245
1 changed files with 70 additions and 13 deletions
|
@ -173,9 +173,7 @@ public class JSONArray implements Iterable<Object> {
|
||||||
this.myArrayList = new ArrayList<Object>();
|
this.myArrayList = new ArrayList<Object>();
|
||||||
} else {
|
} else {
|
||||||
this.myArrayList = new ArrayList<Object>(collection.size());
|
this.myArrayList = new ArrayList<Object>(collection.size());
|
||||||
for (Object o: collection){
|
this.addAll(collection);
|
||||||
this.myArrayList.add(JSONObject.wrap(o));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -193,16 +191,7 @@ public class JSONArray implements Iterable<Object> {
|
||||||
*/
|
*/
|
||||||
public JSONArray(Object array) throws JSONException {
|
public JSONArray(Object array) throws JSONException {
|
||||||
this();
|
this();
|
||||||
if (array.getClass().isArray()) {
|
this.addAll(array);
|
||||||
int length = Array.getLength(array);
|
|
||||||
this.myArrayList.ensureCapacity(length);
|
|
||||||
for (int i = 0; i < length; i += 1) {
|
|
||||||
this.put(JSONObject.wrap(Array.get(array, i)));
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
throw new JSONException(
|
|
||||||
"JSONArray initial value should be a string or collection or array.");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1174,6 +1163,36 @@ public class JSONArray implements Iterable<Object> {
|
||||||
}
|
}
|
||||||
return this.put(value);
|
return this.put(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Put or replace a collection's elements in the JSONArray.
|
||||||
|
*
|
||||||
|
* @param collection
|
||||||
|
* A Collection.
|
||||||
|
* @return this.
|
||||||
|
*/
|
||||||
|
public JSONArray putAll(Collection<?> collection) {
|
||||||
|
this.addAll(collection);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Put or replace an array's elements in the JSONArray.
|
||||||
|
*
|
||||||
|
* @param array
|
||||||
|
* Array. If the parameter passed is null, or not an array, an
|
||||||
|
* exception will be thrown.
|
||||||
|
* @return this.
|
||||||
|
*
|
||||||
|
* @throws JSONException
|
||||||
|
* If not an array or if an array value is non-finite number.
|
||||||
|
* @throws NullPointerException
|
||||||
|
* Thrown if the array parameter is null.
|
||||||
|
*/
|
||||||
|
public JSONArray putAll(Object array) throws JSONException {
|
||||||
|
this.addAll(array);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a JSONPointer using an initialization string and tries to
|
* Creates a JSONPointer using an initialization string and tries to
|
||||||
|
@ -1500,6 +1519,44 @@ public class JSONArray implements Iterable<Object> {
|
||||||
public boolean isEmpty() {
|
public boolean isEmpty() {
|
||||||
return this.myArrayList.isEmpty();
|
return this.myArrayList.isEmpty();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add a collection's elements to the JSONArray.
|
||||||
|
*
|
||||||
|
* @param collection
|
||||||
|
* A Collection.
|
||||||
|
*/
|
||||||
|
private void addAll(Collection<?> collection) {
|
||||||
|
for (Object o: collection){
|
||||||
|
this.myArrayList.add(JSONObject.wrap(o));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add an array's elements to the JSONArray.
|
||||||
|
*
|
||||||
|
* @param array
|
||||||
|
* Array. If the parameter passed is null, or not an array, an
|
||||||
|
* exception will be thrown.
|
||||||
|
*
|
||||||
|
* @throws JSONException
|
||||||
|
* If not an array or if an array value is non-finite number.
|
||||||
|
* @throws NullPointerException
|
||||||
|
* Thrown if the array parameter is null.
|
||||||
|
*/
|
||||||
|
private void addAll(Object array) throws JSONException {
|
||||||
|
if (array.getClass().isArray()) {
|
||||||
|
int length = Array.getLength(array);
|
||||||
|
this.myArrayList.ensureCapacity(length);
|
||||||
|
for (int i = 0; i < length; i += 1) {
|
||||||
|
this.put(JSONObject.wrap(Array.get(array, i)));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
throw new JSONException(
|
||||||
|
"JSONArray initial value should be a string or collection or array.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new JSONException in a common format for incorrect conversions.
|
* Create a new JSONException in a common format for incorrect conversions.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue