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/bcha.json

@@ -3 +3 @@
 		"testDouble" : 1.0, 
 		"testInt" : 123, 
 		"intArray" : [ 5, 10, 15 ], 
-		"locInnerClassInstance" : {
+		"locInnerClassInstance" : 		{
 			class samples.ok.Inner : {
 				"vnitrni" : "INNER STRING AM I"
 			}

project/Deserializer/src/Converter.java

@@ -8 +8 @@
 import java.util.List;
 import java.util.Map;
 
+import javafx.util.Pair;
 import jdeserialize.content;
 import jdeserialize.jdeserialize;
 
@@ -18 +19 @@
 	private File output;
 
 	//Key as enum?
-	private HashMap<String, String> html = new HashMap<String, String>();
-	private HashMap<String, String> json = new HashMap<String, String>();
+	private HashMap<String, String> htmlFormatting = new HashMap<String, String>();
+	private HashMap<String, String> jsonFormatting = new HashMap<String, String>();
 	
 	public Converter(Deserializer main, File inputFilename, File outputFilename) {
 		this.main = main;
@@ -31 +32 @@
 
 	private void fillInTestingDictionaries()
 	{
-		html.put("indent", "");
-		html.put("lineBreak", "");
-		html.put("classCol", "");
-		html.put("fieldCol", "");
-		html.put("valCol", "");
-		html.put("keywordCol", "");
+		htmlFormatting.put("indent", "<span style=\"margin-left:2em\">");
+		htmlFormatting.put("lineBreak", "<br/>");
+		htmlFormatting.put("classCol", "<span style=\"color:blue;font-weight:bold\">");
+		htmlFormatting.put("fieldCol", "<span style=\"color:purple\">");
+		htmlFormatting.put("valCol", "<span style=\"color:orange\">");
+		htmlFormatting.put("keywordCol", "<span style=\"color:green\">");
+		htmlFormatting.put("closeTagCol", "</span>");
 
-		json.put("indent", "\t");
-		json.put("lineBreak", "\n");
-		json.put("classCol", "");
-		json.put("fieldCol", "");
-		json.put("valCol", "");
-		json.put("keywordCol", "");
+		jsonFormatting.put("indent", "\t");
+		jsonFormatting.put("lineBreak", "\n");
+		jsonFormatting.put("classCol", "");
+		jsonFormatting.put("fieldCol", "");
+		jsonFormatting.put("valCol", "");
+		jsonFormatting.put("keywordCol", "");
+		jsonFormatting.put("closeTagCol", "");
 	}
 	
 	@Override
@@ -51 +54 @@
 		super.run();
 		
 		try {
-			String json = convert(FileWorker.loadByteArray(input));
+			//The Pair is not the best way
+			Pair<String, String> returned = convert(FileWorker.loadByteArray(input));
 			
+			String json = returned.getKey();
+			String html = returned.getValue();
+
 			String title = "Uložení JSON";
 			if (FileWorker.saveJson(output, json)) {
 				System.out.println("The JSON file was saved correctly.");
@@ -70 +77 @@
 		main.convertIsComplete();
 	}
 	
-	private String convert(byte[] buffer) {
+	private Pair<String, String> convert(byte[] buffer) {
 		String json = "";
+		String html = "";
+
 		try {
 			System.out.println("Deserialization begins.");
 
@@ -85 +94 @@
             // 'writes' into serialized object via objectOutputStream
             List<content> cntnts = deserializer.getContent();
 
-            // testing with only first of the contents
-			//ObjectWriter ow = new ObjectMapper().writer().withDefaultPrettyPrinter();
-			
 			for(content cnt : cntnts)
 			{
 				if(cnt != null)
 				{
 					//Parametrizovany toJson pomoci dictionary
-					//replace VS parametr
-					//Pustit 2X s parametrem nenabori vnitrni data (kde muzou byt html znacky)
 					//Ciste HTML / Cisty JSON
-					json += cnt.toJson("", null, this.json);
+					json += cnt.toJson("", null, this.jsonFormatting);
+					html += cnt.toJson("", null, this.htmlFormatting);
 				}
 			}
 
@@ -104 +109 @@
 			
 			//just for tests
 			System.out.println(json);
+			System.out.println("*********************\n");
+			System.out.println(html);
 			
-			return json;
+			return new Pair<String, String>(json, html);
 		} catch (IOException e) {
 			System.out.println("An error occurred while processing!");
 			e.printStackTrace();

project/Deserializer/src/jdeserialize/classdesc.java

@@ -234 +234 @@
         indentation += formatting.get("indent");
 
         // ClassName
-        sb.append(indentation).append("class ").append(this.name);
+        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"));
         // extends
         if (this.superclass != null) {
-            sb.append(" extends ").append(this.superclass.name);
+            sb.append(formatting.get("keywordCol")).append(" extends ").append(formatting.get("closeTagCol"));
+            sb.append(formatting.get("classCol")).append(this.superclass.name).append(formatting.get("closeTagCol"));
         }
         // implements
         if (this.interfaces != null) {
-            sb.append(" implements ");
+            sb.append(formatting.get("keywordCol")).append(" implements ").append(formatting.get("closeTagCol"));
             for (String str : this.interfaces) {
-                sb.append(str);
+                sb.append(formatting.get("classCol")).append(str).append(formatting.get("closeTagCol"));
             }
         }
         sb.append(" : {"); // ending of first line
@@ -265 +267 @@
             }
 
             sb.append(formatting.get("lineBreak")).append(indentation);
-            sb.append("\"").append(f.name).append("\"");
+            sb.append(formatting.get("fieldCol")).append("\"").append(f.name).append("\"").append(formatting.get("closeTagCol"));
             sb.append(" : ");
             sb.append(val);
 
@@ -273 +275 @@
                 sb.append(", ");
             }
         }
-        indentation = indentation.substring(0, indentation.length() - 1);
+        indentation = indentation.replaceFirst(formatting.get("indent"), "");
 
         sb.append(formatting.get("lineBreak")).append(indentation).append("}");
 
         if(this.superclass != null)
         {
-            indentation = indentation.substring(0, indentation.length() - 1);
+            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));
         }
         else 
         {
-            indentation = indentation.substring(0, indentation.length() - 1);
+            indentation = indentation.replaceFirst(formatting.get("indent"), "");
             sb.append(formatting.get("lineBreak")).append(indentation).append("}");
         }
 

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() {