Revize e8ba39e7

re #7879

Converter.java a instance.java changed

project/Deserializer/src/jdeserialize/instance.java

@@ -26 +26 @@
         this.fielddata = new HashMap<classdesc, Map<field, Object>>();
     }
 
+    
+    public @Override String toJson(String indentation, Map<classdesc, Map<field, Object>> fielddata, Map<String, String> formatting)
+    {
+        return this.classdesc.toJson(indentation, this.fielddata, formatting);
+    }
+    
     public String toString() {
         StringBuffer sb = new StringBuffer();
-
-        // ClassName
-        sb.append("{\n\tclass ").append(classdesc.name);
-        // extends
-        if (classdesc.superclass != null) {
-            sb.append(" extends ").append(classdesc.superclass.name);
-        }
-        // implements
-        if (classdesc.interfaces != null) {
-            sb.append(" implements ");
-            for (String str : classdesc.interfaces) {
-                sb.append(str);
-            }
-        }
-        sb.append(" : {"); // ending of first line
-
-        for (field f : classdesc.fields) {
-            // v this.fielddata najit element, jehoz key == classdesc
-            // v tomto prvku fielddata najdu value (element) podle key == f
-            // jeho value je chtena hodnota
-            String 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("\"");
-            sb.append(" : ");
-            sb.append(val);
-
-            if (!f.equals(classdesc.fields[classdesc.fields.length - 1])) {
-                sb.append(", ");
-            }
-        }
-
-        sb.append("\n\t}\n}");
-
+        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();
     }