diff --git a/core/src/processing/data/JSONObject.java b/core/src/processing/data/JSONObject.java index f081847fe..7659fa295 100644 --- a/core/src/processing/data/JSONObject.java +++ b/core/src/processing/data/JSONObject.java @@ -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); } diff --git a/core/src/processing/data/JSONString.java b/core/src/processing/data/JSONString.java deleted file mode 100644 index 0079387d4..000000000 --- a/core/src/processing/data/JSONString.java +++ /dev/null @@ -1,19 +0,0 @@ -package processing.data; - -/** - * The JSONString interface allows a toJSONString() - * method so that a class can change the behavior of - * JSONObject.toString(), JSONArray.toString(), - * and JSONWriter.value(Object). The - * toJSONString method will be used instead of the default behavior - * of using the Object's toString() method and quoting the result. - */ -public interface JSONString { - /** - * The toJSONString method allows a class to produce its own JSON - * serialization. - * - * @return A strictly syntactically correct JSON text. - */ - public String toJSONString(); -}