close Writer object from createWriter() (fixes processing#3705)

benfry · benfry · commit 3deb8229c4e6 · 2015-08-24T11:30:28.000-04:00
diff --git a/core/src/processing/data/JSONArray.java b/core/src/processing/data/JSONArray.java
@@ -1099,7 +1099,10 @@ public Object remove(int index) {
 
 
   public boolean save(File file, String options) {
-    return write(PApplet.createWriter(file), options);
+    PrintWriter writer = PApplet.createWriter(file);
+    boolean success = write(writer, options);
+    writer.close();
+    return success;
   }
 
 
diff --git a/core/src/processing/data/JSONObject.java b/core/src/processing/data/JSONObject.java
@@ -1554,7 +1554,10 @@ static protected void testValidity(Object o) {
 
 
   public boolean save(File file, String options) {
-    return write(PApplet.createWriter(file), options);
+    PrintWriter writer = PApplet.createWriter(file);
+    boolean success = write(writer, options);
+    writer.close();
+    return success;
   }
 
 
diff --git a/core/todo.txt b/core/todo.txt
@@ -5,6 +5,8 @@ X Wrong positioning of circles in SVG shapes (regression from 2)
 X   https://github.com/processing/processing/issues/3685
 X setFill() on PShape in Java2D throws ArrayIndexOutOfBoundsException
 X   https://github.com/processing/processing/issues/3677
+X saveJSONObject() doesn't close the file
+X   https://github.com/processing/processing/issues/3705
 
 jakub
 X keyTyped() not firing with P2D and P3D
@@ -30,6 +32,10 @@ X   https://github.com/processing/processing/issues/3621
 X "Internal graphics not initialized yet"
 X   https://github.com/processing/processing/issues/3690
 X   https://github.com/processing/processing/pull/3692
+X Remove support for fixed-function pipeline
+X   https://github.com/processing/processing/issues/3505
+_ NullPointerException in Demos > Graphics > Planets
+_   https://github.com/processing/processing/issues/3551
 
 cleaning
 X How do images behave when pixelDensity(2) is set?
diff --git a/todo.txt b/todo.txt
@@ -13,6 +13,11 @@ X   no special case added for 10.8, but it's on the way out
 X move processing.mode.java.pdex.XQErrorTable to processing.ui.ErrorTable
 X   need to make the list abstract, also "scroll to line" feature
 X fix red in sidebar, the squiggly line beneath code
+_ ast generator complains about F instead of f after floats
+_   https://github.com/processing/processing/issues/3707
+o 3.0b4 demos fail to create PDF files
+_   https://github.com/processing/processing/issues/3708
+
 
 contribs
 X Undo does not move to the correct location in the editor window

Original file line number	Diff line number	Diff line change
`@@ -1099,7 +1099,10 @@ public Object remove(int index) {`
`1099`	`1099`
`1100`	`1100`
`1101`	`1101`	`public boolean save(File file, String options) {`
`1102`		`- return write(PApplet.createWriter(file), options);`
	`1102`	`+ PrintWriter writer = PApplet.createWriter(file);`
	`1103`	`+ boolean success = write(writer, options);`
	`1104`	`+ writer.close();`
	`1105`	`+ return success;`
`1103`	`1106`	`}`
`1104`	`1107`
`1105`	`1108`
Original file line number	Diff line number	Diff line change
`@@ -1554,7 +1554,10 @@ static protected void testValidity(Object o) {`
`1554`	`1554`
`1555`	`1555`
`1556`	`1556`	`public boolean save(File file, String options) {`
`1557`		`- return write(PApplet.createWriter(file), options);`
	`1557`	`+ PrintWriter writer = PApplet.createWriter(file);`
	`1558`	`+ boolean success = write(writer, options);`
	`1559`	`+ writer.close();`
	`1560`	`+ return success;`
`1558`	`1561`	`}`
`1559`	`1562`
`1560`	`1563`