Revize a5d16f0a

re #7879 release v0.2

release v0.2

project/Deserializer/src/Deserializer.java

@@ -1 +1 @@
 import java.io.File;
-import java.io.IOException;
+import java.net.URL;
+import java.util.concurrent.atomic.AtomicReference;
 
 import io.FileWorker;
 import javafx.application.Application;
@@ -18 +19 @@
 import javafx.scene.control.MenuBar;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.ProgressIndicator;
+import javafx.scene.control.ScrollPane;
 import javafx.scene.control.Separator;
 import javafx.scene.control.SeparatorMenuItem;
-import javafx.scene.control.Alert.AlertType;
+import javafx.scene.effect.BlendMode;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
+import javafx.scene.input.Clipboard;
+import javafx.scene.input.DataFormat;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyCodeCombination;
 import javafx.scene.input.KeyCombination;
@@ -31 +35 @@
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.VBox;
+import javafx.scene.paint.Color;
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
 import javafx.stage.FileChooser;
@@ -41 +46 @@
  */
 public class Deserializer extends Application implements IConversionResults {
 	
+	public static boolean blockFocusProperty = false;
+	
 	private Stage stage;
 	private Label fullScreen;
+	
 	private WebEngine webEngine;
 	private VBox outputLayout;
 	
+	private ProgressIndicator clipBoardIndicator;
+	private Label clipBoardResults;
+	private Button setInputFromCB;
+	private String lastClipBoardData;
+	
 	private Converter converter;
+	private AtomicReference<jDeserializeResults> results;
 	
 	// TODO delete after deserializer debugging is complete...
 	private File defaultInput = new File("a2");
 	private File defaultOutput = new File("results.json");
 	private boolean testing;
 	
-	public static void main(String[] args) {
-		launch(args);
-	}
-
 	@Override
 	public void init() throws Exception {
 		super.init();
-		testing = true;
+		testing = false;
+		lastClipBoardData = null;
 		converter = new Converter(this);
 		converter.start();
+		results = new AtomicReference<jDeserializeResults>(new jDeserializeResults());
 	}
 	
 	@Override
@@ -75 +87 @@
 	@Override
 	public void start(Stage stage) throws Exception {
 		this.stage = stage;
-		stage.getIcons().add(new Image("img/logo.png"));
+		stage.getIcons().add(new Image(getResource("logo.png")));
 		stage.setTitle("Java Object Universal Deserializer");
 		stage.setScene(createScene());
 		stage.setMinWidth(400);
@@ -85 +97 @@
 			changeFullScreenMenuItem();
 		});
 		
-		stage.focusedProperty().addListener(new ChangeListener<Boolean>()
-		{
+		stage.focusedProperty().addListener(new ChangeListener<Boolean>() {
 			@Override
-			public void changed(ObservableValue<? extends Boolean> obs, Boolean oldValue, Boolean newValue)
-			{
-				System.out.println(newValue);
-				
-				/*
-		    	byte arr[] = FileWorker.loadByteArray(new File("b2"));
-		    	byte arr2[] = FileWorker.loadByteArray(new File("b"));
-		    	
-		    	byte con[] = FileWorker.load(new File("b"));
-		    	
-		    	if (arr.length == arr2.length && arr2.length == con.length) {
-		    		System.out.println("TRRUE");
-		    		for (int i = 0; i < arr.length; i++) {
-		    			if (arr[i] != arr2[i] || arr2[i] != con[i]) {
-		    				System.out.println("CHCHYBA!!!");
-		    				break;
-		    			}
-		    		}
-		    	}
-		    	System.out.println("COMPLETE");
-		    	*/
-		    	/*Set<DataFormat> types = Clipboard.getSystemClipboard().getContentTypes();
-		    	System.out.println("Detected types: " + types.size());
-		    	for (DataFormat s : types) {
-		    	        System.out.println(s);
-		    	}
-		    	
-		    	try {
-		    		byte[] orig = FileWorker.loadByteArray(new File("b"));
-		    		//byte[] orig = FileWorker.getBBB();
-					
+			public void changed(ObservableValue<? extends Boolean> obs, Boolean oldValue, Boolean newValue) {
+				if (newValue && !blockFocusProperty) {
+					// Available data formats.
+					/*Set<DataFormat> types = Clipboard.getSystemClipboard().getContentTypes();
+					System.out.println("Detected types: " + types.size());
+			    	for (DataFormat s : types) {
+			    		System.out.println(s);
+			    	}*/
+			    	
 					DataFormat df = DataFormat.lookupMimeType("text/plain");
 			    	if (df != null) {
-			    		// System.out.println(Clipboard.getSystemClipboard().getContent(df).getClass());
 			    		String data = (String) Clipboard.getSystemClipboard().getContent(df);
-			    		byte[] buffer = data.getBytes();
-			    		
-			    		boolean changeBites = false;
-			    		
-			    		List<Byte> bl = new ArrayList<Byte>();
-			    		for (int i = 0; i < buffer.length; i++) {
-			    			if (changeBites) {
-			    				buffer[i] = (byte) ((buffer[i] & 0x0F) | 0xE0);
-			    				changeBites = false;
-			    			} else if (buffer[i] == (byte) 0xC2 || buffer[i] == (byte) 0x0D) {
-			    				continue;
-			    			} else if (buffer[i] == (byte) 0xC3) {
-			    				changeBites = true;
-			    				continue;
-			    			}
-			    			bl.add(buffer[i]);
-			    		}
 			    		
-			    		System.out.println(bl.size() + " " + orig.length);
-			    		for (int i = 0; i < orig.length; i++) {
-			    			if (bl.get(i) != orig[i]) {
-			    				System.out.println(i);
-			    				for (int j = i - 1; j < i + 50; j++) {
-			    					System.out.println(String.format("%02X", bl.get(j)) + " " + String.format("%02X", orig[j]));
-				    			}
-			    				break;
-			    			}
-			    		}
+			    		if (lastClipBoardData == null) {
+		    				lastClipBoardData = data;
+		    			} else if (data.equals(lastClipBoardData)) {
+		    				return;
+		    			}
+		    			
+		    			changeIndicatorState(false, false);
+			    		setInputFromCB.setDisable(true);
+			    		converter.setInput(null, data, true);
 			    	}
-				} catch (Exception e) {
-					e.printStackTrace();
-				}*/
+				}
 			}
 		});
-		
-		//tests
-		//Converter thread = new Converter(this, new File("simple_arrays.out"), new File("bcha.json"));
-		//thread.start();
 	}
 	
 	private Scene createScene() {
 		createMenu();
 		Scene scene = new Scene(createLayout());
-		scene.getStylesheets().add("css/main.css");
+		scene.getStylesheets().add(getResource("main.css"));
 		return scene;
 	}
 	
@@ -189 +153 @@
 			inputFile = new Label(defaultOutput.getAbsolutePath());
 			inputFile.setStyle("-fx-font-weight: bold;");
 		}
-		// TODO inputFile.setPrefWidth(400);
-		inputFile.setWrapText(true);
+		inputFile.setPrefWidth(500); // Value to cut the text.
+		inputFile.setMaxWidth(Double.MAX_VALUE);
 		
 		Button setInputFile = new Button("Vstupní soubor");
 		setInputFile.setOnAction(event -> {
+			Deserializer.blockFocusProperty = true; // TODO Prohibition to process the selected file.
 			if (testing) {
-				converter.setInput(defaultInput);
+				converter.setInput(defaultInput, null, false);
 			} else {
 				FileChooser fCh = new FileChooser();
 				fCh.setInitialDirectory(new File("."));
@@ -208 +173 @@
 					inputFile.setText(file.getAbsolutePath());
 					inputFile.setStyle("-fx-font-weight: bold;");
 					
-					converter.setInput(file);
+					converter.setInput(file, null, false);
 				}
 			}
+			Deserializer.blockFocusProperty = false;
 		});
 		
 		HBox bIF = new HBox();
@@ -222 +188 @@
 		forInput.getChildren().addAll(forInputFile, inputFile, bIF);
 		
 		
+		clipBoardIndicator = new ProgressIndicator();
+		clipBoardIndicator.setMaxSize(38, 38);
+		clipBoardIndicator.setVisible(false);
+		clipBoardResults = new Label();
+		clipBoardResults.setMaxSize(38, 38);
+		clipBoardResults.setVisible(false);
+		HBox clipBoardStateLayout = new HBox();
+		clipBoardStateLayout.setSpacing(0);
+		clipBoardStateLayout.setMinSize(38, 38);
+		clipBoardStateLayout.setMaxSize(38, 38);
+		clipBoardStateLayout.getChildren().addAll(clipBoardResults, clipBoardIndicator);
+		
 		Label forClipBoardInput = new Label("Vstup ze schránky");
-		ProgressIndicator indicator = new ProgressIndicator();
-		indicator.setMaxHeight(38); // TODO
-		Button setInputAccToCB = new Button("Použít");
-		setInputAccToCB.setOnAction(event -> {
-			// TODO
+		setInputFromCB = new Button("Použít");
+		setInputFromCB.setOnAction(event -> {
+			setInputFromCB.setDisable(true);
+			results.get().merge();
+			webEngine.loadContent(results.get().getHtml(), "text/html");
+			setOutputLayoutDisabled(false);
 		});
+		setInputFromCB.setDisable(true);
 		
 		HBox indicatorLayout = new HBox();
 		Region region2 = new Region();
         HBox.setHgrow(region2, Priority.ALWAYS);
-		indicatorLayout.getChildren().addAll(forClipBoardInput, region2, indicator);
+		indicatorLayout.getChildren().addAll(forClipBoardInput, region2, clipBoardStateLayout);
 		
 		HBox bInputCB = new HBox();
 		bInputCB.setAlignment(Pos.CENTER_RIGHT);
-		bInputCB.getChildren().add(setInputAccToCB);
+		bInputCB.getChildren().add(setInputFromCB);
 		
 		VBox forInput2 = new VBox();
 		forInput2.setSpacing(5.0);
@@ -258 +238 @@
 		
 		Button setOutputFile = new Button("Uložit");
 		setOutputFile.setOnAction(event -> {
+			Deserializer.blockFocusProperty = true; // TODO Prohibition to process the selected file.
 			File jsonFile = null;
 			
 			if (testing) {
@@ -274 +255 @@
 				}
 			}
 			
-			if (jsonFile != null && webEngine.getDocument() != null) {
+			if (jsonFile != null && results.get().contains(false)) {
 				String title = "Uložení JSON";
 				try {
-					FileWorker.saveJson(jsonFile, "Ahoj"/* TODO webEngine.getDocument().getTextContent()*/);
+					FileWorker.saveJson(jsonFile, results.get().getJson());
 					Report.info(title, null, "Uložení JSON souboru proběhlo v pořádku.");
 				} catch (Exception e) {
 					Report.error(title, null, "Při ukládání JSON souboru nastala chyba.");
 				}
 			}
+			Deserializer.blockFocusProperty = false;
 		});
 		
 		HBox bOF = new HBox();
@@ -297 +279 @@
 		setOutputLayoutDisabled(true);
 		
 		
-		WebView resultantJson = new WebView();
+
+        WebView resultantJson = new WebView();
 		resultantJson.setPrefHeight(400);
 		webEngine = resultantJson.getEngine();
+		resultantJson.setBlendMode(BlendMode.DARKEN);
+		
 		
 		
 		
@@ -313 +298 @@
 		VBox layout = new VBox();
 		layout.setPadding(new Insets(10.0));
 		layout.setSpacing(10.0);
+		VBox.setVgrow(resultantJson, Priority.ALWAYS);
 		layout.getChildren().addAll(header, new Separator(), resultantJson, new Separator(), outputLayout);
 		
 		return layout;
@@ -328 +314 @@
 		this.fullScreen = (Label) fullScreen.getGraphic();
 		changeFullScreenMenuItem();
         
-        MenuItem close = createMenuItem("Ukončit", "img/close.png", new KeyCodeCombination(KeyCode.E, KeyCombination.CONTROL_DOWN));
+        MenuItem close = createMenuItem("Ukončit", getResource("close.png"), new KeyCodeCombination(KeyCode.E, KeyCombination.CONTROL_DOWN));
         close.setOnAction(event -> {
 			Platform.exit();
 		});
@@ -342 +328 @@
 	
 	private void changeFullScreenMenuItem() {
 		fullScreen.setText(stage.isFullScreen() ? "Normální zobrazení" : "Plné zobrazení");
-		fullScreen.setGraphic(new ImageView(stage.isFullScreen() ? "img/normal.png" : "img/full.png"));
+		fullScreen.setGraphic(new ImageView(stage.isFullScreen() ? getResource("normal.png") : getResource("full.png")));
 	}
 	
 	private MenuItem createMenuItem(String name, String icon, KeyCodeCombination keyCodeComb) {
@@ -364 +350 @@
 		outputLayout.setDisable(!testing && disable);
 	}
 	
+	private void changeIndicatorState(boolean showResults, boolean result) {
+		clipBoardIndicator.setVisible(!showResults);
+		if (showResults) {
+		    clipBoardResults.setGraphic(new ImageView(new Image(result ? getResource("ok.png") : getResource("error.png"))));
+		}
+	    clipBoardResults.setVisible(showResults);
+	}
+	
+	private String getResource(String path) {
+		return Deserializer.class.getResource(path).toString();
+	}
+	
 	@Override
 	public void loadingInputFileError() {
 		Platform.runLater(()->{
@@ -372 +370 @@
 	}
 
 	@Override
-	public void completed(final String json) {
+	public void completed(String html, String json, boolean testing) {
+		// HTML only for clip board content.
+		results.get().setData(html, json, testing);
+		
 		Platform.runLater(()->{
-			String _json = json;
-			setOutputLayoutDisabled(_json != null);
-			if (_json == null) {
-				_json = "--- Chyba při deserializaci! ---";
+			boolean result = results.get().contains(testing);
+			if (testing) {
+				changeIndicatorState(testing, result);
+				setInputFromCB.setDisable(!result);
+			} else {
+				BadHttpServer.getIntance().setHtmlString(result ? results.get().getHtml() : "<b>--- CHYBA PŘI DESERIALIZACI! ---</b>");
+				Platform.runLater(() -> webEngine.load(BadHttpServer.getIntance().getURL()));
+				// TODO webEngine.loadContent(html, "text/html");
+				setOutputLayoutDisabled(!result);
 			}
-			webEngine.loadContent(_json, "text/plain");
         });
 	}