AfflictionNetworks/samskivert
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Added missing handling for char[] in toString.

Browse Source 
- Fixed wacky use of short index variable in toString's short[] handling.
- Ensured that custom separator and whether or not we're traversing collections
is properly passed to recursive calls.
This commit is contained in:
Michael Bayne
2011-06-01 12:15:28 -07:00
parent 9344b51c4c
commit 8c9c2a42b0
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/samskivert/util/StringUtil.java
+15 -4
View File
@@ -1273,7 +1273,18 @@ public class StringUtil
} else if (val instanceof short[]) { } else if (val instanceof short[]) {
buf.append(openBox); buf.append(openBox);
short[] v = (short[])val; short[] v = (short[])val;
for (short i = 0; i < v.length; i++) { for (int i = 0; i < v.length; i++) {
if (i > 0) {
buf.append(sep);
}
buf.append(v[i]);
}
buf.append(closeBox);
} else if (val instanceof char[]) {
buf.append(openBox);
char[] v = (char[])val;
for (int i = 0; i < v.length; i++) {
if (i > 0) { if (i > 0) {
buf.append(sep); buf.append(sep);
} }
@@ -1332,7 +1343,7 @@ public class StringUtil
if (i > 0) { if (i > 0) {
buf.append(sep); buf.append(sep);
} }
toString(buf, v[i], openBox, closeBox); toString(buf, v[i], openBox, closeBox, sep, traverseCollections);
} }
buf.append(closeBox); buf.append(closeBox);
@@ -1377,7 +1388,7 @@ public class StringUtil
if (i > 0) { if (i > 0) {
buf.append(sep); buf.append(sep);
} }
toString(buf, iter.next(), openBox, closeBox); toString(buf, iter.next(), openBox, closeBox, sep, true);
} }
buf.append(closeBox); buf.append(closeBox);
@@ -1388,7 +1399,7 @@ public class StringUtil
if (i > 0) { if (i > 0) {
buf.append(sep); buf.append(sep);
} }
toString(buf, enm.nextElement(), openBox, closeBox); toString(buf, enm.nextElement(), openBox, closeBox, sep, true);
} }
buf.append(closeBox); buf.append(closeBox);