diff --git a/src/main/java/com/github/introfog/gitwave/controller/main/MainController.java b/src/main/java/com/github/introfog/gitwave/controller/main/MainController.java index b0f414d..f16aa04 100644 --- a/src/main/java/com/github/introfog/gitwave/controller/main/MainController.java +++ b/src/main/java/com/github/introfog/gitwave/controller/main/MainController.java @@ -30,7 +30,6 @@ import javafx.concurrent.Task; import javafx.fxml.FXML; import javafx.scene.control.Button; -import javafx.scene.control.ButtonType; import javafx.scene.control.Label; import javafx.scene.control.Menu; import javafx.scene.control.MenuItem; @@ -72,13 +71,12 @@ public void initialize(FxmlStageHolder fxmlStageHolder) { final Stage primaryStage = fxmlStageHolder.getStage(); primaryStage.setOnCloseRequest(event -> { event.consume(); - if (DialogFactory.createCloseConfirmationAlert() == ButtonType.OK) { - AppConfig.getInstance().closeApp(); - for (ExecutionController executionController : StageFactory.getExecutingControllers()) { - executionController.getStage().close(); - } - primaryStage.close(); - }; + + AppConfig.getInstance().closeApp(); + for (ExecutionController executionController : StageFactory.getExecutingControllers()) { + executionController.getStage().close(); + } + primaryStage.close(); }); directoryTabController = new DirectoryTabController(fxmlStageHolder, directory); diff --git a/src/main/java/com/github/introfog/gitwave/model/DialogFactory.java b/src/main/java/com/github/introfog/gitwave/model/DialogFactory.java index d43b19b..3299ce4 100644 --- a/src/main/java/com/github/introfog/gitwave/model/DialogFactory.java +++ b/src/main/java/com/github/introfog/gitwave/model/DialogFactory.java @@ -18,7 +18,6 @@ import javafx.scene.control.Alert; import javafx.scene.control.Alert.AlertType; -import javafx.scene.control.ButtonType; import javafx.scene.image.Image; import javafx.stage.Stage; @@ -56,18 +55,4 @@ public static void createInfoAlert(String header, String msg) { alert.getDialogPane().setStyle(COMMON_STYLES); alert.showAndWait(); } - - public static ButtonType createCloseConfirmationAlert() { - Alert dialog = new Alert(AlertType.CONFIRMATION); - Stage stage = (Stage) dialog.getDialogPane().getScene().getWindow(); - stage.getIcons().add(new Image(StageFactory.class.getResourceAsStream(AppConstants.PATH_TO_LOGO_32))); - dialog.setTitle("Confirmation"); - dialog.setHeaderText("Do you really want to close the application?"); - dialog.getButtonTypes().setAll(ButtonType.OK, ButtonType.CANCEL); - - dialog.getDialogPane().setStyle(COMMON_STYLES); - ButtonType[] pressedButton = {null}; - dialog.showAndWait().ifPresent(response -> pressedButton[0] = response); - return pressedButton[0]; - } }