Revize 07cf72bd

re #7891 formatting dictionaries removed

project/Deserializer/src/jdeserialize/classdesc.java

@@ -224 +224 @@
         }
     }
 
-    public @Override String toJson(String indentation, Map<classdesc, Map<field, Object>> fielddata, Map<String, String> formatting, boolean child)
+    public @Override String toJson(String indentation, Map<classdesc, Map<field, Object>> fielddata, boolean child)
     {
         StringBuffer sb = new StringBuffer();
         String val = "";
@@ -233 +233 @@
         {
             sb.append(indentation);
         }
-        sb.append("{" + formatting.get("lineBreak"));
+        sb.append("{\n");
 
-        indentation += formatting.get("indent");
+        indentation += "\t";
 
         // ClassName
-        sb.append(indentation).append(formatting.get("keywordCol")).append("class ").append(formatting.get("closeTagCol"));
-        sb.append(formatting.get("classCol")).append(this.name).append(formatting.get("closeTagCol"));
+        sb.append(indentation).append("class ");
+        sb.append(this.name);
         // extends
         if (this.superclass != null) {
-            sb.append(formatting.get("keywordCol")).append(" extends ").append(formatting.get("closeTagCol"));
-            sb.append(formatting.get("classCol")).append(this.superclass.name).append(formatting.get("closeTagCol"));
+            sb.append(" extends ");
+            sb.append(this.superclass.name);
         }
         // implements
         if (this.interfaces != null) {
-            sb.append(formatting.get("keywordCol")).append(" implements ").append(formatting.get("closeTagCol"));
+            sb.append(" implements ");
             for (String str : this.interfaces) {
-                sb.append(formatting.get("classCol")).append(str).append(formatting.get("closeTagCol"));
+                sb.append(str);
+                if(this.interfaces[this.interfaces.length-1] != str)
+                {
+                    sb.append(", ");
+                }
             }
         }
         sb.append(" : {"); // ending of first line
         
-        indentation += formatting.get("indent");
+        indentation += "\t";
 
         for (field f : this.fields) {
             // v this.fielddata najit element, jehoz key == classdesc
@@ -268 +272 @@
 
             if(locVal instanceof content)
             {
-                val = ((content)locVal).toJson(indentation, fielddata, formatting, true);
+                val = ((content)locVal).toJson(indentation, fielddata, true);
             }
             else {
                 val = locVal.toString();
             }
 
-            String locStringTest = formatting.get("lineBreak") + indentation +
-                formatting.get("fieldCol") + "\"" + f.name + "\"" + formatting.get("closeTagCol") +
-                " : " + val;
+            String locStringTest = "\n" + indentation + "\"" + f.name + "\"" + " : " + val;
             sb.append(locStringTest);
             /*sb.append(formatting.get("lineBreak")).append(indentation);
             sb.append(formatting.get("fieldCol")).append("\"").append(f.name).append("\"").append(formatting.get("closeTagCol"));
@@ -287 +289 @@
                 sb.append(", ");
             }
         }
-        indentation = indentation.replaceFirst(formatting.get("indent"), "");
+        indentation = indentation.replaceFirst("\t", "");
 
-        sb.append(formatting.get("lineBreak")).append(indentation).append("}");
+        sb.append("\n").append(indentation).append("}");
 
         if(this.superclass != null)
         {
-            indentation = indentation.replaceFirst(formatting.get("indent"), "");
-            sb.append(formatting.get("lineBreak")).append("}");
-            sb.append("," + formatting.get("lineBreak"));
-            sb.append(this.superclass.toJson(indentation, fielddata, formatting, child));
+            indentation = indentation.replaceFirst("\t", "");
+            sb.append("\n").append("}");
+            sb.append("," + "\n");
+            sb.append(this.superclass.toJson(indentation, fielddata, child));
         }
         else 
         {
-            indentation = indentation.replaceFirst(formatting.get("indent"), "");
-            sb.append(formatting.get("lineBreak")).append(indentation).append("}");
+            indentation = indentation.replaceFirst("\t", "");
+            sb.append("\n").append(indentation).append("}");
         }
 
         return sb.toString();