Revize d6ee4876

re #7879

Converter.java a instance.java changed

project/Deserializer/src/jdeserialize/arrayobj.java

@@ -1 +1 @@
 package jdeserialize;
 
 /**
- * <p>Represents an array instance, including the values the comprise the array.  </p>
+ * <p>
+ * Represents an array instance, including the values the comprise the array.
+ * </p>
  *
- * <p>Note that in arrays of primitives, the classdesc will be named "[x", where x is the
- * field type code representing the primitive type.  See jdeserialize.resolveJavaType()
- * for an example of analysis/generation of human-readable names from these class names.</p>
+ * <p>
+ * Note that in arrays of primitives, the classdesc will be named "[x", where x
+ * is the field type code representing the primitive type. See
+ * jdeserialize.resolveJavaType() for an example of analysis/generation of
+ * human-readable names from these class names.
+ * </p>
  */
 public class arrayobj extends contentbase {
     /**
@@ -24 +29 @@
         this.classdesc = cd;
         this.data = data;
     }
-    public String toString() {
+
+    public @Override String toJson(String indentation) {
         StringBuilder sb = new StringBuilder();
         sb.append("[ ");
-        for(Object el : this.data)
-        {
-            sb.append(el.toString());
-            if(!el.equals(this.data.get(this.data.size()-1)))
-            {
-                sb.append(", ");
+
+        for (Object el : this.data) {
+            if (el != null && el instanceof content) {
+                sb.append(((content)el).toJson(indentation));
+                // el null!
+                if (!el.equals(this.data.get(this.data.size() - 1))) {
+                    sb.append(", ");
+                }
             }
         }
         sb.append(" ]");
         return sb.toString();
     }
-}
 
+    public String toString() {
+        return "[array " + jdeserialize.hex(handle) + " classdesc " + classdesc.toString() + ": " + data.toString()
+                + "]";
+    }
+}