Revize d6ee4876

re #7879

Converter.java a instance.java changed

project/Deserializer/bcha.json

@@ -2 +2 @@
 	class samples.ok.Simple : {
 		"testDouble" : 1.0, 
 		"testInt" : 123, 
-		"intArray" : [ 5, 10, 15 ], 
+		"intArray" : [  ], 
 		"locInnerClassInstance" : {
-			class samples.ok.Inner : {
-				"vnitrni" : "INNER STRING AM I"
-			}
-		}, 
+		class samples.ok.Inner : {
+			"vnitrni" : "INNER STRING AM I"
+		}
+}, 
 		"localEnum" : LOW, 
 		"pozdrav" : "AHOJ", 
 		"stringArray" : [ "A", "B", "C" ]

project/Deserializer/src/Converter.java

@@ -1 +1 @@
 import java.io.File;
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.Map;
 
+import javafx.util.Pair;
 import jdeserialize.content;
 import jdeserialize.jdeserialize;
 
 import io.FileWorker;
 
 public class Converter extends Thread {
-	
-	private IConversionResults ui;
+    
+    private IConversionResults ui;
 	private AtomicBoolean active;
 	
 	private AtomicReference<File> input;
 	private Semaphore inputAvailable;
+    
+    //Key as enum?
+	private HashMap<String, String> htmlFormatting = new HashMap<String, String>();
+	private HashMap<String, String> jsonFormatting = new HashMap<String, String>();
 	
 	public Converter(IConversionResults ui) {
 		this.ui = ui;
 		active = new AtomicBoolean(true);
 		input = new AtomicReference<File>(null);
 		inputAvailable = new Semaphore(0);
+        fillInTestingDictionaries();
+	}
+
+	private void fillInTestingDictionaries()
+	{
+		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>");
+
+		jsonFormatting.put("indent", "\t");
+		jsonFormatting.put("lineBreak", "\n");
+		jsonFormatting.put("classCol", "");
+		jsonFormatting.put("fieldCol", "");
+		jsonFormatting.put("valCol", "");
+		jsonFormatting.put("keywordCol", "");
+		jsonFormatting.put("closeTagCol", "");
 	}
 	
 	public void end() {
@@ -60 +91 @@
 			return;
 		}
 		
-		String json;
+		// TODO
+		String json, html;
 		try {
-			json = convert(array);
+			//The Pair is not the best way
+			Pair<String, String> returned = convert(FileWorker.loadByteArray(input));
+			
+			json = returned.getKey();
+			html = returned.getValue();
 		} catch (IOException e) {
 			json = null;
+			html = null;
 		}
 		ui.completed(json);
 	}
 	
-	private String convert(byte[] buffer) throws IOException {
+	private Pair<String, String> convert(byte[] buffer) throws IOException {
 		String json = "";
-		
+		String html = "";
+
+		//Redirectovany system.out do null streamu. Mozno redirect do souboru
+		System.setOut(new PrintStream(new OutputStream() {
+            public void write(int b) {
+            	// TODO nejspise do souboru.
+            }
+        }));
+		System.out.println("TEST STRING NOT SHOWING");
 		jdeserialize deserializer = new jdeserialize(buffer);
+		System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out)));
 		
 		// gets the "contents" into an array - returnes the deserialization of all
         // '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)
 			{
-				json += cnt.toString();
+				//Parametrizovany toJson pomoci dictionary
+				//Ciste HTML / Cisty JSON
+				json += cnt.toJson("", null, this.jsonFormatting);
+				html += cnt.toJson("", null, this.htmlFormatting);
 			}
 		}
 		
-		return json;
+		return new Pair<String, String>(json, html);
 	}
 
 }

project/Deserializer/src/jdeserialize/arrayobj.java

@@ -1 +1 @@
 package jdeserialize;
 
 /**
- * <p>Represents an array instance, including the values the comprise the array.  </p>
+ * <p>
+ * Represents an array instance, including the values the comprise the array.
+ * </p>
  *
- * <p>Note that in arrays of primitives, the classdesc will be named "[x", where x is the
- * field type code representing the primitive type.  See jdeserialize.resolveJavaType()
- * for an example of analysis/generation of human-readable names from these class names.</p>
+ * <p>
+ * Note that in arrays of primitives, the classdesc will be named "[x", where x
+ * is the field type code representing the primitive type. See
+ * jdeserialize.resolveJavaType() for an example of analysis/generation of
+ * human-readable names from these class names.
+ * </p>
  */
 public class arrayobj extends contentbase {
     /**
@@ -24 +29 @@
         this.classdesc = cd;
         this.data = data;
     }
-    public String toString() {
+
+    public @Override String toJson(String indentation) {
         StringBuilder sb = new StringBuilder();
         sb.append("[ ");
-        for(Object el : this.data)
-        {
-            sb.append(el.toString());
-            if(!el.equals(this.data.get(this.data.size()-1)))
-            {
-                sb.append(", ");
+
+        for (Object el : this.data) {
+            if (el != null && el instanceof content) {
+                sb.append(((content)el).toJson(indentation));
+                // el null!
+                if (!el.equals(this.data.get(this.data.size() - 1))) {
+                    sb.append(", ");
+                }
             }
         }
         sb.append(" ]");
         return sb.toString();
     }
-}
 
+    public String toString() {
+        return "[array " + jdeserialize.hex(handle) + " classdesc " + classdesc.toString() + ": " + data.toString()
+                + "]";
+    }
+}

project/Deserializer/src/jdeserialize/content.java

@@ -64 +64 @@
      * @param value the new value to use
      */
     public void setIsExceptionObject(boolean value);
+
+    public String toJson(String indentation);
 }
 

project/Deserializer/src/jdeserialize/contentbase.java

@@ -24 +24 @@
     }
     public void validate() throws ValidityException {
     }
+
+    public @Override String toJson(String indetation)
+    {
+        return this.toString();
+    }
 }
 

project/Deserializer/src/jdeserialize/enumobj.java

@@ -31 +31 @@
         this.classdesc = cd;
         this.value = so;
     }
-    public String toString() {
+    public @Override String toJson(String indetation) {
         return this.value.value;
     }
+
+    public String toString(){
+        return "[enum " + jdeserialize.hex(handle) + ": " + 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, Map<String, String> formatting)
+    {
+        return this.classdesc.toJson(indentation, this.fielddata, formatting);
+    }
+    
     public String toString() {
         StringBuffer sb = new StringBuffer();
-
-        // ClassName
-        sb.append("{\n\tclass ").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
-
-        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
-            String val = this.fielddata.get(classdesc).get(f).toString();
-            sb.append("\n\t\t");
-            // Datový typ není potřeba - json jej nepoužívá!
-            sb.append("\"")./* append(f.type.getJavaType()).append(" "). */append(f.name).append("\"");
-            sb.append(" : ");
-            sb.append(val);
-
-            if (!f.equals(classdesc.fields[classdesc.fields.length - 1])) {
-                sb.append(", ");
-            }
-        }
-
-        sb.append("\n\t}\n}");
-
+        sb.append(classdesc.name).append(' ').append("_h").append(jdeserialize.hex(handle))
+            .append(" = r_").append(jdeserialize.hex(classdesc.handle)).append(";  ");
+        //sb.append("// [instance " + jdeserialize.hex(handle) + ": " + jdeserialize.hex(classdesc.handle) + "/" + classdesc.name).append("]");
         return sb.toString();
     }
 

project/Deserializer/src/jdeserialize/jdeserialize.java

@@ -837 +837 @@
                     break;
                 }
                 content c = read_Content(tc, dis, true);
-                System.out.println("read: " + c.toString());
+                //System.out.println("read: " + c.toString());
                 if(c != null && c.isExceptionObject()) {
                     c = new exceptionstate(c, lis.getRecordedData());
                 }

project/Deserializer/src/jdeserialize/stringobj.java

@@ -15 +15 @@
         }
         return x;
     }
-    public String toString() {
+
+    public @Override String toJson(String indetation)
+    {
         return "\"" + this.value + "\"";
     }
+
+    public String toString() {
+        return "[String " + jdeserialize.hex(handle) + ": \"" + value + "\"]";
+    }
     /**
      * Constructor.
      *