Merge branch 'master' of https://github.com/processing/processing.git

build/shared/revisions.txt

@@ -35,6 +35,9 @@ And just like that, here we are at 2.0.
 + PGraphics objects that used JAVA2D weren't updating when used with OpenGL
   https://github.com/processing/processing/issues/1786
 
++ P2D/P3D sketches don't get focus until clicked
+  https://github.com/processing/processing/issues/1700
+
 [ changes ] 
 
 + A handful of tweaks to smooth out the 2.0 user interface. 
@@ -56,6 +59,11 @@ And just like that, here we are at 2.0.
   was using the (undocument) .bin format for Table, you'll need to 
   re-save your data.
 
++ Changed XML.toString() (what's called when you print() or println() 
+  an XML object) to just send a single line of text instead of a full 
+  XML document with a header. Use format(numSpaces) if you want a
+  properly formatted document with declaration at the top.
+
 [ andres on the attack ] 
 
 + PImage not drawn after resize()/get() in P2D/P3D
@@ -88,9 +96,6 @@ And just like that, here we are at 2.0.
 + Setting smooth(n) affects disables background in setup()
   https://github.com/processing/processing/issues/1452
 
-+ P2D/P3D sketches don't get focus until clicked
-  https://github.com/processing/processing/issues/1700
-
 + textureWrap(REPEAT) + textureMode(IMAGE) clamps positive coordinates
   https://github.com/processing/processing/issues/1809
 

core/src/processing/data/XML.java

@@ -242,6 +242,8 @@ public class XML implements Serializable {
   }
 
 
+  // 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();
@@ -1010,10 +1012,10 @@ public class XML implements Serializable {
       // 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.
+      // 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 singleLine;
+        return decl + sep + singleLine;
       }
 
       // Since the indent is not -1, bring back the XML declaration
@@ -1025,8 +1027,9 @@ public class XML implements Serializable {
       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)) {
-        // Add the XML declaration to the top if it's not there already
         return decl + sep + outgoing;
       } else {
         return outgoing;

core/todo.txt

@@ -17,6 +17,8 @@ X change to the binary table file format
 X   not backwards compatible, b/c this feature is unannounced
 X parse exception thrown when using getChildren() on an XML object
 X   https://github.com/processing/processing/issues/1796
+X change XML.toString() to just send a single line of text
+X   instead of a full XML-formatted beastie
 
 andres
 A PImage not drawn after resize()/get() in P2D/P3D