From 11c952d0559b0f25f92100c5c622ea0ba25bf030 Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Wed, 4 Apr 2018 20:30:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4JSONString?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../internal/org/json/JSONObject.java | 22 +------------------ .../internal/org/json/JSONString.java | 20 ----------------- 2 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 src/main/java/org/to2mbn/authlibinjector/internal/org/json/JSONString.java diff --git a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/JSONObject.java b/src/main/java/org/to2mbn/authlibinjector/internal/org/json/JSONObject.java index 58a44ed..d4dffa3 100644 --- a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/JSONObject.java +++ b/src/main/java/org/to2mbn/authlibinjector/internal/org/json/JSONObject.java @@ -1321,18 +1321,6 @@ public class JSONObject implements Serializable { if (value == null || value.equals(null)) { return "null"; } - if (value instanceof JSONString) { - Object object; - try { - object = ((JSONString) value).toJSONString(); - } catch (Exception e) { - throw new JSONException(e); - } - if (object instanceof String) { - return (String) object; - } - throw new JSONException("Bad value from toJSONString: " + object); - } if (value instanceof Number) { return numberToString((Number) value); } @@ -1372,7 +1360,7 @@ public class JSONObject implements Serializable { return NULL; } if (object instanceof JSONObject || object instanceof JSONArray - || NULL.equals(object) || object instanceof JSONString + || NULL.equals(object) || object instanceof Byte || object instanceof Character || object instanceof Short || object instanceof Integer || object instanceof Long || object instanceof Boolean @@ -1444,14 +1432,6 @@ public class JSONObject implements Serializable { writer.write(numberToString((Number) value)); } else if (value instanceof Boolean) { writer.write(value.toString()); - } else if (value instanceof JSONString) { - Object o; - try { - o = ((JSONString) value).toJSONString(); - } catch (Exception e) { - throw new JSONException(e); - } - writer.write(o != null ? o.toString() : quote(value.toString())); } else { quote(value.toString(), writer); } diff --git a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/JSONString.java b/src/main/java/org/to2mbn/authlibinjector/internal/org/json/JSONString.java deleted file mode 100644 index aaa29a9..0000000 --- a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/JSONString.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.to2mbn.authlibinjector.internal.org.json; - -/** - * 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(); -}