API cleanups, fix processing#1660 and processing#1680 for JSON, plus processing#1734 for Table

benfry · benfry · commit d4f85e16fc79 · 2013-04-28T20:43:49.000-04:00
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -6009,24 +6009,25 @@ header[17] image descriptor (packed bits)
 
   // DATA I/O
 
-  /**
-   * @webref input:files
-   * @brief Creates a new XML object
-   * @param name the name to be given to the root element of the new XML object
-   * @return an XML object, or null
-   * @see XML
-   * @see PApplet#loadXML(String)
-   * @see PApplet#parseXML(String)
-   * @see PApplet#saveXML(XML, String)
-   */
-  public XML createXML(String name) {
-    try {
-      return new XML(name);
-    } catch (Exception e) {
-      e.printStackTrace();
-      return null;
-    }
-  }
+
+//  /**
+//   * @webref input:files
+//   * @brief Creates a new XML object
+//   * @param name the name to be given to the root element of the new XML object
+//   * @return an XML object, or null
+//   * @see XML
+//   * @see PApplet#loadXML(String)
+//   * @see PApplet#parseXML(String)
+//   * @see PApplet#saveXML(XML, String)
+//   */
+//  public XML createXML(String name) {
+//    try {
+//      return new XML(name);
+//    } catch (Exception e) {
+//      e.printStackTrace();
+//      return null;
+//    }
+//  }
 
 
   /**
@@ -6103,6 +6104,11 @@ public boolean saveXML(XML xml, String filename, String options) {
   }
 
 
+  public JSONObject parseJSONObject(String input) {
+    return new JSONObject(new StringReader(input));
+  }
+
+
   public JSONObject loadJSONObject(String filename) {
     //JSONTokener tokener = new JSONTokener(createReader(filename));
     //return new JSONObject(tokener);
@@ -6120,6 +6126,11 @@ public boolean saveJSONObject(JSONObject json, String filename, String options)
   }
 
 
+  public JSONArray parseJSONArray(String input) {
+    return new JSONArray(new StringReader(input));
+  }
+
+
   public JSONArray loadJSONArray(String filename) {
 //    JSONTokener tokener = new JSONTokener(createReader(filename));
 //    return new JSONArray(tokener);
@@ -6138,15 +6149,15 @@ public boolean saveJSONArray(JSONArray json, String filename, String options) {
 
 
 
-  /**
-   * @webref input:files
-   * @see Table
-   * @see PApplet#loadTable(String)
-   * @see PApplet#saveTable(Table, String)
-   */
-  public Table createTable() {
-    return new Table();
-  }
+//  /**
+//   * @webref input:files
+//   * @see Table
+//   * @see PApplet#loadTable(String)
+//   * @see PApplet#saveTable(Table, String)
+//   */
+//  public Table createTable() {
+//    return new Table();
+//  }
 
 
   /**
diff --git a/core/src/processing/data/JSONObject.java b/core/src/processing/data/JSONObject.java
@@ -129,7 +129,6 @@ public class JSONObject {
    * undefined.
    */
   private static final class Null {
-
     /**
      * There is only intended to be a single instance of the NULL object,
      * so the clone method returns itself.
diff --git a/core/src/processing/data/Table.java b/core/src/processing/data/Table.java
@@ -200,7 +200,9 @@ protected String checkOptions(File file, String options) throws IOException {
     if (dotIndex != -1) {
       extension = filename.substring(dotIndex + 1).toLowerCase();
       if (!extension.equals("csv") &&
-          !extension.equals("tsv")) {
+          !extension.equals("tsv") &&
+          !extension.equals("html") &&
+          !extension.equals("bin")) {
         // ignore extension
         extension = null;
       }
@@ -628,29 +630,37 @@ public boolean save(File file, String options) throws IOException {
 
   public boolean save(OutputStream output, String options) {
     PrintWriter writer = PApplet.createWriter(output);
+    String opt = null;
     if (options != null) {
       String[] opts = PApplet.splitTokens(options, ", ");
-      for (String opt : opts) {
-        if (opt.equals("csv")) {
-          writeCSV(writer);
-        } else if (opt.equals("tsv")) {
-          writeTSV(writer);
-        } else if (opt.equals("html")) {
-          writeHTML(writer);
-        } else if (opt.equals("bin")) {
-          try {
-            saveBinary(output);
-          } catch (IOException e) {
-            e.printStackTrace();
-            return false;
-          }
-        } else {
-          throw new IllegalArgumentException("'" + opt + "' not understood. " +
-                                             "Only csv, tsv, bin, and html are " +
-                                             "accepted as save parameters");
-        }
+      opt = opts[opts.length - 1];
+      if (!opt.equals("csv") &&
+          !opt.equals("tsv") &&
+          !opt.equals("html") &&
+          !opt.equals("bin")) {
+        throw new IllegalArgumentException("'" + opt + "' not understood. " +
+          "Only csv, tsv, bin, and html are " +
+          "accepted as save parameters");
+      }
+    } else {
+      opt = "tsv";  // fall back to saving as TSV
+    }
+
+    if (opt.equals("csv")) {
+      writeCSV(writer);
+    } else if (opt.equals("tsv")) {
+      writeTSV(writer);
+    } else if (opt.equals("html")) {
+      writeHTML(writer);
+    } else if (opt.equals("bin")) {
+      try {
+        saveBinary(output);
+      } catch (IOException e) {
+        e.printStackTrace();
+        return false;
       }
     }
+    writer.flush();
     writer.close();
     return true;
   }
diff --git a/core/src/processing/data/XML.java b/core/src/processing/data/XML.java
@@ -167,14 +167,18 @@ public XML(Reader reader, String options) throws IOException, ParserConfiguratio
   /**
    * @param name description TBD
    */
-  // TODO is there a more efficient way of doing this? wow.
-  public XML(String name) throws ParserConfigurationException {
-    DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-    DocumentBuilder builder = factory.newDocumentBuilder();
-    Document document = builder.newDocument();
-    node = document.createElement(name);
-//      this.name = name;
-    this.parent = null;
+  public XML(String name) {
+    try {
+      // TODO is there a more efficient way of doing this? wow.
+      DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+      DocumentBuilder builder = factory.newDocumentBuilder();
+      Document document = builder.newDocument();
+      node = document.createElement(name);
+      this.parent = null;
+
+    } catch (ParserConfigurationException pce) {
+      throw new RuntimeException(pce);
+    }
   }
 
 
diff --git a/core/todo.txt b/core/todo.txt
diff --git a/todo.txt b/todo.txt
