eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-12 18:10:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

and some culling

Browse Source
This commit is contained in:
benfry
2012-12-11 01:12:16 +00:00
parent d33c152ee1
commit 2e9b3cd747
2 changed files with 15 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/src/processing/data/JSONObject.java
View File

@@ -1444,18 +1444,18 @@ public class JSONObject {
if (value == null || value.equals(null)) {
return "null";
}
if (value instanceof JSONString) {
Object object;
try {
object = ((JSONString)value).toJSONString();
} catch (Exception e) {
throw new RuntimeException(e);
}
if (object instanceof String) {
return (String)object;
}
throw new RuntimeException("Bad value from toJSONString: " + object);
}
// if (value instanceof JSONString) {
// Object object;
// try {
// object = ((JSONString)value).toJSONString();
// } catch (Exception e) {
// throw new RuntimeException(e);
// }
// if (object instanceof String) {
// return (String)object;
// }
// throw new RuntimeException("Bad value from toJSONString: " + object);
// }
if (value instanceof Number) {
return numberToString((Number) value);
}
@@ -1493,7 +1493,7 @@ public class JSONObject {
return NULL;
}
if (object instanceof JSONObject || object instanceof JSONArray ||
NULL.equals(object) || object instanceof JSONString ||
NULL.equals(object) || /*object instanceof JSONString ||*/
object instanceof Byte || object instanceof Character ||
object instanceof Short || object instanceof Integer ||
object instanceof Long || object instanceof Boolean ||
@@ -1562,6 +1562,7 @@ public class JSONObject {
writer.write(numberToString((Number) value));
} else if (value instanceof Boolean) {
writer.write(value.toString());
/*
} else if (value instanceof JSONString) {
Object o;
try {
@@ -1570,6 +1571,7 @@ public class JSONObject {
throw new RuntimeException(e);
}
writer.write(o != null ? o.toString() : quote(value.toString()));
*/
} else {
quote(value.toString(), writer);
}