JSON fixes for Shiffman

benfry · benfry · commit fb38ca4bfbe8 · 2013-04-26T14:57:07.000-04:00
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -6028,6 +6028,7 @@ public XML createXML(String name) {
     }
   }
 
+
   /**
    * @webref input:files
    * @param filename name of a file in the data folder or a URL.
@@ -6043,6 +6044,7 @@ public XML loadXML(String filename) {
     return loadXML(filename, null);
   }
 
+
   // version that uses 'options' though there are currently no supported options
   /**
    * @nowebref
@@ -6056,6 +6058,7 @@ public XML loadXML(String filename, String options) {
     }
   }
 
+
   /**
    * @webref input:files
    * @brief Converts String content to an XML object
@@ -6070,6 +6073,7 @@ public XML parseXML(String xmlString) {
     return parseXML(xmlString, null);
   }
 
+
   public XML parseXML(String xmlString, String options) {
     try {
       return XML.parse(xmlString, options);
@@ -6079,6 +6083,7 @@ public XML parseXML(String xmlString, String options) {
     }
   }
 
+
   /**
    * @webref output:files
    * @param xml the XML object to save to disk
@@ -6104,6 +6109,12 @@ public JSONObject loadJSONObject(String filename) {
   }
 
 
+  public JSONArray loadJSONArray(String filename) {
+    JSONTokener tokener = new JSONTokener(createReader(filename));
+    return new JSONArray(tokener);
+  }
+
+
   /**
    * @webref input:files
    * @see Table
@@ -6884,8 +6895,9 @@ public InputStream createInputRaw(String filename) {
       File file = new File(dataPath(filename));
       if (!file.exists()) {
         // next see if it's just in the sketch folder
-        file = new File(sketchPath, filename);
+        file = sketchFile(filename);
       }
+
       if (file.isDirectory()) {
         return null;
       }
diff --git a/core/src/processing/data/JSONArray.java b/core/src/processing/data/JSONArray.java
@@ -107,7 +107,7 @@ public JSONArray() {
    * @param x A JSONTokener
    * @throws JSONException If there is a syntax error.
    */
-  protected JSONArray(JSONTokener x) {
+  public JSONArray(JSONTokener x) {
     this();
     if (x.nextClean() != '[') {
       throw new RuntimeException("A JSONArray text must start with '['");
@@ -332,7 +332,7 @@ public boolean getBoolean(int index) {
    * @throws JSONException If there is no value for the index. or if the
    * value is not a JSONArray
    */
-  public JSONArray getArray(int index) {
+  public JSONArray getJSONArray(int index) {
     Object object = this.get(index);
     if (object instanceof JSONArray) {
       return (JSONArray)object;
@@ -348,7 +348,7 @@ public JSONArray getArray(int index) {
    * @throws JSONException If there is no value for the index or if the
    * value is not a JSONObject
    */
-  public JSONObject getObject(int index) {
+  public JSONObject getJSONObject(int index) {
     Object object = this.get(index);
     if (object instanceof JSONObject) {
       return (JSONObject)object;

Original file line number	Diff line number	Diff line change
`@@ -6028,6 +6028,7 @@ public XML createXML(String name) {`
`6028`	`6028`	`}`
`6029`	`6029`	`}`
`6030`	`6030`
	`6031`	`+`
`6031`	`6032`	`/**`
`6032`	`6033`	`* @webref input:files`
`6033`	`6034`	`* @param filename name of a file in the data folder or a URL.`
`@@ -6043,6 +6044,7 @@ public XML loadXML(String filename) {`
`6043`	`6044`	`return loadXML(filename, null);`
`6044`	`6045`	`}`
`6045`	`6046`
	`6047`	`+`
`6046`	`6048`	`// version that uses 'options' though there are currently no supported options`
`6047`	`6049`	`/**`
`6048`	`6050`	`* @nowebref`
`@@ -6056,6 +6058,7 @@ public XML loadXML(String filename, String options) {`
`6056`	`6058`	`}`
`6057`	`6059`	`}`
`6058`	`6060`
	`6061`	`+`
`6059`	`6062`	`/**`
`6060`	`6063`	`* @webref input:files`
`6061`	`6064`	`* @brief Converts String content to an XML object`
`@@ -6070,6 +6073,7 @@ public XML parseXML(String xmlString) {`
`6070`	`6073`	`return parseXML(xmlString, null);`
`6071`	`6074`	`}`
`6072`	`6075`
	`6076`	`+`
`6073`	`6077`	`public XML parseXML(String xmlString, String options) {`
`6074`	`6078`	`try {`
`6075`	`6079`	`return XML.parse(xmlString, options);`
`@@ -6079,6 +6083,7 @@ public XML parseXML(String xmlString, String options) {`
`6079`	`6083`	`}`
`6080`	`6084`	`}`
`6081`	`6085`
	`6086`	`+`
`6082`	`6087`	`/**`
`6083`	`6088`	`* @webref output:files`
`6084`	`6089`	`* @param xml the XML object to save to disk`
`@@ -6104,6 +6109,12 @@ public JSONObject loadJSONObject(String filename) {`
`6104`	`6109`	`}`
`6105`	`6110`
`6106`	`6111`
	`6112`	`+ public JSONArray loadJSONArray(String filename) {`
	`6113`	`+ JSONTokener tokener = new JSONTokener(createReader(filename));`
	`6114`	`+ return new JSONArray(tokener);`
	`6115`	`+ }`
	`6116`	`+`
	`6117`	`+`
`6107`	`6118`	`/**`
`6108`	`6119`	`* @webref input:files`
`6109`	`6120`	`* @see Table`
`@@ -6884,8 +6895,9 @@ public InputStream createInputRaw(String filename) {`
`6884`	`6895`	`File file = new File(dataPath(filename));`
`6885`	`6896`	`if (!file.exists()) {`
`6886`	`6897`	`// next see if it's just in the sketch folder`
`6887`		`- file = new File(sketchPath, filename);`
	`6898`	`+ file = sketchFile(filename);`
`6888`	`6899`	`}`
	`6900`	`+`
`6889`	`6901`	`if (file.isDirectory()) {`
`6890`	`6902`	`return null;`
`6891`	`6903`	`}`