Revize 98da6ab0

re #7895

Ukládání určitých dat do configu. Konkrétně nastavení editoru a základní konfigurace DB spojení. Vyřešeny problémy při exportu do .jar.

project/Deserializer/src/Deserializer.java

@@ -1 +1 @@
 import java.io.File;
+import java.util.Properties;
 
 import io.Database.DB_Messenger;
 import io.FileWorker;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
@@ -47 +49 @@
 	private VBox outputLayout;
 	
 	private Converter converter;
+	private Properties properties;
 	
 	@Override
 	public void init() throws Exception {
 		super.init();
 		converter = new Converter(this);
 		converter.start();
+		properties = FileWorker.getConfig();
 	}
 	
 	@Override
@@ -60 +64 @@
 		super.stop();
 		converter.end();
 		converter.join();
+		FileWorker.saveConfig(properties);
 		Platform.exit();
 	}
 	
 	@Override
 	public void start(Stage stage) throws Exception {
 		this.stage = stage;
-		stage.getIcons().add(new Image(getResource("logo.png")));
+		stage.getIcons().add(new Image(FileWorker.getResource("/logo.png")));
 		stage.setTitle("Java Object Universal Deserializer");
 		stage.setScene(createScene());
 		stage.show();
@@ -82 +87 @@
 	private Scene createScene() {
 		createMenu();
 		Scene scene = new Scene(createLayout());
-		scene.getStylesheets().add(getResource("main.css"));
+		scene.getStylesheets().add(FileWorker.getResource("/main.css"));
 		return scene;
 	}
 	
@@ -104 +109 @@
         
         editor = new Editor();
         
+        String propMode = properties.getProperty(FileWorker.ACE_MODE);
+        String propTheme = properties.getProperty(FileWorker.ACE_THEME);
+        
+        ObservableList<String> aceModes = FXCollections.observableArrayList();
+        ObservableList<String> aceThemes = FXCollections.observableArrayList();
+        FileWorker.getAceModesAndThemes(aceModes, aceThemes);
+        
         ComboBox<String> modeBox = new ComboBox<String>();
-        modeBox.setItems(FileWorker.getAceModes());
-        modeBox.getSelectionModel().select(Editor.DEFAULT_MODE);
+        modeBox.setItems(aceModes);
+        modeBox.getSelectionModel().select(propMode == null ? Editor.DEFAULT_MODE : propMode);
         modeBox.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
-        	if (newValue != null && oldValue != newValue) {
+        	if (modeBox.getValue() != null) {
+        		properties.setProperty(FileWorker.ACE_MODE, modeBox.getValue());
         		editor.setMode(modeBox.getValue());
             }
         });
         
         ComboBox<String> themeBox = new ComboBox<String>();
-        themeBox.setItems(FileWorker.getAceThemes());
-        themeBox.getSelectionModel().select(Editor.DEFAULT_THEME);
+        themeBox.setItems(aceThemes);
+        themeBox.getSelectionModel().select(propTheme == null ? Editor.DEFAULT_THEME : propTheme);
         themeBox.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
-        	if (newValue != null && oldValue != newValue) {
+        	if (themeBox.getValue() != null) {
+        		properties.setProperty(FileWorker.ACE_THEME, themeBox.getValue());
         		editor.setTheme(themeBox.getValue());
             }
         });
@@ -184 +198 @@
 	}
 	
 	private Tab createQueryTab() {
+		String propType = properties.getProperty(FileWorker.DB_TYPE);
+		String propUrl = properties.getProperty(FileWorker.DB_URL);
+		String propUser = properties.getProperty(FileWorker.DB_USER);
+        
+		
 		String promptTexts[] = new String[] { "jdbc:mysql://server/nazevDB", "jdbc:oracle:thin:@server:port:nazevDB" };
 		
 		Label rdbmsLabel = new Label("Typ DB");
 		Label urlLabel = new Label("URL");
 		ComboBox<String> rdbms = new ComboBox<String>(FXCollections.observableArrayList(new String[] { "MySQL", "ORACLE" }));
-		TextField url = new TextField();
-		
+		TextField url = new TextField(propUrl == null ? "" : propUrl);
+		
+		if (propType == null) {
+			rdbms.getSelectionModel().selectFirst();
+			url.setPromptText(promptTexts[0]);
+		} else {
+			rdbms.getSelectionModel().select(propType);
+			url.setPromptText(promptTexts[rdbms.getItems().indexOf(propType)]);
+		}
 		rdbms.setOnAction(event -> {
 			url.setPromptText(promptTexts[rdbms.getSelectionModel().getSelectedIndex()]);
 		});
 		
-		rdbms.getSelectionModel().selectFirst();
-		url.setPromptText(promptTexts[0]);
+		
 
 		
 		Label userLabel = new Label("Uživatel");
 		Label passwordLabel = new Label("Heslo");
-		TextField user = new TextField();
+		TextField user = new TextField(propUser == null ? "" : propUser);
 		PasswordField password = new PasswordField();
 		
 		VBox rdbmsLayout = new VBox();
@@ -256 +281 @@
 		
 		Button setQuery = new Button("Spustit");
 		setQuery.setOnAction(event -> {
+			String urlStr = url.getText().trim();
+			String userStr = user.getText().trim();
+			properties.setProperty(FileWorker.DB_TYPE, rdbms.getValue());
+			properties.setProperty(FileWorker.DB_URL, urlStr);
+			properties.setProperty(FileWorker.DB_USER, userStr);
+			
 			String driver = rdbms.getValue().equals("MySQL") ? "com.mysql.cj.jdbc.Driver" : "oracle.jdbc.driver.OracleDriver";
-			converter.setInput(null, new DB_Messenger(driver, url.getText().trim(), user.getText().trim(), password.getText().trim(),
+			converter.setInput(null, new DB_Messenger(driver, urlStr, userStr, password.getText().trim(),
 					table.getText().trim(), cond.getText().trim(), column.getText().trim()));
 		});
 		
@@ -320 +351 @@
 		this.fullScreen = (Label) fullScreen.getGraphic();
 		changeFullScreenMenuItem();
         
-        MenuItem close = createMenuItem("Ukončit", getResource("close.png"), new KeyCodeCombination(KeyCode.E, KeyCombination.CONTROL_DOWN));
+        MenuItem close = createMenuItem("Ukončit", FileWorker.getResource("/close.png"), new KeyCodeCombination(KeyCode.E, KeyCombination.CONTROL_DOWN));
         close.setOnAction(event -> {
 			Platform.exit();
 		});
@@ -334 +365 @@
 	
 	private void changeFullScreenMenuItem() {
 		fullScreen.setText(stage.isFullScreen() ? "Normální zobrazení" : "Plné zobrazení");
-		fullScreen.setGraphic(new ImageView(stage.isFullScreen() ? getResource("normal.png") : getResource("full.png")));
+		fullScreen.setGraphic(new ImageView(stage.isFullScreen() ? FileWorker.getResource("/normal.png") : FileWorker.getResource("/full.png")));
 	}
 	
 	private MenuItem createMenuItem(String name, String icon, KeyCodeCombination keyCodeComb) {
@@ -356 +387 @@
 		outputLayout.setDisable(disable);
 	}
 	
-	private String getResource(String path) {
-		return Deserializer.class.getResource(path).toString();
-	}
-	
 	@Override
 	public void loadingInputFileError() {
 		Platform.runLater(()->{
@@ -374 +401 @@
 			
 			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?")) {
+			if (!showData && loaded != null && loaded.length() > 0 &&
+					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;