partially revert changes

strkkk · strkkk · commit 7cad4c3b262f · 2018-05-25T22:17:03.000+03:00
diff --git a/CDL.java b/CDL.java
@@ -224,7 +224,7 @@ public static JSONArray toJSONArray(JSONArray names, String string)
      */
     public static JSONArray toJSONArray(JSONArray names, JSONTokener x)
             throws JSONException {
-        if (names == null || names.isEmpty()) {
+        if (names == null || names.length() == 0) {
             return null;
         }
         JSONArray ja = new JSONArray();
@@ -235,7 +235,7 @@ public static JSONArray toJSONArray(JSONArray names, JSONTokener x)
             }
             ja.put(jo);
         }
-        if (ja.isEmpty()) {
+        if (ja.length() == 0) {
             return null;
         }
         return ja;
@@ -272,7 +272,7 @@ public static String toString(JSONArray ja) throws JSONException {
      */
     public static String toString(JSONArray names, JSONArray ja)
             throws JSONException {
-        if (names == null || names.isEmpty()) {
+        if (names == null || names.length() == 0) {
             return null;
         }
         StringBuffer sb = new StringBuffer();
diff --git a/JSONML.java b/JSONML.java
@@ -178,7 +178,7 @@ private static Object parse(
                             newjo.accumulate(attribute, "");
                         }
                     }
-                    if (arrayForm && !newjo.isEmpty()) {
+                    if (arrayForm && newjo.length() > 0) {
                         newja.put(newjo);
                     }
 
@@ -208,7 +208,7 @@ private static Object parse(
                                         "' and '" + closeTag + "'");
                             }
                             tagName = null;
-                            if (!arrayForm && !newja.isEmpty()) {
+                            if (!arrayForm && newja.length() > 0) {
                                 newjo.put("childNodes", newja);
                             }
                             if (ja == null) {
diff --git a/XML.java b/XML.java
@@ -277,7 +277,7 @@ private static boolean parse(XMLTokener x, JSONObject context, String name, bool
                 if ("CDATA".equals(token)) {
                     if (x.next() == '[') {
                         string = x.nextCDATA();
-                        if (!string.isEmpty()) {
+                        if (string.length() > 0) {
                             context.accumulate("content", string);
                         }
                         return false;
@@ -353,7 +353,7 @@ private static boolean parse(XMLTokener x, JSONObject context, String name, bool
                     if (x.nextToken() != GT) {
                         throw x.syntaxError("Misshaped tag");
                     }
-                    if (!jsonobject.isEmpty()) {
+                    if (jsonobject.length() > 0) {
                         context.accumulate(tagName, jsonobject);
                     } else {
                         context.accumulate(tagName, "");
@@ -371,15 +371,15 @@ private static boolean parse(XMLTokener x, JSONObject context, String name, bool
                             return false;
                         } else if (token instanceof String) {
                             string = (String) token;
-                            if (!string.isEmpty()) {
+                            if (string.length() > 0) {
                                 jsonobject.accumulate("content",
                                         keepStrings ? string : stringToValue(string));
                             }
 
                         } else if (token == LT) {
                             // Nested element
                             if (parse(x, jsonobject, tagName,keepStrings)) {
-                                if (jsonobject.isEmpty()) {
+                                if (jsonobject.length() == 0) {
                                     context.accumulate(tagName, "");
                                 } else if (jsonobject.length() == 1
                                         && jsonobject.opt("content") != null) {
@@ -676,7 +676,7 @@ public static String toString(final Object object, final String tagName)
 
         string = (object == null) ? "null" : escape(object.toString());
         return (tagName == null) ? "\"" + string + "\""
-                : (string.isEmpty()) ? "<" + tagName + "/>" : "<" + tagName
+                : (string.length() == 0) ? "<" + tagName + "/>" : "<" + tagName
                         + ">" + string + "</" + tagName + ">";
 
     }

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ public static JSONArray toJSONArray(JSONArray names, String string)`
`224`	`224`	`*/`
`225`	`225`	`public static JSONArray toJSONArray(JSONArray names, JSONTokener x)`
`226`	`226`	`throws JSONException {`
`227`		`- if (names == null \|\| names.isEmpty()) {`
	`227`	`+ if (names == null \|\| names.length() == 0) {`
`228`	`228`	`return null;`
`229`	`229`	`}`
`230`	`230`	`JSONArray ja = new JSONArray();`
`@@ -235,7 +235,7 @@ public static JSONArray toJSONArray(JSONArray names, JSONTokener x)`
`235`	`235`	`}`
`236`	`236`	`ja.put(jo);`
`237`	`237`	`}`
`238`		`- if (ja.isEmpty()) {`
	`238`	`+ if (ja.length() == 0) {`
`239`	`239`	`return null;`
`240`	`240`	`}`
`241`	`241`	`return ja;`
`@@ -272,7 +272,7 @@ public static String toString(JSONArray ja) throws JSONException {`
`272`	`272`	`*/`
`273`	`273`	`public static String toString(JSONArray names, JSONArray ja)`
`274`	`274`	`throws JSONException {`
`275`		`- if (names == null \|\| names.isEmpty()) {`
	`275`	`+ if (names == null \|\| names.length() == 0) {`
`276`	`276`	`return null;`
`277`	`277`	`}`
`278`	`278`	`StringBuffer sb = new StringBuffer();`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ private static Object parse(`
`178`	`178`	`newjo.accumulate(attribute, "");`
`179`	`179`	`}`
`180`	`180`	`}`
`181`		`- if (arrayForm && !newjo.isEmpty()) {`
	`181`	`+ if (arrayForm && newjo.length() > 0) {`
`182`	`182`	`newja.put(newjo);`
`183`	`183`	`}`
`184`	`184`
`@@ -208,7 +208,7 @@ private static Object parse(`
`208`	`208`	`"' and '" + closeTag + "'");`
`209`	`209`	`}`
`210`	`210`	`tagName = null;`
`211`		`- if (!arrayForm && !newja.isEmpty()) {`
	`211`	`+ if (!arrayForm && newja.length() > 0) {`
`212`	`212`	`newjo.put("childNodes", newja);`
`213`	`213`	`}`
`214`	`214`	`if (ja == null) {`