Revize a0511590

#re#7831 Indetation problems. toString left, new toJson method
Not working yet

project/Deserializer/src/jdeserialize/instance.java

@@ -26 +26 @@
         this.fielddata = new HashMap<classdesc, Map<field, Object>>();
     }
 
-    public String toString() {
+    public @Override String toJson(String indentation)
+    {
         StringBuffer sb = new StringBuffer();
+        String val = "";
+
+        /*if (classdesc.getType() == contenttype.CLASSDESC && !instance.indentedClasses.contains(classdesc.name)) {*/
+            indentation += "\t";
+           /* instance.indentedClasses.add(classdesc.name);
+        }*/
 
         // ClassName
-        sb.append("{\n\tclass ").append(classdesc.name);
+        sb.append("{\n").append(indentation).append("class ").append(classdesc.name);
         // extends
         if (classdesc.superclass != null) {
             sb.append(" extends ").append(classdesc.superclass.name);
@@ -48 +55 @@
             // v this.fielddata najit element, jehoz key == classdesc
             // v tomto prvku fielddata najdu value (element) podle key == f
             // jeho value je chtena hodnota
-            var val = this.fielddata.get(classdesc).get(f).toString();
-            sb.append("\n\t\t");
-            // Datový typ není potřeba - json jej nepoužívá!
-            sb.append("\"")./* append(f.type.getJavaType()).append(" "). */append(f.name).append("\"");
+            
+            var locVal = this.fielddata.get(classdesc).get(f);
+
+            if(locVal instanceof content)
+            {
+                val = ((content)locVal).toJson(indentation);
+            }
+            else {
+                val = locVal.toString();
+            }
+
+            sb.append("\n\t").append(indentation);
+            sb.append("\"").append(f.name).append("\"");
             sb.append(" : ");
             sb.append(val);
 
@@ -60 +76 @@
             }
         }
 
-        sb.append("\n\t}\n}");
+        sb.append("\n").append(indentation).append("}\n}");
 
+        /*if (classdesc.getType() == contenttype.CLASSDESC && instance.indentedClasses.contains(classdesc.name)) {*/
+            indentation.replaceFirst("\t", "");
+            /*instance.indentedClasses.remove(classdesc.name);
+        }*/
+
+        return sb.toString();
+    }
+
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append(classdesc.name).append(' ').append("_h").append(jdeserialize.hex(handle))
+            .append(" = r_").append(jdeserialize.hex(classdesc.handle)).append(";  ");
+        //sb.append("// [instance " + jdeserialize.hex(handle) + ": " + jdeserialize.hex(classdesc.handle) + "/" + classdesc.name).append("]");
         return sb.toString();
     }