Revize 5ae26965

re #7890

Tvora deamonů vyřešena přes použití ACE knihovny. Deamoni se tedy již nevytváří - knihovna se o plynulé zobrazení stará sama. Na základě zákazníkovi prosby zobrazovány i obsahy souborů bez serializovaných objektů, bylo potřeba rozšířit formátování - soubory mohou být opravdu různé, knihovna zvýrazňuje syntaxe u více jak 100 různých formátů.

project/Deserializer/src/Deserializer.java

@@ -1 +1 @@
 import java.io.File;
-import java.net.URL;
-import java.util.concurrent.atomic.AtomicReference;
 
 import io.FileWorker;
 import javafx.application.Application;
 import javafx.application.Platform;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
 import javafx.geometry.Insets;
-import javafx.geometry.Orientation;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
+import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.Menu;
 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.effect.BlendMode;
+import javafx.scene.control.Tab;
+import javafx.scene.control.TabPane;
+import javafx.scene.control.TabPane.TabClosingPolicy;
 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;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 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;
 import javafx.stage.Stage;
 
@@ -46 +36 @@
  */
 public class Deserializer extends Application implements IConversionResults {
 	
-	public static boolean blockFocusProperty = false;
-	
 	private Stage stage;
 	private Label fullScreen;
 	
-	private WebEngine webEngine;
+	private Editor editor;
 	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;
 	
 	@Override
 	public void init() throws Exception {
 		super.init();
-		testing = false;
-		lastClipBoardData = null;
 		converter = new Converter(this);
 		converter.start();
-		results = new AtomicReference<jDeserializeResults>(new jDeserializeResults());
 	}
 	
 	@Override
@@ -83 +57 @@
 		converter.end();
 		converter.join();
 		Platform.exit();
-		System.exit(0);
 	}
 	
 	@Override
@@ -92 +65 @@
 		stage.getIcons().add(new Image(getResource("logo.png")));
 		stage.setTitle("Java Object Universal Deserializer");
 		stage.setScene(createScene());
-		stage.setMinWidth(400);
 		stage.show();
+		
+		stage.setMinWidth(stage.getWidth());
+		stage.setMinHeight(stage.getHeight());
 
 		stage.fullScreenProperty().addListener((obs, oldState, newState) -> {
 			changeFullScreenMenuItem();
 		});
-		
-		stage.focusedProperty().addListener(new ChangeListener<Boolean>() {
-			@Override
-			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) {
-			    		String data = (String) Clipboard.getSystemClipboard().getContent(df);
-			    		
-			    		if (lastClipBoardData == null) {
-		    				lastClipBoardData = data;
-		    			} else if (data.equals(lastClipBoardData)) {
-		    				return;
-		    			}
-		    			
-		    			changeIndicatorState(false, false);
-			    		setInputFromCB.setDisable(true);
-			    		converter.setInput(null, data, true);
-			    	}
-				}
-			}
-		});
 	}
 	
 	private Scene createScene() {
@@ -145 +91 @@
 		return layout;
 	}
 	
-	private Parent createBodyLayout() {
-		Label forInputFile = new Label("Soubor k deserializaci:");
-		Label inputFile;
-		if (!testing) {
-			inputFile = new Label("    Ještě nebyl vybrán žádný soubor...");
-			inputFile.setStyle("-fx-font-style: italic;");
-		} else {
-			inputFile = new Label(defaultOutput.getAbsolutePath());
-			inputFile.setStyle("-fx-font-weight: bold;");
-		}
-		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, null, false);
-			} else {
-				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) {
-					setOutputLayoutDisabled(true);
-					
-					inputFile.setText(file.getAbsolutePath());
-					inputFile.setStyle("-fx-font-weight: bold;");
-					
-					converter.setInput(file, null, false);
-				}
-			}
-			Deserializer.blockFocusProperty = false;
-		});
-		
-		HBox bIF = new HBox();
-		bIF.setAlignment(Pos.CENTER_RIGHT);
-		bIF.getChildren().add(setInputFile);
-		
-		VBox forInput = new VBox();
-		forInput.setSpacing(5.0);
-		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");
-		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, clipBoardStateLayout);
-		
-		HBox bInputCB = new HBox();
-		bInputCB.setAlignment(Pos.CENTER_RIGHT);
-		bInputCB.getChildren().add(setInputFromCB);
-		
-		VBox forInput2 = new VBox();
-		forInput2.setSpacing(5.0);
-		forInput2.setMinWidth(175);
-		forInput2.getChildren().addAll(indicatorLayout, bInputCB);
-		
-		
-		
+	private Node createBodyLayout() {
+		TabPane header = new TabPane();
+        header.setTabClosingPolicy(TabClosingPolicy.UNAVAILABLE);
+        header.getTabs().add(createInputFileTab());
+        
+        
+        editor = new Editor();
+        
+        ComboBox<String> modeBox = new ComboBox<String>();
+        modeBox.setItems(FileWorker.getAceModes());
+        modeBox.getSelectionModel().select(Editor.DEFAULT_MODE);
+        modeBox.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
+        	if (newValue != null && oldValue != newValue) {
+        		editor.setMode(modeBox.getValue());
+            }
+        });
+        
+        ComboBox<String> themeBox = new ComboBox<String>();
+        themeBox.setItems(FileWorker.getAceThemes());
+        themeBox.getSelectionModel().select(Editor.DEFAULT_THEME);
+        themeBox.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
+        	if (newValue != null && oldValue != newValue) {
+        		editor.setTheme(themeBox.getValue());
+            }
+        });
+        
+        HBox aceSettings = new HBox();
+        aceSettings.setPadding(new Insets(0, 10, 0, 0));
+        aceSettings.setSpacing(10.0);
+        aceSettings.setAlignment(Pos.CENTER_RIGHT);
+        aceSettings.getChildren().addAll(new Label("Nastavení editoru (režim / téma):"), modeBox, new Label("/"), themeBox);
+        
+        VBox editorLayout = new VBox();
+        editorLayout.setSpacing(5.0);
+        editorLayout.getChildren().addAll(editor.getView(), aceSettings);
+        
+        
 		Label forOutputFile = new Label("Výstupní soubor:");
-		Label outputFile;
-		if (!testing) {
-			outputFile = new Label("    Ještě nebyl vybrán žádný soubor...");
-			outputFile.setStyle("-fx-font-style: italic;");
-		} else {
-			outputFile = new Label(defaultOutput.getAbsolutePath());
-			outputFile.setStyle("-fx-font-weight: bold;");
-		}
+		Label outputFile = new Label("    Ještě nebyl vybrán žádný soubor...");
+		outputFile.setStyle("-fx-font-style: italic;");
 		
-		Button setOutputFile = new Button("Uložit");
-		setOutputFile.setOnAction(event -> {
-			Deserializer.blockFocusProperty = true; // TODO Prohibition to process the selected file.
+		Button save = new Button("Uložit");
+		save.setOnAction(event -> {
 			File jsonFile = null;
 			
-			if (testing) {
-				jsonFile = defaultOutput;
-			} else {
-				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) {
-					jsonFile = file;
-					outputFile.setText(file.getAbsolutePath());
-					outputFile.setStyle("-fx-font-weight: bold;");
-				}
+			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) {
+				jsonFile = file;
+				outputFile.setText(file.getAbsolutePath());
+				outputFile.setStyle("-fx-font-weight: bold;");
 			}
 			
-			if (jsonFile != null && results.get().contains(false)) {
+			if (jsonFile != null) {
 				String title = "Uložení JSON";
 				try {
-					FileWorker.saveJson(jsonFile, results.get().getJson());
+					FileWorker.saveJson(jsonFile, editor.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();
 		bOF.setAlignment(Pos.CENTER_RIGHT);
-		bOF.getChildren().add(setOutputFile);
+		bOF.getChildren().add(save);
 		
 		outputLayout = new VBox();
+		outputLayout.setPadding(new Insets(0, 10, 10, 10));
 		outputLayout.setSpacing(5.0);
 		outputLayout.getChildren().add(forOutputFile);
 		outputLayout.getChildren().add(outputFile);
@@ -281 +170 @@
 		setOutputLayoutDisabled(true);
 		
 		
-
-        WebView resultantJson = new WebView();
-		resultantJson.setPrefHeight(400);
-		webEngine = resultantJson.getEngine();
-		resultantJson.setBlendMode(BlendMode.DARKEN);
-		
-		
-		
+		VBox layout = new VBox();
+		layout.setSpacing(10.0);
+		VBox.setVgrow(editor.getView(), Priority.ALWAYS);
+		layout.getChildren().addAll(header, new Separator(), editorLayout, new Separator(), outputLayout);
 		
-		HBox header = new HBox();
-		header.setSpacing(10.0);
-		HBox.setHgrow(forInput, Priority.ALWAYS);
-		header.getChildren().addAll(forInput, new Separator(Orientation.VERTICAL), forInput2);
+		return layout;
+	}
+	
+	private Tab createInputFileTab() {
+		Label forInputFile = new Label("Soubor k deserializaci:");
+		Label inputFile = new Label("    Ještě nebyl vybrán žádný soubor...");
+		inputFile.setStyle("-fx-font-style: italic;");
+		inputFile.setPrefWidth(500); // Value to cut the text.
+		inputFile.setMaxWidth(Double.MAX_VALUE);
 		
+		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) {
+				setOutputLayoutDisabled(true);
+				
+				inputFile.setText(file.getAbsolutePath());
+				inputFile.setStyle("-fx-font-weight: bold;");
+				
+				converter.setInput(file);
+			}
+		});
 		
+		HBox bIF = new HBox();
+		bIF.setAlignment(Pos.CENTER_RIGHT);
+		bIF.getChildren().add(setInputFile);
 		
-		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);
+		VBox forInput = new VBox();
+		forInput.setAlignment(Pos.CENTER_LEFT);
+		forInput.setPadding(new Insets(10, 10, 0, 10));
+		forInput.setSpacing(5.0);
+		forInput.getChildren().addAll(forInputFile, inputFile, bIF);
 		
-		return layout;
+		return new Tab("Soubor", forInput);
 	}
 	
 	private Node createMenu() {
@@ -349 +258 @@
 	}
 	
 	private void setOutputLayoutDisabled(boolean disable) {
-		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);
+		outputLayout.setDisable(disable);
 	}
 	
 	private String getResource(String path) {
@@ -372 +273 @@
 	}
 
 	@Override
-	public void completed(String html, String json, boolean testing) {
-		// HTML only for clip board content.
-		results.get().setData(html, json, testing);
-		
-		Platform.runLater(()->{
-			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);
+	public void completed(String html, String json, String loaded) {
+		Platform.runLater(() -> {
+			String _html = html; String _json = json;
+			
+			boolean showData = html != null && html.length() > 0 && json != null && json.length() > 0;
+			
+			if (!showData && Report.confirm("Výsledek deserializace", null, "Při deserializaci došlo k chybě. Je ale možné, že nejde o serializovaná data. Chcete zobrazit, co bylo načteno?")) {
+				_html = loaded.trim();
+				_json = loaded.trim();
+				showData = true;
+			}
+			
+			if (showData) {
+				editor.setContent(_html, _json);
+				setOutputLayoutDisabled(false);
 			}
         });
 	}