partially revert changes

Author: strkkk

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();

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) {

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 + ">";
 
     }