FELIX-2247: Gogo badly prints empty maps and dictionaries
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@930259 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/CommandSessionImpl.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/CommandSessionImpl.java
index 54878cd..4c478ce 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/CommandSessionImpl.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/CommandSessionImpl.java
@@ -225,13 +225,15 @@
if (level == Converter.LINE)
{
StringBuilder sb = new StringBuilder();
- String del = "[";
Collection<?> c = (Collection<?>) target;
+ sb.append("[");
for (Object o : c)
{
- sb.append(del);
+ if (sb.length() > 1)
+ {
+ sb.append(", ");
+ }
sb.append(format(o, level + 1, this));
- del = ", ";
}
sb.append("]");
return sb;
@@ -272,13 +274,15 @@
if (level == Converter.LINE)
{
StringBuilder sb = new StringBuilder();
- String del = "[";
Map<?, ?> c = (Map<?, ?>) target;
+ sb.append("[");
for (Map.Entry<?, ?> entry : c.entrySet())
{
- sb.append(del);
+ if (sb.length() > 1)
+ {
+ sb.append(", ");
+ }
sb.append(format(entry, level + 1, this));
- del = ", ";
}
sb.append("]");
return sb;