Revize e8ba39e7

re #7879

Converter.java a instance.java changed

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);
 	}
 
 }