Add ctrl-s support and exit confirmation

Author: Pyrofab

src/ladysnake/translatorhelper/application/TranslationHelper.java

@@ -31,14 +31,21 @@ public class TranslationHelper extends Application {
 	private BorderPane borderPane;
 	private ContextMenu contextMenu;
 	private TableView<Map<String, String>> trTable;
+	
 	private Button wimpTrnslBtn;
+	private Button saveBtn;
 
 	@Override
 	public void start(Stage primaryStage) {
 		try {
 			this.stage = primaryStage;
+
+			control = new ControllerFx(this);
+
+			stage.setOnCloseRequest(control::onExit);
 
 			borderPane = new BorderPane();
+        	borderPane.setOnKeyPressed(control::onKeyPressed);
 
 			GridPane grid = new GridPane();
 			grid.setAlignment(Pos.CENTER);
@@ -47,23 +54,22 @@ public void start(Stage primaryStage) {
 			grid.setPadding(new Insets(10, 10, 10, 10));
 			borderPane.setTop(grid);
 
-			control = new ControllerFx(this);
-
 			Scene scene = new Scene(borderPane,900,400);
 			scene.getStylesheets().add(getClass().getResource("application.css").toExternalForm());
 
 			{	// load button
-		        Button loadbtn = new Button();
-		        loadbtn.setText("Load a lang folder");
-		        loadbtn.setOnAction(control::onChooseFolder);
-		        grid.add(loadbtn, 0, 0, 2, 1);
+		        Button loadBtn = new Button();
+		        loadBtn.setText("Load a lang folder");
+		        loadBtn.setOnAction(control::onChooseFolder);
+		        grid.add(loadBtn, 0, 0, 2, 1);
 	        }
 
 			{	// save button
-	        	Button savebtn = new Button();
-	        	savebtn.setText("Save");
-	        	savebtn.setOnAction(control::onSave);
-	        	grid.add(savebtn, 2, 0);
+	        	saveBtn = new Button();
+	        	saveBtn.setText("Save");
+	        	saveBtn.setOnAction(control::onSave);
+	        	saveBtn.setDisable(true);
+	        	grid.add(saveBtn, 2, 0);
 	        }
 
 			{
@@ -97,6 +103,7 @@ public void generateTable(ObservableList<Map<String, String>> allTranslations, S
 		trTable = new TableView<Map<String, String>>(allTranslations);
 		trTable.setEditable(true);
 		trTable.setContextMenu(contextMenu);
+		saveBtn.setDisable(false);
 		wimpTrnslBtn.setDisable(false);
 
         Callback<TableColumn<Map<String, String>, String>, TableCell<Map<String, String>, String>>

src/ladysnake/translatorhelper/controller/ControllerFx.java

@@ -7,10 +7,14 @@
 import javafx.event.ActionEvent;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
+import javafx.scene.control.ButtonType;
 import javafx.scene.control.Dialog;
 import javafx.scene.control.TableColumn.CellEditEvent;
 import javafx.scene.control.TextInputDialog;
+import javafx.scene.input.KeyCodeCombination;
+import javafx.scene.input.KeyEvent;
 import javafx.stage.DirectoryChooser;
+import javafx.stage.WindowEvent;
 import ladysnake.translatorhelper.application.TranslationHelper;
 import ladysnake.translatorhelper.model.Data;
 
@@ -20,22 +24,22 @@ public class ControllerFx {
 	private Data data;
 	private DirectoryChooser fileChooser;
 	private File langFolder;
-	private Pattern langFilesPattern;
+	
+	public static final Pattern LANG_PATTERN = Pattern.compile("^(\\w*?)_(.*?)\\.lang$");
 
 	public ControllerFx(TranslationHelper view) {
 		super();
 		this.view = view;
 		this.data = new Data();
 		fileChooser = new DirectoryChooser();
 		fileChooser.setInitialDirectory(new File("."));
-		langFilesPattern = Pattern.compile(".*?\\.lang$");
 	}
 
 	public void onChooseFolder(ActionEvent event) {
 		fileChooser.setTitle("Open Resource File");
 		langFolder = fileChooser.showDialog(view.getStage());
         if (langFolder != null) {
-            File[] langFiles = langFolder.listFiles(f -> f.isFile() && langFilesPattern.matcher(f.getName()).matches());
+            File[] langFiles = langFolder.listFiles(f -> f.isFile() && LANG_PATTERN.matcher(f.getName()).matches());
             data.load(langFiles);
             String[] langNames = new String[langFiles.length + 1];
             langNames[0] = Data.TRANSLATION_KEY;
@@ -50,15 +54,29 @@ public void onSave(ActionEvent event) {
 		data.save(langFolder);
 	}
 
+	public void onExit(WindowEvent event) {
+		if(data.isUnsaved()) {
+			Alert confirm = new Alert(AlertType.CONFIRMATION);
+			confirm.setHeaderText("You have some unsaved changes !");
+			confirm.setContentText("Press OK to ignore");
+			confirm.showAndWait().filter(b -> b == ButtonType.CANCEL).ifPresent(b -> event.consume());
+		}
+	}
+	
+	public void onKeyPressed(KeyEvent event) {
+		if(KeyCodeCombination.keyCombination("Ctrl+S").match(event))
+			data.save(langFolder);
+	}
+	
 	public void onJoker(ActionEvent event) {
 		try {
 			data.generateTranslation(view.getTable().getSelectionModel().getSelectedCells().get(0).getTableColumn().getText(), 
 					view.getTable().getSelectionModel().getSelectedIndex());
 			view.getTable().refresh();
 		} catch (NullPointerException | IndexOutOfBoundsException e) {
-			Alert d = new Alert(AlertType.WARNING);
+			Alert d = new Alert(AlertType.INFORMATION);
 			d.setTitle("No cell selected");
-			d.setContentText("Please select a cell to autocomplete");
+			d.setHeaderText("Please select a cell to autocomplete");
 			d.showAndWait();
 		}
 	}

src/ladysnake/translatorhelper/model/Data.java

@@ -13,13 +13,13 @@
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import ladysnake.translatorhelper.controller.ControllerFx;
 
 public class Data {
 
 	public static final String TRANSLATION_KEY = "translation key";
 
 	private static final Pattern TRANSLATION_PATTERN = Pattern.compile("(.*?)=(.*)");
-	private static final Pattern languageISO = Pattern.compile("^(\\w*?)_(.*)");
 
 	private Map<String, Boolean> editedFiles;
 	private ObservableList<Map<String, String>> translationList;
@@ -78,6 +78,10 @@ public void save(File folder) {
 		});
 	}
 
+	public boolean isUnsaved() {
+		return editedFiles.keySet().stream().anyMatch(editedFiles::get);
+	}
+	
 	private ObservableList<Map<String, String>> generateDataInMap(Map<String, Map<String, String>> translations) {
         ObservableList<Map<String, String>> allData = FXCollections.observableArrayList();
         translations.forEach((translatKey, values) -> {
@@ -120,7 +124,7 @@ public void addTranslation(String key) {
 	}
 
 	public void generateTranslation(String lang, int selectedRow) {
-		Matcher m1 = languageISO.matcher(lang);
+		Matcher m1 = ControllerFx.LANG_PATTERN.matcher(lang);
 		if(!m1.matches())
 			return;
 		String badTransl = TranslateAPI.translate(translationList.get(selectedRow).get("en_us.lang"), m1.group(1));

src/ladysnake/translatorhelper/model/TranslateAPI.java

@@ -9,6 +9,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javafx.scene.control.Alert;
+import javafx.scene.control.Alert.AlertType;
+
 /**
  * This class allows simple translation operations
  * @author Fabien
@@ -41,11 +44,19 @@ public static String translate(String sourceText, String targetLang, String sour
 				if(m3.matches())
 					ret = m3.group(1);
 			} catch (IOException e) {
-				System.err.println("Failed to retrieve answer. Maybe you are offline ?");
+				Alert d = new Alert(AlertType.ERROR);
+				d.setHeaderText("Failed to retrieve answer. Maybe you are offline ?");
+				d.setContentText(e.toString());
+				System.err.println("Failed to retrieve answer from google translate servers");
 				e.printStackTrace();
+				d.showAndWait();
 			}
 		} catch (IOException e) {
+			Alert a = new Alert(AlertType.ERROR);
+			a.setHeaderText("An unexpected error has occured");
+			a.setContentText(e.toString());
 			e.printStackTrace();
+			a.showAndWait();
 		}
 		return ret;
 	}