Revize 49fd8648

#re #7879

Ještě není dokončeno - commit kvůli merge.

project/Deserializer/src/Converter.java

@@ -1 +1 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
 
 import jdeserialize.content;
 import jdeserialize.jdeserialize;
 
+import io.FileWorker;
+
 public class Converter extends Thread {
 	
-	private Deserializer main;
+	private IConversionResults ui;
+	private AtomicBoolean active;
+	
+	private AtomicReference<File> input;
+	private Semaphore inputAvailable;
+	
+	public Converter(IConversionResults ui) {
+		this.ui = ui;
+		active = new AtomicBoolean(true);
+		input = new AtomicReference<File>(null);
+		inputAvailable = new Semaphore(0);
+	}
 	
-	private File input;
-	private File output;
+	public void end() {
+		active.set(false);
+		setInput(null);
+	}
 	
-	public Converter(Deserializer main, File inputFilename, File outputFilename) {
-		this.main = main;
-		this.input = inputFilename;
-		this.output = outputFilename;
+	public void setInput(File input) {
+		this.input.set(input);
+		inputAvailable.release();
 	}
 	
 	@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) {
+				continue;
+			}
+		}
+	}
+	
+	private void process(File input) {
+		byte array[];
+		try {
+			array = FileWorker.loadByteArray(input);
+		} catch (IOException e) {
+			ui.loadingInputFileError();
+			return;
+		}
 		
+		String json;
 		try {
-			String json = convert(FileWorker.loadByteArray(input));
-			
-			String title = "Uložení JSON";
-			if (FileWorker.saveJson(output, json)) {
-				System.out.println("The JSON file was saved correctly.");
-				Report.info(title, null, "Uložení JSON souboru proběhlo v pořádku.");
-			} else {
-				System.out.println("There was an error saving the JSON file.");
-				Report.error(title, null, "Při ukládání JSON souboru nastala chyba.");
-			}
+			json = convert(array);
 		} catch (IOException e) {
-			System.out.println("There was an error loading the file.");
-			e.printStackTrace();
-			Report.error("Načítání souboru", null, "Při načítání souboru došlo k chybě.");
+			json = null;
 		}
-
-		main.convertIsComplete();
+		ui.completed(json);
 	}
 	
-	private String convert(byte[] buffer) {
+	private String convert(byte[] buffer) throws IOException {
 		String json = "";
-		try {
-			System.out.println("Deserialization begins.");
-			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();
+		
+		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();
 
-            // testing with only first of the contents
-			//ObjectWriter ow = new ObjectMapper().writer().withDefaultPrettyPrinter();
-			
-			for(content cnt : cntnts)
+        // testing with only first of the contents
+		//ObjectWriter ow = new ObjectMapper().writer().withDefaultPrettyPrinter();
+		
+		for(content cnt : cntnts)
+		{
+			if(cnt != null)
 			{
-				if(cnt != null)
-				{
-					json += cnt.toString();
-				}
+				json += cnt.toString();
 			}
-
-			System.out.println("Task completed.");
-			
-			//just for tests
-			//System.out.println(json);
-			
-			return json;
-		} catch (IOException e) {
-			System.out.println("An error occurred while processing!");
-			e.printStackTrace();
-			return null;
 		}
+		
+		return json;
 	}
 
 }