more JSON fixes for API consistency w/ the rest of processing.data.*

benfry · benfry · commit 8a74cb28f9d5 · 2013-05-02T15:55:30.000-04:00
diff --git a/core/src/processing/data/JSONArray.java b/core/src/processing/data/JSONArray.java
@@ -392,6 +392,16 @@ public JSONObject getJSONObject(int index) {
   }
 
 
+  /** Get this entire array as a String array. */
+  public String[] getStringArray() {
+    String[] outgoing = new String[size()];
+    for (int i = 0; i < size(); i++) {
+      outgoing[i] = getString(i);
+    }
+    return outgoing;
+  }
+
+
   /** Get this entire array as an int array. Everything must be an int. */
   public int[] getIntArray() {
     int[] outgoing = new int[size()];
@@ -760,31 +770,31 @@ protected JSONArray append(Object value) {
 
 
   /**
-   * Put or replace an int value. If the index is greater than the length of
+   * Put or replace a String value. If the index is greater than the length of
    *  the JSONArray, then null elements will be added as necessary to pad
    *  it out.
    * @param index The subscript.
-   * @param value An int value.
+   * @param value A String value.
    * @return this.
    * @throws JSONException If the index is negative.
    */
-  public JSONArray setInt(int index, int value) {
-    this.set(index, new Integer(value));
+  public JSONArray setString(int index, String value) {
+    this.set(index, value);
     return this;
   }
 
 
   /**
-   * Put or replace a String value. If the index is greater than the length of
+   * Put or replace an int value. If the index is greater than the length of
    *  the JSONArray, then null elements will be added as necessary to pad
    *  it out.
    * @param index The subscript.
-   * @param value A String value.
+   * @param value An int value.
    * @return this.
    * @throws JSONException If the index is negative.
    */
-  public JSONArray setString(int index, String value) {
-    this.set(index, value);
+  public JSONArray setInt(int index, int value) {
+    this.set(index, new Integer(value));
     return this;
   }
 
@@ -863,13 +873,13 @@ public JSONArray setBoolean(int index, boolean value) {
 //  }
 
 
-  public JSONArray setArray(int index, JSONArray value) {
+  public JSONArray setJSONArray(int index, JSONArray value) {
     set(index, value);
     return this;
   }
 
 
-  public JSONArray setObject(int index, JSONObject value) {
+  public JSONArray setJSONObject(int index, JSONObject value) {
     set(index, value);
     return this;
   }
@@ -931,7 +941,7 @@ protected boolean isNull(int index) {
    * @return The value that was associated with the index,
    * or null if there was no value.
    */
-  public Object removeIndex(int index) {
+  public Object remove(int index) {
     Object o = this.opt(index);
     this.myArrayList.remove(index);
     return o;
