Revize 5ae26965

re #7890

Tvora deamonů vyřešena přes použití ACE knihovny. Deamoni se tedy již nevytváří - knihovna se o plynulé zobrazení stará sama. Na základě zákazníkovi prosby zobrazovány i obsahy souborů bez serializovaných objektů, bylo potřeba rozšířit formátování - soubory mohou být opravdu různé, knihovna zvýrazňuje syntaxe u více jak 100 různých formátů.

project/Deserializer/src/Converter.java

@@ -15 +15 @@
 
 import jdeserialize.content;
 import jdeserialize.jdeserialize;
-
 import io.FileWorker;
 
 public class Converter extends Thread {
@@ -27 +26 @@
 	private Lock entryLock;
 	private Semaphore inputAvailable;
 
+	// Input.
 	private File inputFile;
-	private String query;
-	private boolean testing;
 
 	// Key as enum?
 	private HashMap<String, String> htmlFormatting = new HashMap<String, String>();
@@ -44 +42 @@
 	}
 
 	private void fillInTestingDictionaries() {
-		htmlFormatting.put("indent", "<span style=\"margin-left:2em\">");
+		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("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");
@@ -63 +61 @@
 
 	public void end() {
 		active.set(false);
-		setInput(null, null, false);
+		setInput(null);
 	}
 	
-	public void setInput(File inputFile, String query, boolean testing) {
+	public void setInput(File inputFile) {
 		entryLock.lock();
 		this.inputFile = inputFile;
-		this.query = query;
-		this.testing = testing;
 		entryLock.unlock();
 
 		if (!inputAvailable.tryAcquire())
 			inputAvailable.release(); // MAX VALUE = 1!
 	}
 	
-	public boolean getInput(AtomicReference<File> inputFile, AtomicReference<String> query, AtomicBoolean testing) {
+	public boolean getInput(AtomicReference<File> inputFile) {
 		try {
 			inputAvailable.acquire();
 		} catch (InterruptedException e) {
@@ -86 +82 @@
 
 		entryLock.lock();
 		inputFile.set(this.inputFile);
-		query.set(this.query);
-		testing.set(this.testing);
-
+		
 		this.inputFile = null;
-		this.query = null;
 		entryLock.unlock();
 
-		return true;
+		return inputFile.get() != null;
 	}
 
 	@Override
@@ -101 +94 @@
 		super.run();
 		while (active.get()) {
 			AtomicReference<File> inputFile = new AtomicReference<File>();
-			AtomicReference<String> query = new AtomicReference<String>();
-			AtomicBoolean testing = new AtomicBoolean();
 
-			if (!getInput(inputFile, query, testing)) {
+			if (!getInput(inputFile)) {
 				continue;
 			}
 
-			if (inputFile.get() != null) {
-				processA(inputFile.get(), testing.get());
-			} else if (query.get() != null) {
-				processB(query.get().getBytes(), testing.get());
+			byte array[] = getBytes(inputFile.get());
+			StringBuilder html = new StringBuilder();
+			StringBuilder json = new StringBuilder();
+			
+			try {
+				// Redirectovany system.out do null streamu. Mozno redirect do souboru
+				System.setOut(FileWorker.createRedirectStream());
+				convert(array, html, json);
+			} catch (Exception e) {
+				json.setLength(0);
+				html.setLength(0);
+			} finally {
+				System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out)));
 			}
+
+			//test file output
+			try {
+				BufferedWriter writer = new BufferedWriter(new FileWriter("html.txt"));
+				writer.write(html.toString().replace("<br/>", "\n")); // TODO pridan replace pro odsazovani - lepsi orientace v souboru.
+				writer.close();
+
+				BufferedWriter writer2 = new BufferedWriter(new FileWriter("json.txt"));
+				writer2.write(json.toString());
+				writer2.close();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			//test file output
+			
+			ui.completed(html.toString(), json.toString(), new String(array));
 		}
 	}
 
-	private void processA(File input, boolean testing) {
+	private byte[] getBytes(File input) {
 		byte array[];
 		try {
 			array = FileWorker.loadByteArray(input);
 		} catch (IOException e) {
 			ui.loadingInputFileError();
-			return;
+			return null;
 		}
-		processB(array, testing);
+		return array;
 	}
-
-	private void processB(byte array[], boolean testing) {
-		StringBuilder html = new StringBuilder();
-		StringBuilder json = new StringBuilder();
-
-		try {
-			// Redirectovany system.out do null streamu. Mozno redirect do souboru
-			System.setOut(FileWorker.createRedirectStream());
-			convert(array, html, json);
-		} catch (Exception e) {
-			json.setLength(0);
-			html.setLength(0);
-		} finally {
-			System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out)));
-		}
-
-		//test file output
-		try {
-			BufferedWriter writer = new BufferedWriter(new FileWriter("html.txt"));
-			writer.write(html.toString());
-			writer.close();
-
-			BufferedWriter writer2 = new BufferedWriter(new FileWriter("json.txt"));
-			writer2.write(json.toString());
-			writer2.close();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		//test file output
-
-		ui.completed(html.toString(), json.toString(), testing);
-	}
-
+	
 	private void convert(byte[] buffer, StringBuilder html, StringBuilder json) throws Exception {
 		jdeserialize deserializer = new jdeserialize(buffer);