Revize 56837af0

re#7868 HTML formatting implemented.
The Converter.convert returnes Pair<String, String> value.
The first is json, second html - for further work.

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)
     {
-        StringBuffer sb = new StringBuffer();
-        String val = "";
-        
-        sb.append("{" + formatting.get("lineBreak"));
-        
-        indentation += formatting.get("indent");
-
-        // ClassName
-        sb.append(indentation).append("class ").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
-        
-        indentation += formatting.get("indent");
-
-        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
-            var locVal = this.fielddata.get(classdesc).get(f);
-
-            if(locVal instanceof content)
-            {
-                val = ((content)locVal).toJson(indentation, this.fielddata, formatting);
-            }
-            else {
-                val = locVal.toString();
-            }
-
-            sb.append(formatting.get("lineBreak")).append(indentation);
-            sb.append("\"").append(f.name).append("\"");
-            sb.append(" : ");
-            sb.append(val);
-
-            if (!f.equals(classdesc.fields[classdesc.fields.length - 1])) {
-                sb.append(", ");
-            }
-        }
-        indentation = indentation.substring(0, indentation.length() - 1);
-
-        sb.append(formatting.get("lineBreak")).append(indentation).append("}");
-
-        if(classdesc.superclass != null)
-        {
-            indentation = indentation.substring(0, indentation.length() - 1);
-            sb.append(formatting.get("lineBreak") + "}");
-            sb.append(",").append(formatting.get("lineBreak"));
-            sb.append(classdesc.superclass.toJson(indentation, this.fielddata, formatting));
-        }
-        else 
-        {
-            indentation = indentation.substring(0, indentation.length() - 1);
-            sb.append(formatting.get("lineBreak")).append(indentation).append("}");
-        }
-
-        return sb.toString();
+        return this.classdesc.toJson(indentation, this.fielddata, formatting);
     }
 
     public String toString() {