Revize a6f38344

re #7891 Indentation OK
Switched field name and value issue still remains

project/Deserializer/src/Converter.java

@@ -157 +157 @@
 			{
 				//Parametrizovany toJson pomoci dictionary
 				//Ciste HTML / Cisty JSON
-				json.append(cnt.toJson("", null, this.jsonFormatting));
-				html.append(cnt.toJson("", null, this.htmlFormatting));
+				json.append(cnt.toJson("", null, this.jsonFormatting, false));
+				html.append(cnt.toJson("", null, this.htmlFormatting, false));
 			}
 		}
 	}

project/Deserializer/src/jdeserialize/arrayobj.java

@@ -32 +32 @@
         this.data = data;
     }
 
-    public @Override String toJson(String indentation, Map<classdesc, Map<field, Object>> fielddata, Map<String, String> formatting) {
+    public @Override String toJson(String indentation, Map<classdesc, Map<field, Object>> fielddata, Map<String, String> formatting, boolean child) {
         StringBuilder sb = new StringBuilder();
         sb.append("[ ");
 
         for (Object el : this.data) {
             if (el != null) {
                 if (el instanceof content) {
-                    sb.append(((content) el).toJson(indentation, fielddata, formatting));
+                    sb.append(((content) el).toJson(indentation, fielddata, formatting, child));
                 }else{
                     sb.append(el.toString());
                 }

project/Deserializer/src/jdeserialize/classdesc.java

@@ -224 +224 @@
         }
     }
 
-    public @Override String toJson(String indentation, Map<classdesc, Map<field, Object>> fielddata, Map<String, String> formatting)
+    public @Override String toJson(String indentation, Map<classdesc, Map<field, Object>> fielddata, Map<String, String> formatting, boolean child)
     {
         StringBuffer sb = new StringBuffer();
         String val = "";
 
-        sb.append(indentation).append("{" + formatting.get("lineBreak"));
+        if(!child)
+        {
+            sb.append(indentation);
+        }
+        sb.append("{" + formatting.get("lineBreak"));
 
         indentation += formatting.get("indent");
 
@@ -264 +268 @@
 
             if(locVal instanceof content)
             {
-                val = ((content)locVal).toJson(indentation, fielddata, formatting);
+                val = ((content)locVal).toJson(indentation, fielddata, formatting, true);
             }
             else {
                 val = locVal.toString();
@@ -288 +292 @@
             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));
+            sb.append(this.superclass.toJson(indentation, fielddata, formatting, child));
         }
         else 
         {

project/Deserializer/src/jdeserialize/content.java

@@ -69 +69 @@
      */
     public void setIsExceptionObject(boolean value);
 
-    public String toJson(String indentation, Map<classdesc, Map<field, Object>> fielddata, Map<String, String> formatting);
+    public String toJson(String indentation, Map<classdesc, Map<field, Object>> fielddata, Map<String, String> formatting, boolean child);
 }
 

project/Deserializer/src/jdeserialize/contentbase.java

@@ -27 +27 @@
     public void validate() throws ValidityException {
     }
 
-    public @Override String toJson(String indetation, Map<classdesc, Map<field, Object>> fielddata, Map<String, String> formatting)
+    public @Override String toJson(String indetation, Map<classdesc, Map<field, Object>> fielddata, Map<String, String> formatting, boolean child)
     {
         return this.toString();
     }

project/Deserializer/src/jdeserialize/enumobj.java

@@ -34 +34 @@
         this.classdesc = cd;
         this.value = so;
     }
-    public @Override String toJson(String indetation, Map<classdesc, Map<field, Object>> fielddata, Map<String, String> formatting) {
+    public @Override String toJson(String indetation, Map<classdesc, Map<field, Object>> fielddata, Map<String, String> formatting, boolean child) {
         return this.value.value;
     }
 

project/Deserializer/src/jdeserialize/instance.java

@@ -27 +27 @@
     }
 
     
-    public @Override String toJson(String indentation, Map<classdesc, Map<field, Object>> fielddata, Map<String, String> formatting)
+    public @Override String toJson(String indentation, Map<classdesc, Map<field, Object>> fielddata, Map<String, String> formatting, boolean child)
     {
-        return this.classdesc.toJson(indentation, this.fielddata, formatting);
+        return this.classdesc.toJson(indentation, this.fielddata, formatting, child);
     }
     
     public String toString() {

project/Deserializer/src/jdeserialize/stringobj.java

@@ -18 +18 @@
         return x;
     }
 
-    public @Override String toJson(String indetation, Map<classdesc, Map<field, Object>> fielddata, Map<String, String> formatting)
+    public @Override String toJson(String indetation, Map<classdesc, Map<field, Object>> fielddata, Map<String, String> formatting, boolean child)
     {
         return "\"" + this.value + "\"";
     }