Revize 9744d223

#7767

Zprovoznění exportu do JSON. Přidáno zpracovávání binárních zazipovaných dat. Úprava struktury.

demo_mh/Deserializer/results.json

@@ -1 @@
-{"States":["Madhya Pradesh","Maharastra","Rajasthan"],"Population":1000000,"Name":"India"}
+{"parent":{"variables":{"str":"ABCD"},"name":"class serialize.Parent","interface":"java.io.Serializable"},"variables":{"x":10.0,"variable":{"variables":{"realNum":15.6},"name":"class serialize.Contain","interface":"java.io.Serializable"},"numberX":7},"name":"class serialize.Example","interface":"java.io.Serializable"}

demo_mh/Deserializer/src/deserialize/ClassDescription.java

@@ -3 +3 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.json.simple.JSONObject;
+
 public class ClassDescription {
 
-	final static byte SC_SERIALIZABLE = (byte) 0x02;
-	final static byte SC_EXTERNALIZABLE = (byte) 0x04;
+	private final static byte SC_SERIALIZABLE = (byte) 0x02;
+	private final static byte SC_EXTERNALIZABLE = (byte) 0x04;
 	
 	String className;
 	long serialVersionUID;
 	byte flags;
 	boolean isClass; // or enum
-	List<String> variables = new ArrayList<String>();
+	
+	private List<ClassDescription> parents = new ArrayList<ClassDescription>();
+	private int actParentIndex = -1;
+	
+	private List<Variable> variables = new ArrayList<Variable>();
+	private int actVariableIndex = -1;
+	
+	public Variable nextVariable() {
+		if (++actVariableIndex < variables.size()) {
+			return variables.get(actVariableIndex);
+		} else {
+			return null;
+		}
+	}
+	
+	public void addParent(ClassDescription parent) {
+		parents.add(parent);
+		actParentIndex++;
+	}
+	
+	public Variable getActVariable() {
+		for (; actParentIndex >= 0; actParentIndex--) {
+			Variable var = parents.get(actParentIndex).nextVariable();
+			if (var != null) {
+				return var;
+			}
+		}
+		return null;
+	}
+	
+	public void setVariables(List<Variable> variables) {
+		this.variables = variables;
+	}
+	
+	@SuppressWarnings("unchecked")
+	public JSONObject getJSONObject() {
+		int actIndex = ++actParentIndex;
+		JSONObject obj = new JSONObject();
+		
+		JSONObject vars = new JSONObject();
+		for (int j = 0; j < variables.size(); j++) {
+			variables.get(j).putToJSON(vars);
+		}
+		obj.put("variables", vars);
+		
+		String i = "";
+		if (flags == SC_SERIALIZABLE) {
+			i = "java.io.Serializable";
+		} else if (flags == SC_EXTERNALIZABLE) {
+			i = "java.io.Externalizable";
+		}
+		obj.put("interface", i);
+		
+		String name;
+		if (isClass) {
+			name = "class";
+		} else {
+			name = "enum";
+		}
+		name += " " + className;
+		obj.put("name", name);
+		
+		if ((actIndex + 1) < parents.size()) {
+			obj.put("parent", parents.get(actIndex + 1).getJSONObject());
+		}
+		
+		return obj;
+	}
 	
 	@Override
 	public String toString() {
+		actParentIndex++;
 		String retValue = "";
 		
 		if (isClass) {
@@ -25 +95 @@
 		}
 		
 		retValue += " " + className;
+		
+		if ((actParentIndex + 1) < parents.size()) {
+			retValue += " extends " + parents.get(actParentIndex + 1).className;
+		}
+		
 		if (flags == SC_SERIALIZABLE) {
 			retValue += " implements java.io.Serializable";
 		} else if (flags == SC_EXTERNALIZABLE) {
@@ -36 +111 @@
 			if (i > 0) {
 				retValue += "\n";
 			}
-			retValue += "    " + variables.get(i) + ";";
+			retValue += "    " + variables.get(i).toString() + ";";
+		}
+		retValue += "\n}\n";
+		
+		if ((actParentIndex + 1) < parents.size()) {
+			retValue += parents.get(actParentIndex + 1).toString();
 		}
-		retValue += "\n}";
 		
 		return retValue;
 	}

demo_mh/Deserializer/src/deserialize/DataType.java

@@ +1 @@
+package deserialize;
+
+import java.util.HashMap;
+
+public class DataType {
+
+	public final static HashMap<Character, String> primTypeCodes;
+	public final static HashMap<Character, String> objTypeCodes;
+	
+	static {
+		primTypeCodes = new HashMap<Character, String>();
+		primTypeCodes.put('B', "byte");
+		primTypeCodes.put('C', "char");
+		primTypeCodes.put('D', "double");
+		primTypeCodes.put('F', "float");
+		primTypeCodes.put('I', "integer");
+		primTypeCodes.put('J', "long");
+		primTypeCodes.put('S', "short");
+		primTypeCodes.put('Z', "boolean");
+		
+		objTypeCodes = new HashMap<Character, String>();
+		objTypeCodes.put('[', "array");
+		objTypeCodes.put('L', "object");
+    }
+	
+	public static boolean isPrimaryType(char type) {
+		return primTypeCodes.containsKey(type);
+	}
+	
+}

demo_mh/Deserializer/src/deserialize/Deserializer.java

@@ -1 +1 @@
 package deserialize;
 
-import java.io.BufferedInputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
 
-import general.*;
+import javafx.application.Application;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.Separator;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.VBox;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
 
-public class Deserializer {
+import serialize.Example;
+
+public class Deserializer extends Application {
+	
+	private Stage stage;
+	private File inputFile;
+	private File outputFile;
+	
+	// TODO delete after deserializer debugging is complete...
+	private boolean testing;
 	
 	public static void main(String[] args) {
-		try {
-			
-			// Try to deserialize classically.
-			FileInputStream fis = new FileInputStream(Constants.SERIALIZED_FILE);
-			ObjectInputStream ois = new ObjectInputStream(fis);
-			Deserializer d = (Deserializer) ois.readObject();
-			System.out.println(d.toString());
-			ois.close();
-			
-		} catch (IOException e) {
-			
-			// Stream error.
-			System.out.println("Chyba pri otevirani (uzavirani) streamu.");
-			e.printStackTrace();
-			
-		} catch (Exception e) {
-			
-			// Others: ClassNotFoundException, ClassCastException, ...
-			// Usually due to problems with classical deserialization.
-			byte buffer[];
-			try {
-				File f = new File(Constants.SERIALIZED_FILE);
-				buffer = new byte[(int) f.length()];
-				
-				BufferedInputStream fis = new BufferedInputStream(new FileInputStream(f));
-		        fis.read(buffer);
-		        fis.close();
-		        
-		        System.out.println("Doslo k chybe pri deserializaci.");
-				System.out.println("Spoustim univerzalni deserializer.");
-				
-				ToJSON thread = new ToJSON(buffer);
-				thread.start();
-				try {
-					thread.join();
-					System.out.println("JSON byl vytvoren.");
-				} catch (InterruptedException e1) {
-					e1.printStackTrace();
-				}
-				
-		    } catch (IOException e1) {
-		        e1.printStackTrace();
-		    }
-			
+		launch(args);
+	}
+
+	@Override
+	public void init() throws Exception {
+		super.init();
+		testing = false;
+	}
+	
+	@Override
+	public void start(Stage stage) throws Exception {
+		this.stage = stage;
+		stage.setTitle("Java object universal deserializer");
+		stage.setScene(createScene());
+		stage.setMinWidth(400);
+		stage.show();
+	}
+	
+	private Scene createScene() {
+		return new Scene(createLayout());
+	}
+	
+	private Parent createLayout() {
+		VBox layout = new VBox();
+		layout.setPadding(new Insets(10.0));
+		layout.setSpacing(10.0);
+		
+		Label forDefaultBinFile = new Label("Chcete vytvo?it defaultn? bin?rn? soubor?");
+		Button createBinFile = new Button("Vytvo?it");
+		createBinFile.setOnAction(event -> {
+			FileChooser fCh = new FileChooser();
+			fCh.setInitialDirectory(new File("."));
+			fCh.getExtensionFilters().add(new FileChooser.ExtensionFilter("Binary Files", "*.out"));
+			File file = fCh.showSaveDialog(stage);
+			if (file != null) {
+				createSerializedFile(file);
+			}
+		});
+		final Pane spacer = new Pane();
+	    HBox.setHgrow(spacer, Priority.ALWAYS);
+		HBox header = new HBox();
+		header.setAlignment(Pos.CENTER_LEFT);
+		header.getChildren().add(forDefaultBinFile);
+		header.getChildren().add(spacer);
+		header.getChildren().add(createBinFile);
+		
+		Label forInputFile = new Label("Soubor k deserializaci:");
+		Label inputFile = new Label("    Je?t? nebyl vybr?n ??dn? soubor...");
+		inputFile.setStyle("-fx-font-style: italic;");
+		VBox forInput = new VBox();
+		forInput.getChildren().add(forInputFile);
+		forInput.getChildren().add(inputFile);
+		
+		Label forOutputFile = new Label("V?stupn? soubor:");
+		Label outputFile = new Label("    Je?t? nebyl vybr?n ??dn? soubor...");
+		outputFile.setStyle("-fx-font-style: italic;");
+		VBox forOutput = new VBox();
+		forOutput.getChildren().add(forOutputFile);
+		forOutput.getChildren().add(outputFile);
+		
+		Button convert = new Button("P?ev?st");
+		convert.setOnAction(event -> {
+			ToJSON thread = new ToJSON(testing ? new File("data.out") : this.inputFile, this.outputFile);
+			thread.start();
+		});
+		convert.setDisable(!testing);
+		Button setInputFile = new Button("Vstupn? soubor");
+		setInputFile.setOnAction(event -> {
+			FileChooser fCh = new FileChooser();
+			fCh.setInitialDirectory(new File("."));
+			// The input can be a zip file or file without a specific extension -> file chooser without extension filters...
+			// fCh.getExtensionFilters().add(new FileChooser.ExtensionFilter("Binary Files", "*.out"));
+			File file = fCh.showOpenDialog(stage);
+			if (file != null) {
+				this.inputFile = file;
+				inputFile.setText(this.inputFile == null ? "" : this.inputFile.getAbsolutePath());
+				inputFile.setStyle("-fx-font-weight: bold;");
+				convert.setDisable(this.inputFile == null || this.outputFile == null);
+			}
+		});
+		Button setOutputFile = new Button("V?stupn? soubor");
+		setOutputFile.setOnAction(event -> {
+			FileChooser fCh = new FileChooser();
+			fCh.setInitialDirectory(new File("."));
+			fCh.getExtensionFilters().add(new FileChooser.ExtensionFilter("JSON Files", "*.json"));
+			File file = fCh.showSaveDialog(stage);
+			if (file != null) {
+				this.outputFile = file;
+				outputFile.setText(this.outputFile == null ? "" : this.outputFile.getAbsolutePath());
+				outputFile.setStyle("-fx-font-weight: bold;");
+				convert.setDisable(this.inputFile == null || this.outputFile == null);
+			}
+		});
+		HBox footer = new HBox();
+		footer.setSpacing(10.0);
+		footer.setAlignment(Pos.CENTER_RIGHT);
+		footer.getChildren().add(setInputFile);
+		footer.getChildren().add(setOutputFile);
+		footer.getChildren().add(convert);
+		
+		layout.getChildren().add(header);
+		layout.getChildren().add(new Separator());
+		layout.getChildren().add(forInput);
+		layout.getChildren().add(forOutput);
+		layout.getChildren().add(footer);
+		
+		return layout;
+	}
+	
+	private void createSerializedFile(File file) {
+		String title = "Vytvo?en? defaultn?ho souboru";
+		if (Example.serialize(file)) {
+			Report.info(title, null, "Vytvo?en? prob?hlo v po??dku.");
+		} else {
+			Report.error(title, null, "Vytvo?en? souboru se nepovedlo.");
 		}
 	}
 	

demo_mh/Deserializer/src/deserialize/Grammar.java

@@ -1 +1 @@
 package deserialize;
 
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import org.json.simple.JSONObject;
+
 /**
  * https://docs.oracle.com/javase/7/docs/platform/serialization/spec/protocol.html
  */
@@ -14 +13 @@
 	
 	private final static short STREAM_MAGIC = (short) 0xACED;
 	private final static short STREAM_VERSION = 5;
-	private final static byte TC_NULL = (byte) 0x70;
-	private final static byte TC_REFERENCE = (byte) 0x71;
-	private final static byte TC_CLASSDESC = (byte) 0x72;
-	private final static byte TC_OBJECT = (byte) 0x73;
-	private final static byte TC_STRING = (byte) 0x74;
-	private final static byte TC_ARRAY = (byte) 0x75;
-	private final static byte TC_CLASS = (byte) 0x76;
-	private final static byte TC_BLOCKDATA = (byte) 0x77;
-	private final static byte TC_ENDBLOCKDATA = (byte) 0x78;
-	private final static byte TC_RESET = (byte) 0x79;
-	private final static byte TC_BLOCKDATALONG = (byte) 0x7A;
-	private final static byte TC_EXCEPTION = (byte) 0x7B;
-	private final static byte TC_LONGSTRING = (byte) 0x7C;
-	private final static byte TC_PROXYCLASSDESC = (byte) 0x7D;
-	private final static byte TC_ENUM = (byte) 0x7E;
+	private final static byte TC_NULL = 0x70;
+	private final static byte TC_REFERENCE = 0x71;
+	private final static byte TC_CLASSDESC = 0x72;
+	private final static byte TC_OBJECT = 0x73;
+	private final static byte TC_STRING = 0x74;
+	private final static byte TC_ARRAY = 0x75;
+	private final static byte TC_CLASS = 0x76;
+	private final static byte TC_BLOCKDATA = 0x77;
+	private final static byte TC_ENDBLOCKDATA = 0x78;
+	private final static byte TC_RESET = 0x79;
+	private final static byte TC_BLOCKDATALONG = 0x7A;
+	private final static byte TC_EXCEPTION = 0x7B;
+	private final static byte TC_LONGSTRING = 0x7C;
+	private final static byte TC_PROXYCLASSDESC = 0x7D;
+	private final static byte TC_ENUM = 0x7E;
 	private final static int baseWireHandle = (int) 0x7E0000;
 	
-	final static byte SC_WRITE_METHOD = (byte) 0x01; // if SC_SERIALIZABLE
-	final static byte SC_BLOCK_DATA = (byte) 0x08; // if SC_EXTERNALIZABLE
-	final static byte SC_SERIALIZABLE = (byte) 0x02;
-	final static byte SC_EXTERNALIZABLE = (byte) 0x04;
-	final static byte SC_ENUM = (byte) 0x10;
+	final static byte SC_WRITE_METHOD = 0x01; // if SC_SERIALIZABLE
+	final static byte SC_BLOCK_DATA = 0x08; // if SC_EXTERNALIZABLE
+	final static byte SC_SERIALIZABLE = 0x02;
+	final static byte SC_EXTERNALIZABLE = 0x04;
+	final static byte SC_ENUM = 0x10;
 
-	HashMap<Character, String> primTypeCodes;
-	HashMap<Character, String> objTypeCodes;
-	
-	
-	// Note. (XXX) This token has the XXX type specified
-	
-	
 	private List<Byte> buffer;
-	public Grammar(List<Byte> buffer) {
-		this.buffer = buffer;
-		
-		primTypeCodes = new HashMap<Character, String>();
-		primTypeCodes.put('B', "byte");
-		primTypeCodes.put('C', "char");
-		primTypeCodes.put('D', "double");
-		primTypeCodes.put('F', "float");
-		primTypeCodes.put('I', "integer");
-		primTypeCodes.put('J', "long");
-		primTypeCodes.put('S', "short");
-		primTypeCodes.put('Z', "boolean");
-		
-		objTypeCodes = new HashMap<Character, String>();
-		objTypeCodes.put('[', "array");
-		objTypeCodes.put('L', "object");
+	public Grammar(byte buffer[]) {
+		this.buffer = new ArrayList<Byte>();
+		for (int i = 0; i < buffer.length; i++) {
+			this.buffer.add(buffer[i]);
+		}
 	}
 	
 	
@@ -104 +85 @@
 		return str;
 	}
 	
-	
-	
-	
-	
 	public String readUtf() {
 		short length = readShort();
 		return readString(length);
@@ -118 +95 @@
 		return readString(length);
 	}
 	
+	public float readFloat() {
+		return Float.intBitsToFloat(readInt());
+	}
 	
+	public double readDouble() {
+		return Double.longBitsToDouble(readLong());
+	}
 	
+	public boolean readBoolean() {
+		// TODO zkontrolovat
+		return readByte() != 0;
+	}
 	
 	
+	List<ClassDescription> classes = new ArrayList<ClassDescription>();
+	ClassDescription actClass = null;
 	
-	
-	
-	public void start() {
+	public JSONObject process() {
 		System.out.println("Kontrola hlavicky souboru: " + (readShort() == STREAM_MAGIC && readShort() == STREAM_VERSION));
+		
 		while (!buffer.isEmpty()) {
-			object();
+			try {
+				object();
+			} catch (Exception e) {
+				break;
+			}
 		}
+		
+		return classes.get(0).getJSONObject();
+		// System.out.println(classes.get(0).toString());
 	}
 	
 	// FOR VALUES : 
@@ -185 +180 @@
 			case TC_ARRAY: {
 					System.out.println("X3");
 					ClassDescription desc = (ClassDescription) object();
-					int size = readInt();
-					retValue = desc.className + "[" + size + "]";
+					// TODO int size = readInt();
+					retValue = desc.className;; // TODO + "[" + size + "]";
 				}
 				break;
 			case TC_STRING: {
+					System.out.println("X4");
 					String str = readUtf();
-					System.out.println("X4 " + str);
 					retValue = str;
 				}
 				break;
@@ -218 +213 @@
 					desc.serialVersionUID = readLong();
 					desc.flags = readByte();
 					desc.isClass = true;
-					desc.variables = fields();
+					desc.setVariables(fields());
+					
+					if (actClass == null) {
+						actClass = desc;
+					}
+					// TODO
+					actClass.addParent(desc);
+					
 					// TODO object(null); classDesc();
-					System.out.println(desc.toString());
+					// TODO System.out.println(desc.toString());
 					retValue = desc;
 				}
 				break;
@@ -237 +239 @@
 					// TODO
 					System.out.println("---NULL---");
 					retValue = null;
+					
+					classes.add(actClass);
+					actClass = null;
+					while (true) {
+						Variable actVar = classes.get(classes.size() - 1).getActVariable();
+						if (actVar == null) {
+							break;
+						}
+						
+						switch (actVar.getType()) {
+						case 'B': actVar.setValue(readByte()); break;
+						case 'C': actVar.setValue((char) readByte()); break;
+						case 'D': actVar.setValue(readDouble()); break;
+						case 'F': actVar.setValue(readFloat()); break;
+						case 'I': actVar.setValue(readInt()); break;
+						case 'J': actVar.setValue(readLong()); break;
+						case 'S': actVar.setValue(readShort()); break;
+						case 'Z': actVar.setValue(readBoolean()); break;
+						case '[':
+							// int count = readShort();
+							// TODO
+							for (int i = 0; i < 3; i++) {
+								object();
+								// System.out.println("DEF: " + " " + (char) xxx + " " + xxx);
+							}
+							int count = readInt();
+							System.out.println("------------- VELIKOST POLE = " + count);
+							for (int i = 0; i < count; i++) {
+								System.out.println("------------- HODNOTA = " + (char) readShort());
+							}
+							//actVar.setValue(readByte());
+							break;
+						case 'L': actVar.setValue(object()); break;
+						}
+					}
 				}
 				break;
 			case TC_REFERENCE: {
@@ -286 +323 @@
 		return retValue;
 	}
 	
-	public List<String> fields() {
-		List<String> rows = new ArrayList<String>();
+	public List<Variable> fields() {
+		List<Variable> variables = new ArrayList<Variable>();
 		
 		short count = readShort();
 		for (int i = 0; i < count; i++) {
 			char type = (char) readByte();
-			
-			String row;
-			if (primTypeCodes.containsKey(type)) {
-				row = primTypeCodes.get(type) + " " + readUtf();
-			} else {
-				String variable = readUtf();
-				String dataType = (String) object();
-				dataType = dataType.substring(1);
-				
-				if (primTypeCodes.containsKey(dataType.charAt(0)))
-					dataType = primTypeCodes.get(dataType.charAt(0)); // remove type
-				
-				row = dataType + " " + variable;
-				if (objTypeCodes.get(type) == "array")
-					row += "[]";
-			}
-			
-			rows.add(row);
+			String variable = readUtf();
+			String typeName = null;
+			if (!DataType.isPrimaryType(type))
+				typeName = (String) object();
+			variables.add(new Variable(type, variable, typeName));
 		}
 		
-		return rows;
+		return variables;
 	}
 	
 }

demo_mh/Deserializer/src/deserialize/Report.java

@@ +1 @@
+package deserialize;
+import com.sun.javafx.stage.StageHelper;
+
+import javafx.application.Platform;
+import javafx.geometry.Rectangle2D;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Alert.AlertType;
+import javafx.stage.Screen;
+
+public class Report {
+	
+	private static final int HEIGHT = 200;
+	private static final int WIDTH = 500;
+	
+	private static void setPosition(Alert alert) {
+		if (StageHelper.getStages() != null && StageHelper.getStages().size() != 0) {
+			if (Screen.getPrimary() != null && Screen.getPrimary().getVisualBounds() != null) {
+				Rectangle2D primScreenBounds = Screen.getPrimary().getVisualBounds();
+				alert.setX((primScreenBounds.getWidth() - WIDTH - 20) / 2);
+		        alert.setY((primScreenBounds.getHeight() - HEIGHT - 20) / 3);
+			}
+			alert.initOwner(StageHelper.getStages().get(StageHelper.getStages().size() - 1));
+		}
+	}
+	
+	private static Alert createAlert(AlertType type, String title, String header, String content) {
+		Alert alert = new Alert(type);
+		alert.setResizable(true);
+		alert.getDialogPane().setPrefWidth(WIDTH);
+		alert.setTitle(title);
+		alert.setHeaderText(header);
+		alert.setContentText(content);
+		setPosition(alert);
+		return alert;
+	}
+	
+	public static void error(String title, String header, String content) {
+		Platform.runLater(()->{
+			createAlert(AlertType.WARNING, title, header, content).showAndWait();
+        });
+	}
+	
+	public static void info(String title, String header, String content) {
+		Platform.runLater(()->{
+			createAlert(AlertType.INFORMATION, title, header, content).showAndWait();
+        });
+	}
+	
+	public static boolean confirm(String title, String header, String content) {
+		Alert alert = createAlert(AlertType.CONFIRMATION, title, header, content);
+		alert.showAndWait();
+		if (alert.getResult().getText().equals("OK")) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+	
+}

demo_mh/Deserializer/src/deserialize/ToJSON.java

@@ -1 +1 @@
 package deserialize;
 
+import java.io.BufferedInputStream;
 import java.io.BufferedWriter;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.io.ObjectInputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
 
-import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 
-import general.Constants;
-
 public class ToJSON extends Thread {
 	
+	private File input;
+	private File output;
+	
 	private byte buffer[];
 	
-	public ToJSON(byte buffer[]) {
-		this.buffer = buffer;
+	public ToJSON(File inputFilename, File outputFilename) {
+		this.input = inputFilename;
+		this.output = outputFilename;
 	}
 	
 	@Override
 	public void run() {
 		super.run();
 		
-		List<Byte> buffer = new ArrayList<Byte>();
-		for (int i = 0; i < this.buffer.length; i++) {
-			buffer.add(this.buffer[i]);
+		buffer = readByteArray();
+		if (buffer == null) {
+			// TODO Chyba na??t?n? dat
+		} else if (deserializeClassically()) {
+			// TODO Chyba klasick? deserializace
+		} else {
+			// Univerzalni deserializer.
+			convert();
 		}
+	}
+	
+	private void convert() {
+		System.out.println("Spoustim univerzalni deserializer.");
 		
 		Grammar g = new Grammar(buffer);
-		g.start();
-
-		/*for (int i = 0; i < buffer.length; i++) {
-			if (buffer[i] == TC_CLASSDESC) {
-				// Class name
-				int nameLength = Formatter.createInt(buffer[++i], buffer[++i]);
-				String name = new String(buffer, ++i, nameLength);
-				i += nameLength - 1;
-				System.out.println(name);
-				
-				// UID
-				ByteBuffer toLong = ByteBuffer.allocate(Long.BYTES);
-				toLong.put(buffer, i + 1, 8);
-				toLong.flip();
-		        System.out.println(toLong.getLong());
-		        
-		        // implements ...
-				i += 9;
-				System.out.println(buffer[i] == SC_SERIALIZABLE);
-				
-				// Variables
-				int vCount = Formatter.createInt(buffer[++i], buffer[++i]);
-				for (int j = 0; j < vCount; j++) {
-					// Type
-					char vType = (char) (buffer[++i]);
-					// Name
-					int vNameLength = Formatter.createInt(buffer[++i], buffer[++i]);
-					String vName = new String(buffer, ++i, vNameLength);
-					i += vNameLength - 1;
-					// toString()
-					System.out.println(typeCodes.get(vType) + " " + new String(vName));
-				}
-				
-				// TODO
-				System.out.println(buffer[++i] == TC_ENDBLOCKDATA);
-			}
-		}*/
+		JSONObject results = g.process();
+		
+		save(results);
+		
+		System.out.println("JSON byl vytvoren.");
 	}
 	
-	@SuppressWarnings("unchecked")
-	private void save() {
+	private boolean deserializeClassically() {
+		try {
+			
+			// Try to deserialize classically.
+			ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(buffer));
+			@SuppressWarnings("unused")
+			Deserializer d = (Deserializer) ois.readObject();
+			System.out.println("Klasicka deserializace probehla v poradku.");
+			ois.close();
+			
+		} catch (IOException e) {
+			
+			// Stream error.
+			System.out.println("Chyba pri otevirani (uzavirani) streamu pri pokusu o klasickou deserializaci.");
+			e.printStackTrace();
+			
+		} catch (Exception e) {
+			
+			// Others: ClassNotFoundException, ClassCastException, ...
+			// Usually due to problems with classical deserialization.
+			return false;
+			
+		}
+		return true;
+	}
+	
+	private byte[] readByteArray() {
+		byte array[] = null;
+		
 		/*
-		JSONObject countryObj = new JSONObject();
-        countryObj.put("Name", "India");
-        countryObj.put("Population", new Integer(1000000));
- 
-        JSONArray listOfStates = new JSONArray();
-        listOfStates.add("Madhya Pradesh");
-        listOfStates.add("Maharastra");
-        listOfStates.add("Rajasthan");
- 
-        countryObj.put("States", listOfStates);
- 
+		 * Note.
+		 * For ZIP - the first four bytes should be one of the following combinations:
+		 *     50 4B 03 04
+		 *     50 4B 05 06 (empty archive)
+		 *     50 4B 07 08 (spanned archive)
+		 * Source: https://en.wikipedia.org/wiki/List_of_file_signatures
+		 */
+		ZipInputStream zipInputStream = null;
+		ZipEntry entry = null;
+	    try {
+	    	zipInputStream = new ZipInputStream(new FileInputStream(input));
+	    	entry = zipInputStream.getNextEntry();
+			System.out.println("Velikost ZIP dat je " + entry.getSize() + "B.");
+		} catch (Exception e) {
+			System.out.println("Soubor neni zazipovany...");
+		}
+	    
+	    try {
+	    	if (entry != null) {
+		    	array = new byte[(int) entry.getSize()];
+				zipInputStream.read(array);
+				zipInputStream.close();
+		    } else {
+		    	array = new byte[(int) input.length()];
+				BufferedInputStream bis = new BufferedInputStream(new FileInputStream(input));
+				bis.read(array);
+				bis.close();
+		    }
+	    	System.out.println("Byty ze souboru byly v poradku nacteny.");
+	    } catch (IOException e) {
+	    	System.out.println("Pri nacitani bytu doslo k chybe.");
+	    	return null;
+	    }
+	    
+	    return array;
+	}
+	
+	private void save(JSONObject obj) {
         try {
-            // Writing to a file
-            FileWriter fw = new FileWriter(Constants.JSON_FILE);
+            FileWriter fw = new FileWriter(output);
             BufferedWriter bw = new BufferedWriter(fw);
-            System.out.println("Zapisuji JSON objekt do souboru.");
-            bw.write(countryObj.toJSONString());
+            bw.write(obj.toJSONString());
             bw.flush();
             bw.close();
+            Report.info("JSON", null, "Ulo?en? souboru prob?hlo v po??dku.");
         } catch (IOException e) {
             e.printStackTrace();
+            Report.info("JSON", null, "P?i ukl?d?n? souboru nastala chyba.");
         }
-        */
 	}
 	
 }

demo_mh/Deserializer/src/deserialize/Variable.java

@@ +1 @@
+package deserialize;
+
+import org.json.simple.JSONObject;
+
+public class Variable {
+	
+	private char type;
+	private String variable;
+	private String typeName;
+	private Object value = null;
+	
+	public Variable(char type, String variable, String typeName) {
+		this.type = type;
+		this.variable = variable;
+		this.typeName = typeName;
+		
+		if (!DataType.primTypeCodes.containsKey(type)) {
+			if (typeName.contains("/")) {
+				typeName = typeName.substring(typeName.lastIndexOf("/") + 1, typeName.length() - 1);
+			} else {
+				System.out.println(typeName);
+				typeName = typeName.substring(1);
+			}
+
+			if (typeName.length() == 1 && DataType.primTypeCodes.containsKey(typeName.charAt(0)))
+				typeName = DataType.primTypeCodes.get(typeName.charAt(0)); // remove type
+			
+			this.typeName = typeName;
+		}
+	}
+	
+	public char getType() {
+		return type;
+	}
+	
+	public boolean isValueSet() {
+		return value != null;
+	}
+	
+	public void setValue(Object value) {
+		this.value = value;
+	}
+	
+	@SuppressWarnings("unchecked")
+	public void putToJSON(JSONObject obj) {
+		if (value != null) {
+			if (value.getClass().toString().equals(ClassDescription.class.toString())) {
+				ClassDescription desc = (ClassDescription) value;
+				obj.put(variable, desc.getJSONObject());
+			} else {
+				obj.put(variable, value);
+			}
+		} else {
+			obj.put(variable, "NON_IMPLEMENTED");
+		}
+	}
+	
+	@Override
+	public String toString() {
+		String result;
+		
+		if (DataType.primTypeCodes.containsKey(type)) {
+			result = DataType.primTypeCodes.get(type) + " " + variable;
+		} else {
+			result = typeName + " " + variable;
+			if (DataType.objTypeCodes.get(type) == "array")
+				result += "[]";
+		}
+		
+		if (value != null) {
+			result += " = ";
+			if (value.getClass().toString().equals(ClassDescription.class.toString())) {
+				ClassDescription desc = (ClassDescription) value;
+				result += desc.toString();
+			} else {
+				result += value;
+			}
+		}
+		
+		return result;
+	}
+
+}

demo_mh/Deserializer/src/general/Constants.java

@@ -1 @@
-package general;
-
-public class Constants {
-
-	public static String SERIALIZED_FILE = "data.out";
-	public static String JSON_FILE = "results.json";
-	
-}

demo_mh/Deserializer/src/serialize/Contain.java

@@ -6 +6 @@
 
 	private static final long serialVersionUID = 1L;
 	
-	char array[] = new char[] {'W', 'X', 'Y', 'Z'};
+	// TODO jeste nefunguje char array[] = new char[] {'W', 'X', 'Y', 'Z'};
+	float realNum = 15.6f;
 	
 }

demo_mh/Deserializer/src/serialize/Example.java

@@ -1 +1 @@
 package serialize;
 
+import java.io.File;
 import java.io.FileOutputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
-import general.*;
-
 public class Example extends Parent implements Serializable {
 	
 	private static final long serialVersionUID = 1L;
-	
-	private int numberx = 7;
+	public static String SERIALIZED_FILE = "data.out";
+
+	private int numberX = 7;
 	Contain variable = new Contain();
 	float x = 10;
-	// TODO chyba char y[] = new char[5];
-	// char y[] = {'B'};
 	
 	public long getNumber() {
-		return numberx;
+		return numberX;
 	}
-
-	public static void main(String[] args) {
+	
+	public static boolean serialize(File file) {
+		boolean retValue = false;
 		try {
-			FileOutputStream fos = new FileOutputStream(Constants.SERIALIZED_FILE);
+			FileOutputStream fos = new FileOutputStream(file);
 			ObjectOutputStream oos = new ObjectOutputStream(fos);
 			Example s = new Example();
 			oos.writeObject(s);
 			oos.flush();
 			oos.close();
-			System.out.println("File " + Constants.SERIALIZED_FILE + " created.");
+			System.out.println("File " + SERIALIZED_FILE + " created.");
 			
 			/*
+			--- DESERIALIZATION ---
 			FileInputStream fis = new FileInputStream(Constants.FILE_NAME);
 			ObjectInputStream ois = new ObjectInputStream(fis);
 			s = (Example) ois.readObject();
 			System.out.println("DATA: " + s.string + " " + s.number + " " + Arrays.toString(s.variable.array));
 			ois.close();
 			*/
+			
+			retValue =  true;
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
+		return retValue;
+	}
+
+	public static void main(String[] args) {
+		serialize(new File(SERIALIZED_FILE));
 	}
 
 }

demo_mh/Deserializer/src/serialize/Parent.java

@@ -6 +6 @@
 
 	private static final long serialVersionUID = 1L;
 	
-	String string = "ABCD";
+	String str = "ABCD";
 	
 }