propane 3.1.0.pre-java → 3.2.0-java

data/src/main/java/processing/data/TableRow.java

@@ -13,186 +13,187 @@ import java.io.PrintWriter;
  */
 public interface TableRow {
 
-  /**
-   * @webref tablerow:method
-   * @brief Get an String value from the specified column
-   * @param column ID number of the column to reference
-   * @see TableRow#getInt(int)
-   * @see TableRow#getFloat(int)
-   */
-  public String getString(int column);
-
-  /**
-   * @param columnName title of the column to reference
-   */
-  public String getString(String columnName);
-
-  /**
-   * @webref tablerow:method
-   * @brief Get an integer value from the specified column
-   * @param column ID number of the column to reference
-   * @see TableRow#getFloat(int)
-   * @see TableRow#getString(int)
-   */
-  public int getInt(int column);
-
-  /**
-   * @param columnName title of the column to reference
-   */
-  public int getInt(String columnName);
-
-  /**
-   * @brief Get a long value from the specified column
-   * @param column ID number of the column to reference
-   * @see TableRow#getFloat(int)
-   * @see TableRow#getString(int)
-   */
-
-  public long getLong(int column);
-
-  /**
-   * @param columnName title of the column to reference
-   */
-  public long getLong(String columnName);
-
-  /**
-   * @webref tablerow:method
-   * @brief Get a float value from the specified column
-   * @param column ID number of the column to reference
-   * @see TableRow#getInt(int)
-   * @see TableRow#getString(int)
-   */
-  public float getFloat(int column);
-
-  /**
-   * @param columnName title of the column to reference
-   */
-  public float getFloat(String columnName);
-  
-  /**
-   * @brief Get a double value from the specified column
-   * @param column ID number of the column to reference
-   * @see TableRow#getInt(int)
-   * @see TableRow#getString(int)
-   */
-  public double getDouble(int column);
-  
-  /**
-   * @param columnName title of the column to reference
-   */
-  public double getDouble(String columnName);
-
-  /**
-   * @webref tablerow:method
-   * @brief Store a String value in the specified column
-   * @param column ID number of the target column
-   * @param value value to assign
-   * @see TableRow#setInt(int, int)
-   * @see TableRow#setFloat(int, float)
-   */
-  public void setString(int column, String value);
-  /**
-   * @param columnName title of the target column
-   */
-  public void setString(String columnName, String value);
-
-  /**
-   * @webref tablerow:method
-   * @brief Store an integer value in the specified column
-   * @param column ID number of the target column
-   * @param value value to assign
-   * @see TableRow#setFloat(int, float)
-   * @see TableRow#setString(int, String)
-   */
-  public void setInt(int column, int value);
-
-  /**
-   * @param columnName title of the target column
-   */
-  public void setInt(String columnName, int value);
-  
-  /**
-   * @brief Store a long value in the specified column
-   * @param column ID number of the target column
-   * @param value value to assign
-   * @see TableRow#setFloat(int, float)
-   * @see TableRow#setString(int, String)
-   */
-  public void setLong(int column, long value);
-  
-  /**
-   * @param columnName title of the target column
-   */
-  public void setLong(String columnName, long value);
-
-  /**
-   * @webref tablerow:method
-   * @brief Store a float value in the specified column
-   * @param column ID number of the target column
-   * @param value value to assign
-   * @see TableRow#setInt(int, int)
-   * @see TableRow#setString(int, String)
-   */
-  public void setFloat(int column, float value);
-  
-  /**
-   * @param columnName title of the target column
-   */
-  public void setFloat(String columnName, float value);
-
-  /**
-   * @brief Store a double value in the specified column
-   * @param column ID number of the target column
-   * @param value value to assign
-   * @see TableRow#setFloat(int, float)
-   * @see TableRow#setString(int, String)
-   */
-  public void setDouble(int column, double value);
-  
-  /**
-   * @param columnName title of the target column
-   */
-  public void setDouble(String columnName, double value);
-
-  /**
-   * @webref tablerow:method
-   * @brief Get the column count.
-   * @return count of all columns
-   */
-  public int getColumnCount();
-  
-  /**
-   * @brief Get the column type.
-   * @param columnName title of the target column
-   * @return type of the column
-   */
-  public int getColumnType(String columnName);
-  
-  /**
-   * @param column ID number of the target column
-   */
-  public int getColumnType(int column);
-  
-  /**
-   * @brief Get the all column types
-   * @return list of all column types
-   */
-  public int[] getColumnTypes();
-
-  /**
-   * @webref tablerow:method
-   * @brief Get the column title.
-   * @param column ID number of the target column
-   * @return title of the column
-   */
-  public String getColumnTitle(int column);
-
-  /**
-   * @brief Get the all column titles
-   * @return list of all column titles
-   */
-  public String[] getColumnTitles();
-
-  public void write(PrintWriter writer);
-  public void print();
+    /**
+     * @webref tablerow:method
+     * @brief Get an String value from the specified column
+     * @param column ID number of the column to reference
+     * @see TableRow#getInt(int)
+     * @see TableRow#getFloat(int)
+     */
+    public String getString(int column);
+
+    /**
+     * @param columnName title of the column to reference
+     */
+    public String getString(String columnName);
+
+    /**
+     * @webref tablerow:method
+     * @brief Get an integer value from the specified column
+     * @param column ID number of the column to reference
+     * @see TableRow#getFloat(int)
+     * @see TableRow#getString(int)
+     */
+    public int getInt(int column);
+
+    /**
+     * @param columnName title of the column to reference
+     */
+    public int getInt(String columnName);
+
+    /**
+     * @brief Get a long value from the specified column
+     * @param column ID number of the column to reference
+     * @see TableRow#getFloat(int)
+     * @see TableRow#getString(int)
+     */
+    public long getLong(int column);
+
+    /**
+     * @param columnName title of the column to reference
+     */
+    public long getLong(String columnName);
+
+    /**
+     * @webref tablerow:method
+     * @brief Get a float value from the specified column
+     * @param column ID number of the column to reference
+     * @see TableRow#getInt(int)
+     * @see TableRow#getString(int)
+     */
+    public float getFloat(int column);
+
+    /**
+     * @param columnName title of the column to reference
+     */
+    public float getFloat(String columnName);
+
+    /**
+     * @brief Get a double value from the specified column
+     * @param column ID number of the column to reference
+     * @see TableRow#getInt(int)
+     * @see TableRow#getString(int)
+     */
+    public double getDouble(int column);
+
+    /**
+     * @param columnName title of the column to reference
+     */
+    public double getDouble(String columnName);
+
+    /**
+     * @webref tablerow:method
+     * @brief Store a String value in the specified column
+     * @param column ID number of the target column
+     * @param value value to assign
+     * @see TableRow#setInt(int, int)
+     * @see TableRow#setFloat(int, float)
+     */
+    public void setString(int column, String value);
+
+    /**
+     * @param columnName title of the target column
+     */
+    public void setString(String columnName, String value);
+
+    /**
+     * @webref tablerow:method
+     * @brief Store an integer value in the specified column
+     * @param column ID number of the target column
+     * @param value value to assign
+     * @see TableRow#setFloat(int, float)
+     * @see TableRow#setString(int, String)
+     */
+    public void setInt(int column, int value);
+
+    /**
+     * @param columnName title of the target column
+     */
+    public void setInt(String columnName, int value);
+
+    /**
+     * @brief Store a long value in the specified column
+     * @param column ID number of the target column
+     * @param value value to assign
+     * @see TableRow#setFloat(int, float)
+     * @see TableRow#setString(int, String)
+     */
+    public void setLong(int column, long value);
+
+    /**
+     * @param columnName title of the target column
+     */
+    public void setLong(String columnName, long value);
+
+    /**
+     * @webref tablerow:method
+     * @brief Store a float value in the specified column
+     * @param column ID number of the target column
+     * @param value value to assign
+     * @see TableRow#setInt(int, int)
+     * @see TableRow#setString(int, String)
+     */
+    public void setFloat(int column, float value);
+
+    /**
+     * @param columnName title of the target column
+     */
+    public void setFloat(String columnName, float value);
+
+    /**
+     * @brief Store a double value in the specified column
+     * @param column ID number of the target column
+     * @param value value to assign
+     * @see TableRow#setFloat(int, float)
+     * @see TableRow#setString(int, String)
+     */
+    public void setDouble(int column, double value);
+
+    /**
+     * @param columnName title of the target column
+     */
+    public void setDouble(String columnName, double value);
+
+    /**
+     * @webref tablerow:method
+     * @brief Get the column count.
+     * @return count of all columns
+     */
+    public int getColumnCount();
+
+    /**
+     * @brief Get the column type.
+     * @param columnName title of the target column
+     * @return type of the column
+     */
+    public int getColumnType(String columnName);
+
+    /**
+     * @param column ID number of the target column
+     */
+    public int getColumnType(int column);
+
+    /**
+     * @brief Get the all column types
+     * @return list of all column types
+     */
+    public int[] getColumnTypes();
+
+    /**
+     * @webref tablerow:method
+     * @brief Get the column title.
+     * @param column ID number of the target column
+     * @return title of the column
+     */
+    public String getColumnTitle(int column);
+
+    /**
+     * @brief Get the all column titles
+     * @return list of all column titles
+     */
+    public String[] getColumnTitles();
+
+    public void write(PrintWriter writer);
+
+    public void print();
 }

data/src/main/java/processing/data/XML.java

@@ -1,5 +1,3 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
 /*
   Part of the Processing project - http://processing.org
 
@@ -19,8 +17,7 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
-*/
-
+ */
 package processing.data;
 
 import java.io.*;
@@ -39,10 +36,9 @@ import javax.xml.xpath.XPathFactory;
 
 import processing.core.PApplet;
 
-
 /**
- * This is the base class used for the Processing XML library,
- * representing a single node of an XML tree.
+ * This is the base class used for the Processing XML library, representing a
+ * single node of an XML tree.
  *
  * @webref data:composite
  * @see PApplet#loadXML(String)
@@ -51,23 +47,28 @@ import processing.core.PApplet;
  */
 public class XML implements Serializable {
 
-  /** The internal representation, a DOM node. */
-  protected Node node;
+    /**
+     * The internal representation, a DOM node.
+     */
+    protected Node node;
 
 //  /** Cached locally because it's used often. */
 //  protected String name;
-
-  /** The parent element. */
-  protected XML parent;
-
-  /** Child elements, once loaded. */
-  protected XML[] children;
-
-  /**
-   * @nowebref
-   */
-  protected XML() { }
-
+    /**
+     * The parent element.
+     */
+    protected XML parent;
+
+    /**
+     * Child elements, once loaded.
+     */
+    protected XML[] children;
+
+    /**
+     * @nowebref
+     */
+    protected XML() {
+    }
 
 //  /**
 //   * Begin parsing XML data passed in from a PApplet. This code
@@ -81,324 +82,301 @@ public class XML implements Serializable {
 //  public XML(PApplet parent, String filename) throws IOException, ParserConfigurationException, SAXException {
 //    this(parent.createReader(filename));
 //  }
+    /**
+     * Advanced users only; use loadXML() in PApplet. This is not a supported
+     * function and is subject to change. It is available simply for users that
+     * would like to handle the exceptions in a particular way.
+     *
+     * @nowebref
+     */
+    public XML(File file) throws IOException, ParserConfigurationException, SAXException {
+        this(file, null);
+    }
 
+    /**
+     * Advanced users only; use loadXML() in PApplet.
+     *
+     * @nowebref
+     */
+    public XML(File file, String options) throws IOException, ParserConfigurationException, SAXException {
+        this(PApplet.createReader(file), options);
+    }
 
-  /**
-   * Advanced users only; use loadXML() in PApplet. This is not a supported
-   * function and is subject to change. It is available simply for users that
-   * would like to handle the exceptions in a particular way.
-   *
-   * @nowebref
-   */
-  public XML(File file) throws IOException, ParserConfigurationException, SAXException {
-    this(file, null);
-  }
-
-
-  /**
-   * Advanced users only; use loadXML() in PApplet.
-   *
-   * @nowebref
-   */
-  public XML(File file, String options) throws IOException, ParserConfigurationException, SAXException {
-    this(PApplet.createReader(file), options);
-  }
-
-  /**
-   * @nowebref
-   */
-  public XML(InputStream input) throws IOException, ParserConfigurationException, SAXException {
-    this(input, null);
-  }
-
-
-  /**
-   * Unlike the loadXML() method in PApplet, this version works with files
-   * that are not in UTF-8 format.
-   *
-   * @nowebref
-   */
-  public XML(InputStream input, String options) throws IOException, ParserConfigurationException, SAXException {
-    //this(PApplet.createReader(input), options);  // won't handle non-UTF8
-    DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-
-    try {
-      // Prevent 503 errors from www.w3.org
-      factory.setAttribute("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
-    } catch (IllegalArgumentException e) {
-      // ignore this; Android doesn't like it
-    }
-
-    factory.setExpandEntityReferences(false);
-    DocumentBuilder builder = factory.newDocumentBuilder();
-    Document document = builder.parse(new InputSource(input));
-    node = document.getDocumentElement();
-  }
-
-
-  /**
-   * Advanced users only; use loadXML() in PApplet.
-   *
-   * @nowebref
-   */
-  public XML(Reader reader) throws IOException, ParserConfigurationException, SAXException {
-    this(reader, null);
-  }
-
-
-  /**
-   * Advanced users only; use loadXML() in PApplet.
-   *
-   * Added extra code to handle \u2028 (Unicode NLF), which is sometimes
-   * inserted by web browsers (Safari?) and not distinguishable from a "real"
-   * LF (or CRLF) in some text editors (i.e. TextEdit on OS X). Only doing
-   * this for XML (and not all Reader objects) because LFs are essential.
-   * https://github.com/processing/processing/issues/2100
-   *
-   * @nowebref
-   */
-  public XML(final Reader reader, String options) throws IOException, ParserConfigurationException, SAXException {
-    DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-
-    // Prevent 503 errors from www.w3.org
-    try {
-      factory.setAttribute("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
-    } catch (IllegalArgumentException e) {
-      // ignore this; Android doesn't like it
-    }
-
-    // without a validating DTD, this doesn't do anything since it doesn't know what is ignorable
-//      factory.setIgnoringElementContentWhitespace(true);
+    /**
+     * @nowebref
+     */
+    public XML(InputStream input) throws IOException, ParserConfigurationException, SAXException {
+        this(input, null);
+    }
+
+    /**
+     * Unlike the loadXML() method in PApplet, this version works with files
+     * that are not in UTF-8 format.
+     *
+     * @nowebref
+     */
+    public XML(InputStream input, String options) throws IOException, ParserConfigurationException, SAXException {
+        //this(PApplet.createReader(input), options);  // won't handle non-UTF8
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+
+        try {
+            // Prevent 503 errors from www.w3.org
+            factory.setAttribute("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+        } catch (IllegalArgumentException e) {
+            // ignore this; Android doesn't like it
+        }
+
+        factory.setExpandEntityReferences(false);
+        DocumentBuilder builder = factory.newDocumentBuilder();
+        Document document = builder.parse(new InputSource(input));
+        node = document.getDocumentElement();
+    }
+
+    /**
+     * Advanced users only; use loadXML() in PApplet.
+     *
+     * @nowebref
+     */
+    public XML(Reader reader) throws IOException, ParserConfigurationException, SAXException {
+        this(reader, null);
+    }
+
+    /**
+     * Advanced users only; use loadXML() in PApplet.
+     *
+     * Added extra code to handle \u2028 (Unicode NLF), which is sometimes
+     * inserted by web browsers (Safari?) and not distinguishable from a "real"
+     * LF (or CRLF) in some text editors (i.e. TextEdit on OS X). Only doing
+     * this for XML (and not all Reader objects) because LFs are essential.
+     * https://github.com/processing/processing/issues/2100
+     *
+     * @nowebref
+     */
+    public XML(final Reader reader, String options) throws IOException, ParserConfigurationException, SAXException {
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+
+        // Prevent 503 errors from www.w3.org
+        try {
+            factory.setAttribute("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+        } catch (IllegalArgumentException e) {
+            // ignore this; Android doesn't like it
+        }
 
-    factory.setExpandEntityReferences(false);
+        // without a validating DTD, this doesn't do anything since it doesn't know what is ignorable
+//      factory.setIgnoringElementContentWhitespace(true);
+        factory.setExpandEntityReferences(false);
 //      factory.setExpandEntityReferences(true);
 
 //      factory.setCoalescing(true);
 //      builderFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
-    DocumentBuilder builder = factory.newDocumentBuilder();
+        DocumentBuilder builder = factory.newDocumentBuilder();
 //      builder.setEntityResolver()
 
 //      SAXParserFactory spf = SAXParserFactory.newInstance();
 //      spf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
 //      SAXParser p = spf.newSAXParser();
+        //    builder = DocumentBuilderFactory.newDocumentBuilder();
+        //    builder = new SAXBuilder();
+        //    builder.setValidation(validating);
+        Document document = builder.parse(new InputSource(new Reader() {
+            @Override
+            public int read(char[] cbuf, int off, int len) throws IOException {
+                int count = reader.read(cbuf, off, len);
+                for (int i = 0; i < count; i++) {
+                    if (cbuf[off + i] == '\u2028') {
+                        cbuf[off + i] = '\n';
+                    }
+                }
+                return count;
+            }
+
+            @Override
+            public void close() throws IOException {
+                reader.close();
+            }
+        }));
+        node = document.getDocumentElement();
+    }
 
-    //    builder = DocumentBuilderFactory.newDocumentBuilder();
-    //    builder = new SAXBuilder();
-    //    builder.setValidation(validating);
-
-    Document document = builder.parse(new InputSource(new Reader() {
-      @Override
-      public int read(char[] cbuf, int off, int len) throws IOException {
-        int count = reader.read(cbuf, off, len);
-        for (int i = 0; i < count; i++) {
-          if (cbuf[off+i] == '\u2028') {
-            cbuf[off+i] = '\n';
-          }
-        }
-        return count;
-      }
-
-      @Override
-      public void close() throws IOException {
-        reader.close();
-      }
-    }));
-    node = document.getDocumentElement();
-  }
-
-
-  /**
-   * @param name creates a node with this name
-   *
-   */
-  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);
-    }
-  }
-
-  /**
-   * @nowebref
-   */
-  protected XML(XML parent, Node node) {
-    this.node = node;
-    this.parent = parent;
-
-    for (String attr : parent.listAttributes()) {
-      if (attr.startsWith("xmlns")) {
-        // Copy namespace attributes to the kids, otherwise this XML
-        // can no longer be printed (or manipulated in most ways).
-        // Only do this when it's an Element, otherwise it's trying to set
-        // attributes on text notes (interstitial content).
-        if (node instanceof Element) {
-          setString(attr, parent.getString(attr));
+    /**
+     * @param name creates a node with this name
+     *
+     */
+    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);
         }
-      }
     }
-  }
 
+    /**
+     * @nowebref
+     */
+    protected XML(XML parent, Node node) {
+        this.node = node;
+        this.parent = parent;
+
+        for (String attr : parent.listAttributes()) {
+            if (attr.startsWith("xmlns")) {
+                // Copy namespace attributes to the kids, otherwise this XML
+                // can no longer be printed (or manipulated in most ways).
+                // Only do this when it's an Element, otherwise it's trying to set
+                // attributes on text notes (interstitial content).
+                if (node instanceof Element) {
+                    setString(attr, parent.getString(attr));
+                }
+            }
+        }
+    }
 
-  /**
-   * @webref xml:method
-   * @brief Converts String content to an XML object
-   * @param data the content to be parsed as XML
-   * @return an XML object, or null
-   * @throws SAXException
-   * @throws ParserConfigurationException
-   * @throws IOException
-   * @nowebref
-   */
-  static public XML parse(String data) throws IOException, ParserConfigurationException, SAXException {
-    return XML.parse(data, null);
-  }
-
-  /**
-   * @nowebref
-   */
-  static public XML parse(String data, String options) throws IOException, ParserConfigurationException, SAXException {
-    return new XML(new StringReader(data), null);
-  }
+    /**
+     * @webref xml:method
+     * @brief Converts String content to an XML object
+     * @param data the content to be parsed as XML
+     * @return an XML object, or null
+     * @throws SAXException
+     * @throws ParserConfigurationException
+     * @throws IOException
+     * @nowebref
+     */
+    static public XML parse(String data) throws IOException, ParserConfigurationException, SAXException {
+        return XML.parse(data, null);
+    }
 
+    /**
+     * @nowebref
+     */
+    static public XML parse(String data, String options) throws IOException, ParserConfigurationException, SAXException {
+        return new XML(new StringReader(data), null);
+    }
 
 //  protected boolean save(OutputStream output) {
 //    return write(PApplet.createWriter(output));
 //  }
+    public boolean save(File file) {
+        return save(file, null);
+    }
+
+    public boolean save(File file, String options) {
+        PrintWriter writer = PApplet.createWriter(file);
+        boolean result = write(writer);
+        writer.flush();
+        writer.close();
+        return result;
+    }
 
+    // Sends this object and its kids to a Writer with an indent of 2 spaces,
+    // including the declaration at the top so that the output will be valid XML.
+    public boolean write(PrintWriter output) {
+        output.print(format(2));
+        output.flush();
+        return true;
+    }
 
-  public boolean save(File file) {
-    return save(file, null);
-  }
-
-
-  public boolean save(File file, String options) {
-    PrintWriter writer = PApplet.createWriter(file);
-    boolean result = write(writer);
-    writer.flush();
-    writer.close();
-    return result;
-  }
-
-
-  // Sends this object and its kids to a Writer with an indent of 2 spaces,
-  // including the declaration at the top so that the output will be valid XML.
-  public boolean write(PrintWriter output) {
-    output.print(format(2));
-    output.flush();
-    return true;
-  }
-
-
-  /**
-   * Returns the parent element. This method returns null for the root
-   * element.
-   *
-   * @webref xml:method
-   * @brief Gets a copy of the element's parent
-   */
-  public XML getParent() {
-    return this.parent;
-  }
-
-  /**
-   * Internal function; not included in reference.
-   */
-  protected Object getNative() {
-    return node;
-  }
-
-
-  /**
-   * Returns the full name (i.e. the name including an eventual namespace
-   * prefix) of the element.
-   *
-   * @webref xml:method
-   * @brief Gets the element's full name
-   * @return the name, or null if the element only contains #PCDATA.
-   */
-  public String getName() {
+    /**
+     * Returns the parent element. This method returns null for the root
+     * element.
+     *
+     * @webref xml:method
+     * @brief Gets a copy of the element's parent
+     */
+    public XML getParent() {
+        return this.parent;
+    }
+
+    /**
+     * Internal function; not included in reference.
+     */
+    protected Object getNative() {
+        return node;
+    }
+
+    /**
+     * Returns the full name (i.e. the name including an eventual namespace
+     * prefix) of the element.
+     *
+     * @webref xml:method
+     * @brief Gets the element's full name
+     * @return the name, or null if the element only contains #PCDATA.
+     */
+    public String getName() {
 //    return name;
-    return node.getNodeName();
-  }
-
-  /**
-   * @webref xml:method
-   * @brief Sets the element's name
-   */
-  public void setName(String newName) {
-    Document document = node.getOwnerDocument();
-    node = document.renameNode(node, null, newName);
+        return node.getNodeName();
+    }
+
+    /**
+     * @webref xml:method
+     * @brief Sets the element's name
+     */
+    public void setName(String newName) {
+        Document document = node.getOwnerDocument();
+        node = document.renameNode(node, null, newName);
 //    name = node.getNodeName();
-  }
-
-
-  /**
-   * Returns the name of the element (without namespace prefix).
-   *
-   * Internal function; not included in reference.
-   */
-  public String getLocalName() {
-    return node.getLocalName();
-  }
-
-
-  /**
-   * Honey, can you just check on the kids? Thanks.
-   *
-   * Internal function; not included in reference.
-   */
-  protected void checkChildren() {
-    if (children == null) {
-      NodeList kids = node.getChildNodes();
-      int childCount = kids.getLength();
-      children = new XML[childCount];
-      for (int i = 0; i < childCount; i++) {
-        children[i] = new XML(this, kids.item(i));
-      }
-    }
-  }
-
-
-  /**
-   * Returns the number of children.
-   *
-   * @webref xml:method
-   * @brief Returns the element's number of children
-   * @return the count.
-   */
-  public int getChildCount() {
-    checkChildren();
-    return children.length;
-  }
-
-
-  /**
-   * Returns a boolean of whether or not there are children.
-   *
-   * @webref xml:method
-   * @brief Checks whether or not an element has any children
-   */
-  public boolean hasChildren() {
-    checkChildren();
-    return children.length > 0;
-  }
-
-
-  /**
-   * Put the names of all children into an array. Same as looping through
-   * each child and calling getName() on each XMLElement.
-   *
-   * @webref xml:method
-   * @brief Returns the names of all children as an array
-   */
-  public String[] listChildren() {
+    }
+
+    /**
+     * Returns the name of the element (without namespace prefix).
+     *
+     * Internal function; not included in reference.
+     */
+    public String getLocalName() {
+        return node.getLocalName();
+    }
+
+    /**
+     * Honey, can you just check on the kids? Thanks.
+     *
+     * Internal function; not included in reference.
+     */
+    protected void checkChildren() {
+        if (children == null) {
+            NodeList kids = node.getChildNodes();
+            int childCount = kids.getLength();
+            children = new XML[childCount];
+            for (int i = 0; i < childCount; i++) {
+                children[i] = new XML(this, kids.item(i));
+            }
+        }
+    }
+
+    /**
+     * Returns the number of children.
+     *
+     * @webref xml:method
+     * @brief Returns the element's number of children
+     * @return the count.
+     */
+    public int getChildCount() {
+        checkChildren();
+        return children.length;
+    }
+
+    /**
+     * Returns a boolean of whether or not there are children.
+     *
+     * @webref xml:method
+     * @brief Checks whether or not an element has any children
+     */
+    public boolean hasChildren() {
+        checkChildren();
+        return children.length > 0;
+    }
+
+    /**
+     * Put the names of all children into an array. Same as looping through each
+     * child and calling getName() on each XMLElement.
+     *
+     * @webref xml:method
+     * @brief Returns the names of all children as an array
+     */
+    public String[] listChildren() {
 //    NodeList children = node.getChildNodes();
 //    int childCount = children.getLength();
 //    String[] outgoing = new String[childCount];
@@ -408,22 +386,21 @@ public class XML implements Serializable {
 //        outgoing[i] = kid.getNodeName();
 //      } // otherwise just leave him null
 //    }
-    checkChildren();
-    String[] outgoing = new String[children.length];
-    for (int i = 0; i < children.length; i++) {
-      outgoing[i] = children[i].getName();
-    }
-    return outgoing;
-  }
-
-
-  /**
-   * Returns an array containing all the child elements.
-   *
-   * @webref xml:method
-   * @brief Returns an array containing all child elements
-   */
-  public XML[] getChildren() {
+        checkChildren();
+        String[] outgoing = new String[children.length];
+        for (int i = 0; i < children.length; i++) {
+            outgoing[i] = children[i].getName();
+        }
+        return outgoing;
+    }
+
+    /**
+     * Returns an array containing all the child elements.
+     *
+     * @webref xml:method
+     * @brief Returns an array containing all child elements
+     */
+    public XML[] getChildren() {
 //    NodeList children = node.getChildNodes();
 //    int childCount = children.getLength();
 //    XMLElement[] kids = new XMLElement[childCount];
@@ -432,194 +409,185 @@ public class XML implements Serializable {
 //      kids[i] = new XMLElement(this, kid);
 //    }
 //    return kids;
-    checkChildren();
-    return children;
-  }
-
-
-  /**
-   * Quick accessor for an element at a particular index.
-   *
-   * @webref xml:method
-   * @brief Returns the child element with the specified index value or path
-   */
-  public XML getChild(int index) {
-    checkChildren();
-    return children[index];
-  }
-
-
-  /**
-   * Get a child by its name or path.
-   *
-   * @param name element name or path/to/element
-   * @return the first matching element or null if no match
-   */
-  public XML getChild(String name) {
-    if (name.length() > 0 && name.charAt(0) == '/') {
-      throw new IllegalArgumentException("getChild() should not begin with a slash");
-    }
-    if (name.indexOf('/') != -1) {
-      return getChildRecursive(PApplet.split(name, '/'), 0);
-    }
-    int childCount = getChildCount();
-    for (int i = 0; i < childCount; i++) {
-      XML kid = getChild(i);
-      String kidName = kid.getName();
-      if (kidName != null && kidName.equals(name)) {
-        return kid;
-      }
-    }
-    return null;
-  }
-
-
-  /**
-   * Internal helper function for getChild(String).
-   *
-   * @param items result of splitting the query on slashes
-   * @param offset where in the items[] array we're currently looking
-   * @return matching element or null if no match
-   * @author processing.org
-   */
-  protected XML getChildRecursive(String[] items, int offset) {
-    // if it's a number, do an index instead
-    if (Character.isDigit(items[offset].charAt(0))) {
-      XML kid = getChild(Integer.parseInt(items[offset]));
-      if (offset == items.length-1) {
-        return kid;
-      } else {
-        return kid.getChildRecursive(items, offset+1);
-      }
-    }
-    int childCount = getChildCount();
-    for (int i = 0; i < childCount; i++) {
-      XML kid = getChild(i);
-      String kidName = kid.getName();
-      if (kidName != null && kidName.equals(items[offset])) {
-        if (offset == items.length-1) {
-          return kid;
-        } else {
-          return kid.getChildRecursive(items, offset+1);
+        checkChildren();
+        return children;
+    }
+
+    /**
+     * Quick accessor for an element at a particular index.
+     *
+     * @webref xml:method
+     * @brief Returns the child element with the specified index value or path
+     */
+    public XML getChild(int index) {
+        checkChildren();
+        return children[index];
+    }
+
+    /**
+     * Get a child by its name or path.
+     *
+     * @param name element name or path/to/element
+     * @return the first matching element or null if no match
+     */
+    public XML getChild(String name) {
+        if (name.length() > 0 && name.charAt(0) == '/') {
+            throw new IllegalArgumentException("getChild() should not begin with a slash");
+        }
+        if (name.indexOf('/') != -1) {
+            return getChildRecursive(PApplet.split(name, '/'), 0);
+        }
+        int childCount = getChildCount();
+        for (int i = 0; i < childCount; i++) {
+            XML kid = getChild(i);
+            String kidName = kid.getName();
+            if (kidName != null && kidName.equals(name)) {
+                return kid;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Internal helper function for getChild(String).
+     *
+     * @param items result of splitting the query on slashes
+     * @param offset where in the items[] array we're currently looking
+     * @return matching element or null if no match
+     * @author processing.org
+     */
+    protected XML getChildRecursive(String[] items, int offset) {
+        // if it's a number, do an index instead
+        if (Character.isDigit(items[offset].charAt(0))) {
+            XML kid = getChild(Integer.parseInt(items[offset]));
+            if (offset == items.length - 1) {
+                return kid;
+            } else {
+                return kid.getChildRecursive(items, offset + 1);
+            }
+        }
+        int childCount = getChildCount();
+        for (int i = 0; i < childCount; i++) {
+            XML kid = getChild(i);
+            String kidName = kid.getName();
+            if (kidName != null && kidName.equals(items[offset])) {
+                if (offset == items.length - 1) {
+                    return kid;
+                } else {
+                    return kid.getChildRecursive(items, offset + 1);
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Get any children that match this name or path. Similar to getChild(), but
+     * will grab multiple matches rather than only the first.
+     *
+     * @param name element name or path/to/element
+     * @return array of child elements that match
+     * @author processing.org
+     */
+    public XML[] getChildren(String name) {
+        if (name.length() > 0 && name.charAt(0) == '/') {
+            throw new IllegalArgumentException("getChildren() should not begin with a slash");
+        }
+        if (name.indexOf('/') != -1) {
+            return getChildrenRecursive(PApplet.split(name, '/'), 0);
+        }
+        // if it's a number, do an index instead
+        // (returns a single element array, since this will be a single match
+        if (Character.isDigit(name.charAt(0))) {
+            return new XML[]{getChild(Integer.parseInt(name))};
+        }
+        int childCount = getChildCount();
+        XML[] matches = new XML[childCount];
+        int matchCount = 0;
+        for (int i = 0; i < childCount; i++) {
+            XML kid = getChild(i);
+            String kidName = kid.getName();
+            if (kidName != null && kidName.equals(name)) {
+                matches[matchCount++] = kid;
+            }
+        }
+        return (XML[]) PApplet.subset(matches, 0, matchCount);
+    }
+
+    protected XML[] getChildrenRecursive(String[] items, int offset) {
+        if (offset == items.length - 1) {
+            return getChildren(items[offset]);
+        }
+        XML[] matches = getChildren(items[offset]);
+        XML[] outgoing = new XML[0];
+        for (int i = 0; i < matches.length; i++) {
+            XML[] kidMatches = matches[i].getChildrenRecursive(items, offset + 1);
+            outgoing = (XML[]) PApplet.concat(outgoing, kidMatches);
+        }
+        return outgoing;
+    }
+
+    /**
+     * @webref xml:method
+     * @brief Appends a new child to the element
+     */
+    public XML addChild(String tag) {
+        Document document = node.getOwnerDocument();
+        Node newChild = document.createElement(tag);
+        return appendChild(newChild);
+    }
+
+    public XML addChild(XML child) {
+        Document document = node.getOwnerDocument();
+        Node newChild = document.importNode((Node) child.getNative(), true);
+        return appendChild(newChild);
+    }
+
+    /**
+     * Internal handler to add the node structure.
+     */
+    protected XML appendChild(Node newNode) {
+        node.appendChild(newNode);
+        XML newbie = new XML(this, newNode);
+        if (children != null) {
+            children = (XML[]) PApplet.concat(children, new XML[]{newbie});
         }
-      }
-    }
-    return null;
-  }
-
-
-  /**
-   * Get any children that match this name or path. Similar to getChild(),
-   * but will grab multiple matches rather than only the first.
-   *
-   * @param name element name or path/to/element
-   * @return array of child elements that match
-   * @author processing.org
-   */
-  public XML[] getChildren(String name) {
-    if (name.length() > 0 && name.charAt(0) == '/') {
-      throw new IllegalArgumentException("getChildren() should not begin with a slash");
-    }
-    if (name.indexOf('/') != -1) {
-      return getChildrenRecursive(PApplet.split(name, '/'), 0);
-    }
-    // if it's a number, do an index instead
-    // (returns a single element array, since this will be a single match
-    if (Character.isDigit(name.charAt(0))) {
-      return new XML[] { getChild(Integer.parseInt(name)) };
-    }
-    int childCount = getChildCount();
-    XML[] matches = new XML[childCount];
-    int matchCount = 0;
-    for (int i = 0; i < childCount; i++) {
-      XML kid = getChild(i);
-      String kidName = kid.getName();
-      if (kidName != null && kidName.equals(name)) {
-        matches[matchCount++] = kid;
-      }
-    }
-    return (XML[]) PApplet.subset(matches, 0, matchCount);
-  }
-
-
-  protected XML[] getChildrenRecursive(String[] items, int offset) {
-    if (offset == items.length-1) {
-      return getChildren(items[offset]);
-    }
-    XML[] matches = getChildren(items[offset]);
-    XML[] outgoing = new XML[0];
-    for (int i = 0; i < matches.length; i++) {
-      XML[] kidMatches = matches[i].getChildrenRecursive(items, offset+1);
-      outgoing = (XML[]) PApplet.concat(outgoing, kidMatches);
-    }
-    return outgoing;
-  }
-
-
-  /**
-   * @webref xml:method
-   * @brief Appends a new child to the element
-   */
-  public XML addChild(String tag) {
-    Document document = node.getOwnerDocument();
-    Node newChild = document.createElement(tag);
-    return appendChild(newChild);
-  }
-
-
-  public XML addChild(XML child) {
-    Document document = node.getOwnerDocument();
-    Node newChild = document.importNode((Node) child.getNative(), true);
-    return appendChild(newChild);
-  }
-
-
-  /** Internal handler to add the node structure. */
-  protected XML appendChild(Node newNode) {
-    node.appendChild(newNode);
-    XML newbie = new XML(this, newNode);
-    if (children != null) {
-      children = (XML[]) PApplet.concat(children, new XML[] { newbie });
-    }
-    return newbie;
-  }
-
-
-  /**
-   * @webref xml:method
-   * @brief Removes the specified child
-   */
-  public void removeChild(XML kid) {
-    node.removeChild(kid.node);
-    children = null;  // TODO not efficient
-  }
-
-  /**
-   * Removes whitespace nodes.
-   * Those whitespace nodes are required to reconstruct the original XML's spacing and indentation.
-   * If you call this and use saveXML() your original spacing will be gone.
-   * 
-   * @nowebref
-   * @brief Removes whitespace nodes
-   */
-  public void trim() {
-    try {
-      XPathFactory xpathFactory = XPathFactory.newInstance();
-      XPathExpression xpathExp =
-        xpathFactory.newXPath().compile("//text()[normalize-space(.) = '']");
-      NodeList emptyTextNodes = (NodeList)
-        xpathExp.evaluate(node, XPathConstants.NODESET);
-
-      // Remove each empty text node from document.
-      for (int i = 0; i < emptyTextNodes.getLength(); i++) {
-        Node emptyTextNode = emptyTextNodes.item(i);
-        emptyTextNode.getParentNode().removeChild(emptyTextNode);
-      }
-    } catch (Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
+        return newbie;
+    }
 
+    /**
+     * @webref xml:method
+     * @brief Removes the specified child
+     */
+    public void removeChild(XML kid) {
+        node.removeChild(kid.node);
+        children = null;  // TODO not efficient
+    }
+
+    /**
+     * Removes whitespace nodes. Those whitespace nodes are required to
+     * reconstruct the original XML's spacing and indentation. If you call this
+     * and use saveXML() your original spacing will be gone.
+     *
+     * @nowebref
+     * @brief Removes whitespace nodes
+     */
+    public void trim() {
+        try {
+            XPathFactory xpathFactory = XPathFactory.newInstance();
+            XPathExpression xpathExp
+                    = xpathFactory.newXPath().compile("//text()[normalize-space(.) = '']");
+            NodeList emptyTextNodes = (NodeList) xpathExp.evaluate(node, XPathConstants.NODESET);
+
+            // Remove each empty text node from document.
+            for (int i = 0; i < emptyTextNodes.getLength(); i++) {
+                Node emptyTextNode = emptyTextNodes.item(i);
+                emptyTextNode.getParentNode().removeChild(emptyTextNode);
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
 
 //  /** Remove whitespace nodes. */
 //  public void trim() {
@@ -668,489 +636,447 @@ public class XML implements Serializable {
 ////     </xsl:template>
 ////   </xsl:stylesheet>
 //  }
+    /**
+     * Returns the number of attributes.
+     *
+     * @webref xml:method
+     * @brief Counts the specified element's number of attributes
+     */
+    public int getAttributeCount() {
+        return node.getAttributes().getLength();
+    }
+
+    /**
+     * Get a list of the names for all of the attributes for this node.
+     *
+     * @webref xml:method
+     * @brief Returns a list of names of all attributes as an array
+     */
+    public String[] listAttributes() {
+        NamedNodeMap nnm = node.getAttributes();
+        String[] outgoing = new String[nnm.getLength()];
+        for (int i = 0; i < outgoing.length; i++) {
+            outgoing[i] = nnm.item(i).getNodeName();
+        }
+        return outgoing;
+    }
 
+    /**
+     * Returns whether an attribute exists.
+     *
+     * @webref xml:method
+     * @brief Checks whether or not an element has the specified attribute
+     */
+    public boolean hasAttribute(String name) {
+        return (node.getAttributes().getNamedItem(name) != null);
+    }
 
-  /**
-   * Returns the number of attributes.
-   *
-   * @webref xml:method
-   * @brief Counts the specified element's number of attributes
-   */
-  public int getAttributeCount() {
-    return node.getAttributes().getLength();
-  }
-
-
-  /**
-   * Get a list of the names for all of the attributes for this node.
-   *
-   * @webref xml:method
-   * @brief Returns a list of names of all attributes as an array
-   */
-  public String[] listAttributes() {
-    NamedNodeMap nnm = node.getAttributes();
-    String[] outgoing = new String[nnm.getLength()];
-    for (int i = 0; i < outgoing.length; i++) {
-      outgoing[i] = nnm.item(i).getNodeName();
-    }
-    return outgoing;
-  }
-
-  /**
-   * Returns whether an attribute exists.
-   *
-   * @webref xml:method
-   * @brief Checks whether or not an element has the specified attribute
-   */
-  public boolean hasAttribute(String name) {
-    return (node.getAttributes().getNamedItem(name) != null);
-  }
-
-
-  /**
-   * Returns the value of an attribute.
-   *
-   * @param name the non-null name of the attribute.
-   * @return the value, or null if the attribute does not exist.
-   */
+    /**
+     * Returns the value of an attribute.
+     *
+     * @param name the non-null name of the attribute.
+     * @return the value, or null if the attribute does not exist.
+     */
 //  public String getAttribute(String name) {
 //    return this.getAttribute(name, null);
 //  }
-
-
-  /**
-   * Returns the value of an attribute.
-   *
-   * @param name the non-null full name of the attribute.
-   * @param defaultValue the default value of the attribute.
-   * @return the value, or defaultValue if the attribute does not exist.
-   */
+    /**
+     * Returns the value of an attribute.
+     *
+     * @param name the non-null full name of the attribute.
+     * @param defaultValue the default value of the attribute.
+     * @return the value, or defaultValue if the attribute does not exist.
+     */
 //  public String getAttribute(String name, String defaultValue) {
 //    Node attr = node.getAttributes().getNamedItem(name);
 //    return (attr == null) ? defaultValue : attr.getNodeValue();
 //  }
+    /**
+     * @webref xml:method
+     * @brief Gets the content of an attribute as a String
+     */
+    public String getString(String name) {
+        return getString(name, null);
+    }
+
+    public String getString(String name, String defaultValue) {
+        NamedNodeMap attrs = node.getAttributes();
+        if (attrs != null) {
+            Node attr = attrs.getNamedItem(name);
+            if (attr != null) {
+                return attr.getNodeValue();
+            }
+        }
+        return defaultValue;
+    }
 
+    /**
+     * @webref xml:method
+     * @brief Sets the content of an attribute as a String
+     */
+    public void setString(String name, String value) {
+        ((Element) node).setAttribute(name, value);
+    }
 
-  /**
-   * @webref xml:method
-   * @brief Gets the content of an attribute as a String
-   */
-  public String getString(String name) {
-    return getString(name, null);
-  }
-
-
-  public String getString(String name, String defaultValue) {
-    NamedNodeMap attrs = node.getAttributes();
-    if (attrs != null) {
-      Node attr = attrs.getNamedItem(name);
-      if (attr != null) {
-        return attr.getNodeValue();
-      }
-    }
-    return defaultValue;
-  }
-
-
-  /**
-   * @webref xml:method
-   * @brief Sets the content of an attribute as a String
-   */
-  public void setString(String name, String value) {
-    ((Element) node).setAttribute(name, value);
-  }
-
-
-  /**
-   * @webref xml:method
-   * @brief Gets the content of an attribute as an int
-   */
-  public int getInt(String name) {
-    return getInt(name, 0);
-  }
-
-
-  /**
-   * @webref xml:method
-   * @brief Sets the content of an attribute as an int
-   */
-  public void setInt(String name, int value) {
-    setString(name, String.valueOf(value));
-  }
-
-
-  /**
-   * Returns the value of an attribute.
-   *
-   * @param name the non-null full name of the attribute
-   * @param defaultValue the default value of the attribute
-   * @return the value, or defaultValue if the attribute does not exist
-   */
-  public int getInt(String name, int defaultValue) {
-    String value = getString(name);
-    return (value == null) ? defaultValue : Integer.parseInt(value);
-  }
-
-
-  /**
-   * @webref xml:method
-   * @brief Sets the content of an element as an int
-   */
-  public void setLong(String name, long value) {
-    setString(name, String.valueOf(value));
-  }
-
-
-  /**
-   * Returns the value of an attribute.
-   *
-   * @param name the non-null full name of the attribute.
-   * @param defaultValue the default value of the attribute.
-   * @return the value, or defaultValue if the attribute does not exist.
-   */
-  public long getLong(String name, long defaultValue) {
-    String value = getString(name);
-    return (value == null) ? defaultValue : Long.parseLong(value);
-  }
-
-
-  /**
-   * Returns the value of an attribute, or zero if not present.
-   *
-   * @webref xml:method
-   * @brief Gets the content of an attribute as a float
-   */
-  public float getFloat(String name) {
-    return getFloat(name, 0);
-  }
-
-
-  /**
-   * Returns the value of an attribute.
-   *
-   * @param name the non-null full name of the attribute.
-   * @param defaultValue the default value of the attribute.
-   * @return the value, or defaultValue if the attribute does not exist.
-   */
-  public float getFloat(String name, float defaultValue) {
-    String value = getString(name);
-    return (value == null) ? defaultValue : Float.parseFloat(value);
-  }
-
-
-  /**
-   * @webref xml:method
-   * @brief Sets the content of an attribute as a float
-   */
-  public void setFloat(String name, float value) {
-    setString(name, String.valueOf(value));
-  }
-
-
-  public double getDouble(String name) {
-    return getDouble(name, 0);
-  }
-
-
-  /**
-   * Returns the value of an attribute.
-   *
-   * @param name the non-null full name of the attribute
-   * @param defaultValue the default value of the attribute
-   * @return the value, or defaultValue if the attribute does not exist
-   */
-  public double getDouble(String name, double defaultValue) {
-    String value = getString(name);
-    return (value == null) ? defaultValue : Double.parseDouble(value);
-  }
-
-
-  public void setDouble(String name, double value) {
-    setString(name, String.valueOf(value));
-  }
-
-
-  /**
-   * Return the #PCDATA content of the element. If the element has a
-   * combination of #PCDATA content and child elements, the #PCDATA
-   * sections can be retrieved as unnamed child objects. In this case,
-   * this method returns null.
-   *
-   * @webref xml:method
-   * @brief Gets the content of an element
-   * @return the content.
-   * @see XML#getIntContent()
-   * @see XML#getFloatContent()
-   */
-  public String getContent() {
-    return node.getTextContent();
-  }
-
-
-  public String getContent(String defaultValue) {
-    String s = node.getTextContent();
-    return (s != null) ? s : defaultValue;
-  }
-
-
-  /**
-   * @webref xml:method
-   * @brief Gets the content of an element as an int
-   * @return the content.
-   * @see XML#getContent()
-   * @see XML#getFloatContent()
-   */
-  public int getIntContent() {
-    return getIntContent(0);
-  }
-
-
-  /**
-   * @param defaultValue the default value of the attribute
-   */
-  public int getIntContent(int defaultValue) {
-    return PApplet.parseInt(node.getTextContent(), defaultValue);
-  }
-
-
-  /**
-   * @webref xml:method
-   * @brief Gets the content of an element as a float
-   * @return the content.
-   * @see XML#getContent()
-   * @see XML#getIntContent()
-   */
-  public float getFloatContent() {
-    return getFloatContent(0);
-  }
-
-
-  /**
-   * @param defaultValue the default value of the attribute
-   */
-  public float getFloatContent(float defaultValue) {
-    return PApplet.parseFloat(node.getTextContent(), defaultValue);
-  }
-
-
-  public long getLongContent() {
-    return getLongContent(0);
-  }
-
-
-  public long getLongContent(long defaultValue) {
-    String c = node.getTextContent();
-    if (c != null) {
-      try {
-        return Long.parseLong(c);
-      } catch (NumberFormatException nfe) { }
-    }
-    return defaultValue;
-  }
-
-
-  public double getDoubleContent() {
-    return getDoubleContent(0);
-  }
-
-
-  public double getDoubleContent(double defaultValue) {
-    String c = node.getTextContent();
-    if (c != null) {
-      try {
-        return Double.parseDouble(c);
-      } catch (NumberFormatException nfe) { }
-    }
-    return defaultValue;
-  }
-
-
-  /**
-   * @webref xml:method
-   * @brief Sets the content of an element
-   */
-  public void setContent(String text) {
-    node.setTextContent(text);
-  }
-
-
-  public void setIntContent(int value) {
-    setContent(String.valueOf(value));
-  }
+    /**
+     * @webref xml:method
+     * @brief Gets the content of an attribute as an int
+     */
+    public int getInt(String name) {
+        return getInt(name, 0);
+    }
 
+    /**
+     * @webref xml:method
+     * @brief Sets the content of an attribute as an int
+     */
+    public void setInt(String name, int value) {
+        setString(name, String.valueOf(value));
+    }
 
-  public void setFloatContent(float value) {
-    setContent(String.valueOf(value));
-  }
+    /**
+     * Returns the value of an attribute.
+     *
+     * @param name the non-null full name of the attribute
+     * @param defaultValue the default value of the attribute
+     * @return the value, or defaultValue if the attribute does not exist
+     */
+    public int getInt(String name, int defaultValue) {
+        String value = getString(name);
+        return (value == null) ? defaultValue : Integer.parseInt(value);
+    }
 
+    /**
+     * @webref xml:method
+     * @brief Sets the content of an element as an int
+     */
+    public void setLong(String name, long value) {
+        setString(name, String.valueOf(value));
+    }
 
-  public void setLongContent(long value) {
-    setContent(String.valueOf(value));
-  }
+    /**
+     * Returns the value of an attribute.
+     *
+     * @param name the non-null full name of the attribute.
+     * @param defaultValue the default value of the attribute.
+     * @return the value, or defaultValue if the attribute does not exist.
+     */
+    public long getLong(String name, long defaultValue) {
+        String value = getString(name);
+        return (value == null) ? defaultValue : Long.parseLong(value);
+    }
 
+    /**
+     * Returns the value of an attribute, or zero if not present.
+     *
+     * @webref xml:method
+     * @brief Gets the content of an attribute as a float
+     */
+    public float getFloat(String name) {
+        return getFloat(name, 0);
+    }
 
-  public void setDoubleContent(double value) {
-    setContent(String.valueOf(value));
-  }
+    /**
+     * Returns the value of an attribute.
+     *
+     * @param name the non-null full name of the attribute.
+     * @param defaultValue the default value of the attribute.
+     * @return the value, or defaultValue if the attribute does not exist.
+     */
+    public float getFloat(String name, float defaultValue) {
+        String value = getString(name);
+        return (value == null) ? defaultValue : Float.parseFloat(value);
+    }
 
-
-  /**
-   * Format this XML data as a String.
-   *
-   * @webref xml:method
-   * @brief Formats XML data as a String
-   * @param indent -1 for a single line (and no declaration), >= 0 for indents and newlines
-   * @return the content
-   * @see XML#toString()
-   */
-  public String format(int indent) {
-    try {
-      // entities = doctype.getEntities()
-      boolean useIndentAmount = false;
-      TransformerFactory factory = TransformerFactory.newInstance();
-      if (indent != -1) {
-        try {
-          factory.setAttribute("indent-number", indent);
-        } catch (IllegalArgumentException e) {
-          useIndentAmount = true;
+    /**
+     * @webref xml:method
+     * @brief Sets the content of an attribute as a float
+     */
+    public void setFloat(String name, float value) {
+        setString(name, String.valueOf(value));
+    }
+
+    public double getDouble(String name) {
+        return getDouble(name, 0);
+    }
+
+    /**
+     * Returns the value of an attribute.
+     *
+     * @param name the non-null full name of the attribute
+     * @param defaultValue the default value of the attribute
+     * @return the value, or defaultValue if the attribute does not exist
+     */
+    public double getDouble(String name, double defaultValue) {
+        String value = getString(name);
+        return (value == null) ? defaultValue : Double.parseDouble(value);
+    }
+
+    public void setDouble(String name, double value) {
+        setString(name, String.valueOf(value));
+    }
+
+    /**
+     * Return the #PCDATA content of the element. If the element has a
+     * combination of #PCDATA content and child elements, the #PCDATA sections
+     * can be retrieved as unnamed child objects. In this case, this method
+     * returns null.
+     *
+     * @webref xml:method
+     * @brief Gets the content of an element
+     * @return the content.
+     * @see XML#getIntContent()
+     * @see XML#getFloatContent()
+     */
+    public String getContent() {
+        return node.getTextContent();
+    }
+
+    public String getContent(String defaultValue) {
+        String s = node.getTextContent();
+        return (s != null) ? s : defaultValue;
+    }
+
+    /**
+     * @webref xml:method
+     * @brief Gets the content of an element as an int
+     * @return the content.
+     * @see XML#getContent()
+     * @see XML#getFloatContent()
+     */
+    public int getIntContent() {
+        return getIntContent(0);
+    }
+
+    /**
+     * @param defaultValue the default value of the attribute
+     */
+    public int getIntContent(int defaultValue) {
+        return PApplet.parseInt(node.getTextContent(), defaultValue);
+    }
+
+    /**
+     * @webref xml:method
+     * @brief Gets the content of an element as a float
+     * @return the content.
+     * @see XML#getContent()
+     * @see XML#getIntContent()
+     */
+    public float getFloatContent() {
+        return getFloatContent(0);
+    }
+
+    /**
+     * @param defaultValue the default value of the attribute
+     */
+    public float getFloatContent(float defaultValue) {
+        return PApplet.parseFloat(node.getTextContent(), defaultValue);
+    }
+
+    public long getLongContent() {
+        return getLongContent(0);
+    }
+
+    public long getLongContent(long defaultValue) {
+        String c = node.getTextContent();
+        if (c != null) {
+            try {
+                return Long.parseLong(c);
+            } catch (NumberFormatException nfe) {
+            }
         }
-      }
-      Transformer transformer = factory.newTransformer();
+        return defaultValue;
+    }
 
-      // Add the XML declaration at the top if this node is the root and we're
-      // not writing to a single line (indent = -1 means single line).
-      if (indent == -1 || parent == null) {
-        transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
-      } else {
-        transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "no");
-      }
+    public double getDoubleContent() {
+        return getDoubleContent(0);
+    }
 
-//      transformer.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM, "sample.dtd");
+    public double getDoubleContent(double defaultValue) {
+        String c = node.getTextContent();
+        if (c != null) {
+            try {
+                return Double.parseDouble(c);
+            } catch (NumberFormatException nfe) {
+            }
+        }
+        return defaultValue;
+    }
 
-      transformer.setOutputProperty(OutputKeys.METHOD, "xml");
+    /**
+     * @webref xml:method
+     * @brief Sets the content of an element
+     */
+    public void setContent(String text) {
+        node.setTextContent(text);
+    }
 
-//      transformer.setOutputProperty(OutputKeys.CDATA_SECTION_ELEMENTS, "yes");  // huh?
+    public void setIntContent(int value) {
+        setContent(String.valueOf(value));
+    }
 
+    public void setFloatContent(float value) {
+        setContent(String.valueOf(value));
+    }
+
+    public void setLongContent(long value) {
+        setContent(String.valueOf(value));
+    }
+
+    public void setDoubleContent(double value) {
+        setContent(String.valueOf(value));
+    }
+
+    /**
+     * Format this XML data as a String.
+     *
+     * @webref xml:method
+     * @brief Formats XML data as a String
+     * @param indent -1 for a single line (and no declaration), >= 0 for indents
+     * and newlines
+     * @return the content
+     * @see XML#toString()
+     */
+    public String format(int indent) {
+        try {
+            // entities = doctype.getEntities()
+            boolean useIndentAmount = false;
+            TransformerFactory factory = TransformerFactory.newInstance();
+            if (indent != -1) {
+                try {
+                    factory.setAttribute("indent-number", indent);
+                } catch (IllegalArgumentException e) {
+                    useIndentAmount = true;
+                }
+            }
+            Transformer transformer = factory.newTransformer();
+
+            // Add the XML declaration at the top if this node is the root and we're
+            // not writing to a single line (indent = -1 means single line).
+            if (indent == -1 || parent == null) {
+                transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
+            } else {
+                transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "no");
+            }
+
+//      transformer.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM, "sample.dtd");
+            transformer.setOutputProperty(OutputKeys.METHOD, "xml");
+
+//      transformer.setOutputProperty(OutputKeys.CDATA_SECTION_ELEMENTS, "yes");  // huh?
 //      transformer.setOutputProperty(OutputKeys.DOCTYPE_PUBLIC,
 //          "-//W3C//DTD XHTML 1.0 Transitional//EN");
 //      transformer.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM,
 //          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd");
-
-      // For Android, because (at least 2.3.3) doesn't like indent-number
-      if (useIndentAmount) {
-        transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", String.valueOf(indent));
-      }
+            // For Android, because (at least 2.3.3) doesn't like indent-number
+            if (useIndentAmount) {
+                transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", String.valueOf(indent));
+            }
 
 //      transformer.setOutputProperty(OutputKeys.ENCODING,"ISO-8859-1");
 //      transformer.setOutputProperty(OutputKeys.ENCODING,"UTF8");
-      transformer.setOutputProperty(OutputKeys.ENCODING,"UTF-8");
+            transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
 //      transformer.setOutputProperty(OutputKeys.CDATA_SECTION_ELEMENTS
 
-      // Always indent, otherwise the XML declaration will just be jammed
-      // onto the first line with the XML code as well.
-      transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+            // Always indent, otherwise the XML declaration will just be jammed
+            // onto the first line with the XML code as well.
+            transformer.setOutputProperty(OutputKeys.INDENT, "yes");
 
 //      Properties p = transformer.getOutputProperties();
 //      for (Object key : p.keySet()) {
 //        System.out.println(key + " -> " + p.get(key));
 //      }
-
-      // If you smell something, that's because this code stinks. No matter
-      // the settings of the Transformer object, if the XML document already
-      // has whitespace elements, it won't bother re-indenting/re-formatting.
-      // So instead, transform the data once into a single line string.
-      // If indent is -1, then we're done. Otherwise re-run and the settings
-      // of the factory will kick in. If you know a better way to do this,
-      // please contribute. I've wasted too much of my Sunday on it. But at
-      // least the Giants are getting blown out by the Falcons.
-
-      final String decl = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
-      final String sep = System.getProperty("line.separator");
-
-      StringWriter tempWriter = new StringWriter();
-      StreamResult tempResult = new StreamResult(tempWriter);
-      transformer.transform(new DOMSource(node), tempResult);
-      String[] tempLines = PApplet.split(tempWriter.toString(), sep);
+            // If you smell something, that's because this code stinks. No matter
+            // the settings of the Transformer object, if the XML document already
+            // has whitespace elements, it won't bother re-indenting/re-formatting.
+            // So instead, transform the data once into a single line string.
+            // If indent is -1, then we're done. Otherwise re-run and the settings
+            // of the factory will kick in. If you know a better way to do this,
+            // please contribute. I've wasted too much of my Sunday on it. But at
+            // least the Giants are getting blown out by the Falcons.
+            final String decl = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
+            final String sep = System.getProperty("line.separator");
+
+            StringWriter tempWriter = new StringWriter();
+            StreamResult tempResult = new StreamResult(tempWriter);
+            transformer.transform(new DOMSource(node), tempResult);
+            String[] tempLines = PApplet.split(tempWriter.toString(), sep);
 //      PApplet.println(tempLines);
-      if (tempLines[0].startsWith("<?xml")) {
-        // Remove XML declaration from the top before slamming into one line
-        int declEnd = tempLines[0].indexOf("?>") + 2;
-        //if (tempLines[0].length() == decl.length()) {
-        if (tempLines[0].length() == declEnd) {
-          // If it's all the XML declaration, remove it
+            if (tempLines[0].startsWith("<?xml")) {
+                // Remove XML declaration from the top before slamming into one line
+                int declEnd = tempLines[0].indexOf("?>") + 2;
+                //if (tempLines[0].length() == decl.length()) {
+                if (tempLines[0].length() == declEnd) {
+                    // If it's all the XML declaration, remove it
 //          PApplet.println("removing first line");
-          tempLines = PApplet.subset(tempLines, 1);
-        } else {
+                    tempLines = PApplet.subset(tempLines, 1);
+                } else {
 //          PApplet.println("removing part of first line");
-          // If the first node has been moved to this line, be more careful
-          //tempLines[0] = tempLines[0].substring(decl.length());
-          tempLines[0] = tempLines[0].substring(declEnd);
-        }
-      }
-      String singleLine = PApplet.join(PApplet.trim(tempLines), "");
-      if (indent == -1) {
-        return singleLine;
-      }
-
-      // Might just be whitespace, which won't be valid XML for parsing below.
-      // https://github.com/processing/processing/issues/1796
-      // Since indent is not -1, that means they want valid XML,
-      // so we'll give them the single line plus the decl... Lame? sure.
-      if (singleLine.trim().length() == 0) {
-        // You want whitespace? I've got your whitespace right here.
-        return decl + sep + singleLine;
-      }
-
-      // Since the indent is not -1, bring back the XML declaration
-      //transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "no");
-
-      StringWriter stringWriter = new StringWriter();
-      StreamResult xmlOutput = new StreamResult(stringWriter);
+                    // If the first node has been moved to this line, be more careful
+                    //tempLines[0] = tempLines[0].substring(decl.length());
+                    tempLines[0] = tempLines[0].substring(declEnd);
+                }
+            }
+            String singleLine = PApplet.join(PApplet.trim(tempLines), "");
+            if (indent == -1) {
+                return singleLine;
+            }
+
+            // Might just be whitespace, which won't be valid XML for parsing below.
+            // https://github.com/processing/processing/issues/1796
+            // Since indent is not -1, that means they want valid XML,
+            // so we'll give them the single line plus the decl... Lame? sure.
+            if (singleLine.trim().length() == 0) {
+                // You want whitespace? I've got your whitespace right here.
+                return decl + sep + singleLine;
+            }
+
+            // Since the indent is not -1, bring back the XML declaration
+            //transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "no");
+            StringWriter stringWriter = new StringWriter();
+            StreamResult xmlOutput = new StreamResult(stringWriter);
 //      DOMSource source = new DOMSource(node);
-      Source source = new StreamSource(new StringReader(singleLine));
-      transformer.transform(source, xmlOutput);
-      String outgoing = stringWriter.toString();
-
-      // Add the XML declaration to the top if it's not there already
-      if (outgoing.startsWith(decl)) {
-        int declen = decl.length();
-        int seplen = sep.length();
-        if (outgoing.length() > declen + seplen &&
-            !outgoing.substring(declen, declen + seplen).equals(sep)) {
-          // make sure there's a line break between the XML decl and the code
-          return outgoing.substring(0, decl.length()) +
-            sep + outgoing.substring(decl.length());
+            Source source = new StreamSource(new StringReader(singleLine));
+            transformer.transform(source, xmlOutput);
+            String outgoing = stringWriter.toString();
+
+            // Add the XML declaration to the top if it's not there already
+            if (outgoing.startsWith(decl)) {
+                int declen = decl.length();
+                int seplen = sep.length();
+                if (outgoing.length() > declen + seplen
+                        && !outgoing.substring(declen, declen + seplen).equals(sep)) {
+                    // make sure there's a line break between the XML decl and the code
+                    return outgoing.substring(0, decl.length())
+                            + sep + outgoing.substring(decl.length());
+                }
+                return outgoing;
+            } else {
+                return decl + sep + outgoing;
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        return outgoing;
-      } else {
-        return decl + sep + outgoing;
-      }
-
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-    return null;
-  }
-
-
-  public void print() {
-    PApplet.println(format(2));
-  }
-
-
-  /**
-   * Return the XML document formatted with two spaces for indents.
-   * Chosen to do this since it's the most common case (e.g. with println()).
-   * Same as format(2). Use the format() function for more options.
-   *
-   * @webref xml:method
-   * @brief Gets XML data as a String using default formatting
-   * @return the content
-   * @see XML#format(int)
-   */
-  @Override
-  public String toString() {
-    //return format(2);
-    return format(-1);
-  }
+        return null;
+    }
+
+    public void print() {
+        PApplet.println(format(2));
+    }
+
+    /**
+     * Return the XML document formatted with two spaces for indents. Chosen to
+     * do this since it's the most common case (e.g. with println()). Same as
+     * format(2). Use the format() function for more options.
+     *
+     * @webref xml:method
+     * @brief Gets XML data as a String using default formatting
+     * @return the content
+     * @see XML#format(int)
+     */
+    @Override
+    public String toString() {
+        //return format(2);
+        return format(-1);
+    }
 }