Revize a5d16f0a

re #7879 release v0.2

release v0.2

project/Deserializer/src/Converter.java

@@ -2 +2 @@
 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 java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 
-import javafx.util.Pair;
 import jdeserialize.content;
 import jdeserialize.jdeserialize;
 
@@ -22 +21 @@
     private IConversionResults ui;
 	private AtomicBoolean active;
 	
-	private AtomicReference<File> input;
+	// P-K without E semaphore.
+	private Lock entryLock;
 	private Semaphore inputAvailable;
     
+	private File inputFile;
+	private String inputString;
+	private boolean testing;
+	
     //Key as enum?
 	private HashMap<String, String> htmlFormatting = new HashMap<String, String>();
 	private HashMap<String, String> jsonFormatting = new HashMap<String, String>();
@@ -32 +36 @@
 	public Converter(IConversionResults ui) {
 		this.ui = ui;
 		active = new AtomicBoolean(true);
-		input = new AtomicReference<File>(null);
+		entryLock = new ReentrantLock();
 		inputAvailable = new Semaphore(0);
         fillInTestingDictionaries();
 	}
@@ -58 +62 @@
 	
 	public void end() {
 		active.set(false);
-		setInput(null);
+		setInput(null, null, false);
 	}
 	
-	public void setInput(File input) {
-		this.input.set(input);
-		inputAvailable.release();
+	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) {
+		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();
 		while (active.get()) {
-			try {
-				inputAvailable.acquire();
-				File input = this.input.get();
-				if (input != null) {
-					process(input);
-				}
-			} catch (InterruptedException e) {
+			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) {
+				processB(inputString.get().getBytes(), testing.get());
+			}
 		}
 	}
 	
-	private void process(File input) {
+	private void processA(File input, boolean testing) {
 		byte array[];
 		try {
 			array = FileWorker.loadByteArray(input);
@@ -90 +123 @@
 			ui.loadingInputFileError();
 			return;
 		}
+		processB(array, testing);
+	}
+	
+	private void processB(byte array[], boolean testing) {
+		StringBuilder html = new StringBuilder();
+		StringBuilder json = new StringBuilder();
 		
-		// TODO
-		String json, html;
 		try {
-			//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;
+			//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)));
 		}
-		ui.completed(json);
+		
+		ui.completed(html.toString(), json.toString(), testing);
 	}
 	
-	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");
+	private void convert(byte[] buffer, StringBuilder html, StringBuilder json) throws Exception {
 		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();
@@ -130 +157 @@
 			{
 				//Parametrizovany toJson pomoci dictionary
 				//Ciste HTML / Cisty JSON
-				json += cnt.toJson("", null, this.jsonFormatting);
-				html += cnt.toJson("", null, this.htmlFormatting);
+				json.append(cnt.toJson("", null, this.jsonFormatting));
+				html.append(cnt.toJson("", null, this.htmlFormatting));
 			}
 		}
-		
-		return new Pair<String, String>(json, html);
 	}
 
 }