From b8d89090a2646e4871c8efecb485cc6c87ce7528 Mon Sep 17 00:00:00 2001 From: Dmitry Isaenko Date: Mon, 11 Feb 2019 17:33:53 +0300 Subject: [PATCH] minor fixes --- src/main/java/nsusbloader/Main.java | 3 +++ src/main/java/nsusbloader/NSLMain.java | 1 + src/main/java/nsusbloader/NSLMainController.java | 6 +++--- src/main/java/nsusbloader/ServiceWindow.java | 5 +++++ src/main/resources/locale_en.properties | 2 +- src/main/resources/locale_ru.properties | 2 +- 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/java/nsusbloader/Main.java b/src/main/java/nsusbloader/Main.java index 69d2e43..23cb4bc 100644 --- a/src/main/java/nsusbloader/Main.java +++ b/src/main/java/nsusbloader/Main.java @@ -1,5 +1,8 @@ package nsusbloader; +/** + * It's a workaround to execute JavaFX application. + * */ public class Main { public static void main(String[] args){ NSLMain.main(args); } } diff --git a/src/main/java/nsusbloader/NSLMain.java b/src/main/java/nsusbloader/NSLMain.java index 9e56bc9..9f36aab 100644 --- a/src/main/java/nsusbloader/NSLMain.java +++ b/src/main/java/nsusbloader/NSLMain.java @@ -3,6 +3,7 @@ @author Dmitry Isaenko License: GNU GPL v.3 @see https://github.com/developersu/ + @see https://developersu.blogspot.com/ 2019, Russia */ package nsusbloader; diff --git a/src/main/java/nsusbloader/NSLMainController.java b/src/main/java/nsusbloader/NSLMainController.java index fe189e8..ae5febd 100644 --- a/src/main/java/nsusbloader/NSLMainController.java +++ b/src/main/java/nsusbloader/NSLMainController.java @@ -45,7 +45,7 @@ public class NSLMainController implements Initializable { uploadStopBtn.setDisable(true); selectNspBtn.setOnAction(e->{ selectFilesBtnAction(); }); - uploadStopBtn.setOnAction(e->{ uploadToNsBtnAction(); }); + uploadStopBtn.setOnAction(e->{ uploadBtnAction(); }); this.btnUpStopImage = new Region(); btnUpStopImage.getStyleClass().add("regionUpload"); @@ -85,7 +85,7 @@ public class NSLMainController implements Initializable { /** * It's button listener when no transmission executes * */ - private void uploadToNsBtnAction(){ + private void uploadBtnAction(){ if (usbThread == null || !usbThread.isAlive()){ UsbCommunications usbCommunications = new UsbCommunications(logArea, progressBar, nspToUpload); //todo: progress bar usbThread = new Thread(usbCommunications); @@ -119,7 +119,7 @@ public class NSLMainController implements Initializable { } else { selectNspBtn.setDisable(false); - uploadStopBtn.setOnAction(e->{ uploadToNsBtnAction(); }); + uploadStopBtn.setOnAction(e->{ uploadBtnAction(); }); uploadStopBtn.setText(resourceBundle.getString("btnUpload")); diff --git a/src/main/java/nsusbloader/ServiceWindow.java b/src/main/java/nsusbloader/ServiceWindow.java index bfa9fcf..c362148 100644 --- a/src/main/java/nsusbloader/ServiceWindow.java +++ b/src/main/java/nsusbloader/ServiceWindow.java @@ -10,6 +10,7 @@ public class ServiceWindow { /** * Create window with notification * */ + /* // not used static void getErrorNotification(String title, String body){ Alert alertBox = new Alert(Alert.AlertType.ERROR); alertBox.setTitle(title); @@ -22,6 +23,10 @@ public class ServiceWindow { alertBox.getDialogPane().getStylesheets().add("/res/app.css"); alertBox.show(); } + */ + /** + * Create notification window with confirm/deny + * */ static boolean getConfirmationWindow(String title, String body){ Alert alertBox = new Alert(Alert.AlertType.CONFIRMATION); alertBox.setTitle(title); diff --git a/src/main/resources/locale_en.properties b/src/main/resources/locale_en.properties index 084ef98..5333998 100644 --- a/src/main/resources/locale_en.properties +++ b/src/main/resources/locale_en.properties @@ -10,5 +10,5 @@ windowTitleConfirmExit=No, don't do this! btnStop=Interrupt logsGreetingsMessage2=--\n\ Source: https://github.com/developersu/ns-usbloader/\n\ -Site: https://developersu.blogspot.com/search/label/nsusbloader\n\ +Site: https://developersu.blogspot.com/search/label/NS-USBloader\n\ Dmitry Isaenko [developer.su] diff --git a/src/main/resources/locale_ru.properties b/src/main/resources/locale_ru.properties index b678e3c..1f32036 100644 --- a/src/main/resources/locale_ru.properties +++ b/src/main/resources/locale_ru.properties @@ -10,6 +10,6 @@ windowTitleConfirmExit=\u041D\u0435\u0442, \u043E\u0441\u0442\u0430\u043D\u043E\ btnStop=\u041F\u0440\u0435\u0440\u0432\u0430\u0442\u044C logsGreetingsMessage2=--\n\ \u0418\u0441\u0445\u043E\u0434\u043D\u044B\u0439 \u043A\u043E\u0434: https://github.com/developersu/ns-usbloader/\n\ -\u0421\u0430\u0439\u0442: https://developersu.blogspot.com/search/label/nsusbloader\n\ +\u0421\u0430\u0439\u0442: https://developersu.blogspot.com/search/label/NS-USBloader\n\ \u0418\u0441\u0430\u0435\u043D\u043A\u043E \u0414\u043C\u0438\u0442\u0440\u0438\u0439 [developer.su]