Revize 81ff7da4

re #7891 Indentation new issue found.
WebView interpretation of html does not respond to actual HTML

project/Deserializer/src/Converter.java

@@ +1 @@
+import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileDescriptor;
 import java.io.FileOutputStream;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.HashMap;
@@ -17 +19 @@
 import io.FileWorker;
 
 public class Converter extends Thread {
-    
-    private IConversionResults ui;
+
+	private IConversionResults ui;
 	private AtomicBoolean active;
-	
+
 	// P-K without E semaphore.
 	private Lock entryLock;
 	private Semaphore inputAvailable;
-    
+
 	private File inputFile;
 	private String inputString;
 	private boolean testing;
-	
-    //Key as enum?
+
+	// 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);
 		entryLock = new ReentrantLock();
 		inputAvailable = new Semaphore(0);
-        fillInTestingDictionaries();
+		fillInTestingDictionaries();
 	}
 
-	private void 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\">");
@@ -59 +60 @@
 		jsonFormatting.put("keywordCol", "");
 		jsonFormatting.put("closeTagCol", "");
 	}
-	
+
 	public void end() {
 		active.set(false);
 		setInput(null, null, false);
 	}
-	
+
 	public void setInput(File inputFile, String inputString, boolean testing) {
 		entryLock.lock();
 		this.inputFile = inputFile;
 		this.inputString = inputString;
 		this.testing = testing;
 		entryLock.unlock();
-		
+
 		if (!inputAvailable.tryAcquire())
 			inputAvailable.release(); // MAX VALUE = 1!
 	}
-	
-	public boolean getInput(AtomicReference<File> inputFile, AtomicReference<String> inputString, AtomicBoolean testing) {
+
+	public boolean getInput(AtomicReference<File> inputFile, AtomicReference<String> inputString,
+			AtomicBoolean testing) {
 		try {
 			inputAvailable.acquire();
 		} catch (InterruptedException e) {
 			return false;
 		}
-		
+
 		entryLock.lock();
 		inputFile.set(this.inputFile);
 		inputString.set(this.inputString);
 		testing.set(this.testing);
-		
+
 		this.inputFile = null;
 		this.inputString = null;
 		entryLock.unlock();
-		
+
 		return true;
 	}
-	
+
 	@Override
 	public void run() {
 		super.run();
@@ -102 +104 @@
 			AtomicReference<File> inputFile = new AtomicReference<File>();
 			AtomicReference<String> inputString = new AtomicReference<String>();
 			AtomicBoolean testing = new AtomicBoolean();
-			
+
 			if (!getInput(inputFile, inputString, testing)) {
 				continue;
 			}
-			
+
 			if (inputFile.get() != null) {
 				processA(inputFile.get(), testing.get());
 			} else if (inputString.get() != null) {
@@ -114 +116 @@
 			}
 		}
 	}
-	
+
 	private void processA(File input, boolean testing) {
 		byte array[];
 		try {
@@ -125 +127 @@
 		}
 		processB(array, testing);
 	}
-	
+
 	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
+			// Redirectovany system.out do null streamu. Mozno redirect do souboru
 			System.setOut(FileWorker.createRedirectStream());
 			convert(array, html, json);
 		} catch (Exception e) {
@@ -140 +142 @@
 		} 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);
 
 		// gets the "contents" into an array - returnes the deserialization of all
-        // 'writes' into serialized object via objectOutputStream
-        List<content> cntnts = deserializer.getContent();
-
-		for(content cnt : cntnts)
-		{
-			if(cnt != null)
-			{
-				//Parametrizovany toJson pomoci dictionary
-				//Ciste HTML / Cisty JSON
+		// 'writes' into serialized object via objectOutputStream
+		List<content> cntnts = deserializer.getContent();
+
+		for (content cnt : cntnts) {
+			if (cnt != null) {
+				// Parametrizovany toJson pomoci dictionary
+				// Ciste HTML / Cisty JSON
 				json.append(cnt.toJson("", null, this.jsonFormatting, false));
 				html.append(cnt.toJson("", null, this.htmlFormatting, false));
 			}