Revize a5557143

re #7967

Napraveny chyby až na komunikaci s DB - to je v jiném úkolu.

project/Deserializer/src/io/FileWorker.java

@@ -25 +25 @@
 public class FileWorker {
 	
 	private static final String CONFIG = "app.config";
+	public static final String INPUT_DIR = "input_dir";
 	public static final String ACE_MODE = "ace_mode";
 	public static final String ACE_THEME = "ace_theme";
 	public static final String DB_TYPE = "db_type";
@@ -109 +110 @@
 		return new PrintStream(new File("jdeserialize_log.txt"));
 	}
 	
-	public static byte[] loadByteArray(File file) throws IOException {
-		byte fileContent[] = loadFileContent(file);
+	public static byte[] loadFileContent(File file) throws IOException {
+		byte buffer[] = new byte[(int) file.length()];
+		BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));
+		bis.read(buffer);
+		bis.close();
+		return buffer;
+	}
+	
+	public static byte[] unzipFile(byte content[]) throws IOException {
 		byte buffer[];
 		
 		IZipReader input;
 		try {
-			input = new ZipInStream(new ByteArrayInputStream(fileContent));
+			input = new ZipInStream(new ByteArrayInputStream(content));
 		} catch (NoSuchElementException e) {
 			System.out.println("Note: the file may be a special type of ZIP archive.");
-			input = new InflaterInStream(new FileInputStream(file));
+			input = new InflaterInStream(new ByteArrayInputStream(content));
 		}
 		
 		try {
@@ -140 +148 @@
 			System.out.println(String.format("The file is a%s ZIP archive...", input.getClass() == InflaterInStream.class ? " special" : ""));
 		} catch (Exception e) {
 			System.out.println("The file is not a ZIP archive...");
-			buffer = fileContent;
+			buffer = content;
 		} finally {
 			input.close();
 		}
@@ -149 +157 @@
 		return buffer;
 	}
 
-	private static byte[] loadFileContent(File file) throws IOException {
-		byte buffer[] = new byte[(int) file.length()];
-		BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));
-		bis.read(buffer);
-		bis.close();
-		return buffer;
-	}
-	
 	public static void saveJson(File file, String json) throws IOException {
 		FileWriter fw = new FileWriter(file);
 		BufferedWriter bw = new BufferedWriter(fw);