properly put escapes on strings

benfry · benfry · commit ddb9cde2ac40 · 2016-08-09T18:35:21.000-04:00
diff --git a/core/src/processing/data/IntDict.java b/core/src/processing/data/IntDict.java
@@ -666,7 +666,7 @@ public void write(PrintWriter writer) {
   public String toJSON() {
     StringList items = new StringList();
     for (int i = 0; i < size(); i++) {
-      items.append("\"" + keys[i] + "\": " + values[i]);
+      items.append("\"" + JSONObject.quote(keys[i]) + "\": " + values[i]);
     }
     return "{ " + items.join(", ") + " }";
   }
diff --git a/core/todo.txt b/core/todo.txt
@@ -3,6 +3,7 @@ X some Table cleanup based on other CSV parsing work
 X use StandardCharsets.UTF_8 instead of getting encoding by name
 X PApplet.main(Blah.class) now works
 X add toJSON() method to IntDict
+X   had to use JSONObject.quote() to wrap the text
 _   do the same for the other data classes
 _   note the difference between this and toJSONObject() or toJSONArray()
 _   or is that the better way to handle it? hm

Original file line number	Diff line number	Diff line change
`@@ -666,7 +666,7 @@ public void write(PrintWriter writer) {`
`666`	`666`	`public String toJSON() {`
`667`	`667`	`StringList items = new StringList();`
`668`	`668`	`for (int i = 0; i < size(); i++) {`
`669`		`- items.append("\"" + keys[i] + "\": " + values[i]);`
	`669`	`+ items.append("\"" + JSONObject.quote(keys[i]) + "\": " + values[i]);`
`670`	`670`	`}`
`671`	`671`	`return "{ " + items.join(", ") + " }";`
`672`	`672`	`}`