Revize 02390102

#re#7868 Test - JSON format observed.

project/Deserializer/src/Converter.java

@@ -4 +4 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintStream;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import jdeserialize.content;
 import jdeserialize.jdeserialize;
 
 public class Converter extends Thread {
-	
 	private Deserializer main;
 	
 	private File input;
 	private File output;
+
+	//Key as enum?
+	private HashMap<String, String> html = new HashMap<String, String>();
+	private HashMap<String, String> json = new HashMap<String, String>();
 	
 	public Converter(Deserializer main, File inputFilename, File outputFilename) {
 		this.main = main;
 		this.input = inputFilename;
 		this.output = outputFilename;
+		
+		fillInTestingDictionaries();
+	}
+
+	private void fillInTestingDictionaries()
+	{
+		html.put("indent", "");
+		html.put("lineBreak", "");
+		html.put("classCol", "");
+		html.put("fieldCol", "");
+		html.put("valCol", "");
+		html.put("keywordCol", "");
+
+		json.put("indent", "\t");
+		json.put("lineBreak", "\n");
+		json.put("classCol", "");
+		json.put("fieldCol", "");
+		json.put("valCol", "");
+		json.put("keywordCol", "");
 	}
 	
 	@Override
@@ -72 +96 @@
 					//replace VS parametr
 					//Pustit 2X s parametrem nenabori vnitrni data (kde muzou byt html znacky)
 					//Ciste HTML / Cisty JSON
-					json += cnt.toJson("", null);
+					json += cnt.toJson("", null, this.json);
 				}
 			}
 

project/Deserializer/src/jdeserialize/arrayobj.java

@@ -32 +32 @@
         this.data = data;
     }
 
-    public @Override String toJson(String indentation, Map<classdesc, Map<field, Object>> fielddata) {
+    public @Override String toJson(String indentation, Map<classdesc, Map<field, Object>> fielddata, Map<String, String> formatting) {
         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));
+                    sb.append(((content) el).toJson(indentation, fielddata, formatting));
                 }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)
+    public @Override String toJson(String indentation, Map<classdesc, Map<field, Object>> fielddata, Map<String, String> formatting)
     {
         StringBuffer sb = new StringBuffer();
         String val = "";
 
-        sb.append(indentation).append("{\n");
+        sb.append(indentation).append("{" + formatting.get("lineBreak"));
 
-        indentation += "\t";
+        indentation += formatting.get("indent");
 
         // ClassName
         sb.append(indentation).append("class ").append(this.name);
@@ -248 +248 @@
         }
         sb.append(" : {"); // ending of first line
         
-        indentation += "\t";
+        indentation += formatting.get("indent");
 
         for (field f : this.fields) {
             // v this.fielddata najit element, jehoz key == classdesc
@@ -258 +258 @@
 
             if(locVal instanceof content)
             {
-                val = ((content)locVal).toJson(indentation, fielddata);
+                val = ((content)locVal).toJson(indentation, fielddata, formatting);
             }
             else {
                 val = locVal.toString();
             }
 
-            sb.append("\n").append(indentation);
+            sb.append(formatting.get("lineBreak")).append(indentation);
             sb.append("\"").append(f.name).append("\"");
             sb.append(" : ");
             sb.append(val);
@@ -275 +275 @@
         }
         indentation = indentation.substring(0, indentation.length() - 1);
 
-        sb.append("\n").append(indentation).append("}");
+        sb.append(formatting.get("lineBreak")).append(indentation).append("}");
 
         if(this.superclass != null)
         {
             indentation = indentation.substring(0, indentation.length() - 1);
-            sb.append("\n}");
-            sb.append(",\n");
-            sb.append(this.superclass.toJson(indentation, fielddata));
+            sb.append(formatting.get("lineBreak")).append("}");
+            sb.append("," + formatting.get("lineBreak"));
+            sb.append(this.superclass.toJson(indentation, fielddata, formatting));
         }
         else 
         {
             indentation = indentation.substring(0, indentation.length() - 1);
-            sb.append("\n").append(indentation).append("}");
+            sb.append(formatting.get("lineBreak")).append(indentation).append("}");
         }
 
         return sb.toString();

project/Deserializer/src/jdeserialize/content.java

@@ -1 +1 @@
 package jdeserialize;
 
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -68 +69 @@
      */
     public void setIsExceptionObject(boolean value);
 
-    public String toJson(String indentation, Map<classdesc, Map<field, Object>> fielddata);
+    public String toJson(String indentation, Map<classdesc, Map<field, Object>> fielddata, Map<String, String> formatting);
 }
 

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)
+    public @Override String toJson(String indetation, Map<classdesc, Map<field, Object>> fielddata, Map<String, String> formatting)
     {
         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) {
+    public @Override String toJson(String indetation, Map<classdesc, Map<field, Object>> fielddata, Map<String, String> formatting) {
         return this.value.value;
     }
 

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)
+    public @Override String toJson(String indentation, Map<classdesc, Map<field, Object>> fielddata, Map<String, String> formatting)
     {
         StringBuffer sb = new StringBuffer();
         String val = "";
         
-        sb.append("{\n");
+        sb.append("{" + formatting.get("lineBreak"));
         
-        indentation += "\t";
+        indentation += formatting.get("indent");
 
         // ClassName
         sb.append(indentation).append("class ").append(classdesc.name);
@@ -50 +50 @@
         }
         sb.append(" : {"); // ending of first line
         
-        indentation += "\t";
+        indentation += formatting.get("indent");
 
         for (field f : classdesc.fields) {
             // v this.fielddata najit element, jehoz key == classdesc
@@ -60 +60 @@
 
             if(locVal instanceof content)
             {
-                val = ((content)locVal).toJson(indentation, this.fielddata);
+                val = ((content)locVal).toJson(indentation, this.fielddata, formatting);
             }
             else {
                 val = locVal.toString();
             }
 
-            sb.append("\n").append(indentation);
+            sb.append(formatting.get("lineBreak")).append(indentation);
             sb.append("\"").append(f.name).append("\"");
             sb.append(" : ");
             sb.append(val);
@@ -77 +77 @@
         }
         indentation = indentation.substring(0, indentation.length() - 1);
 
-        sb.append("\n").append(indentation).append("}");
+        sb.append(formatting.get("lineBreak")).append(indentation).append("}");
 
         if(classdesc.superclass != null)
         {
             indentation = indentation.substring(0, indentation.length() - 1);
-            sb.append("\n}");
-            sb.append(",\n");
-            sb.append(classdesc.superclass.toJson(indentation, this.fielddata));
+            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("\n").append(indentation).append("}");
+            sb.append(formatting.get("lineBreak")).append(indentation).append("}");
         }
 
         return sb.toString();

project/Deserializer/src/jdeserialize/stringobj.java

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