erik/JSON-java
erik/JSON-java
1
0
Fork 0
mirror of https://github.com/ethauvin/JSON-java.git synced 2025-06-17 07:50:52 -07:00
Code Releases Activity

Changes JSONArray for loops to use the new iterators.

Browse source
This commit is contained in:
John J. Aylward 2015-10-26 18:30:41 -04:00
parent 91c6f09be8
commit 7886c96204
1 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
XML.java
View file

@ -379,14 +379,13 @@ public class XML {
public static String toString(Object object, String tagName) public static String toString(Object object, String tagName)
throws JSONException { throws JSONException {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
int i;
JSONArray ja; JSONArray ja;
JSONObject jo; JSONObject jo;
String key; String key;
Iterator<String> keys; Iterator<String> keys;
int length;
String string; String string;
Object value; Object value;
if (object instanceof JSONObject) { if (object instanceof JSONObject) {
// Emit <tagName> // Emit <tagName>
@ -417,12 +416,13 @@ public class XML {
if ("content".equals(key)) { if ("content".equals(key)) {
if (value instanceof JSONArray) { if (value instanceof JSONArray) {
ja = (JSONArray)value; ja = (JSONArray)value;
length = ja.length(); int i = 0;
for (i = 0; i < length; i += 1) { for (Object val : ja) {
if (i > 0) { if (i > 0) {
sb.append('\n'); sb.append('\n');
} }
sb.append(escape(ja.get(i).toString())); sb.append(escape(val.toString()));
i++;
} }
} else { } else {
sb.append(escape(value.toString())); sb.append(escape(value.toString()));
@ -432,19 +432,17 @@ public class XML {
} else if (value instanceof JSONArray) { } else if (value instanceof JSONArray) {
ja = (JSONArray)value; ja = (JSONArray)value;
length = ja.length(); for (Object val : ja) {
for (i = 0; i < length; i += 1) { if (val instanceof JSONArray) {
value = ja.get(i);
if (value instanceof JSONArray) {
sb.append('<'); sb.append('<');
sb.append(key); sb.append(key);
sb.append('>'); sb.append('>');
sb.append(toString(value)); sb.append(toString(val));
sb.append("</"); sb.append("</");
sb.append(key); sb.append(key);
sb.append('>'); sb.append('>');
} else { } else {
sb.append(toString(value, key)); sb.append(toString(val, key));
} }
} }
} else if ("".equals(value)) { } else if ("".equals(value)) {
@ -479,9 +477,8 @@ public class XML {
if (object instanceof JSONArray) { if (object instanceof JSONArray) {
ja = (JSONArray)object; ja = (JSONArray)object;
length = ja.length(); for (Object val : ja) {
for (i = 0; i < length; i += 1) { sb.append(toString(val, tagName == null ? "array" : tagName));
sb.append(toString(ja.opt(i), tagName == null ? "array" : tagName));
} }
return sb.toString(); return sb.toString();
} }