From 963a73120245d945db033afaccdec853c33b19ec Mon Sep 17 00:00:00 2001 From: jellemdekker Date: Tue, 21 Aug 2018 15:26:10 +0200 Subject: [PATCH] As per feedback on PR #690: redid line wrapping, refactored signature for dialog builder method to include a default button, and the default button for the graceful shutdown dialog is now 'Force shutdown'. --- .../cryptomator/ui/controllers/MainController.java | 13 ++++--------- .../org/cryptomator/ui/util/DialogBuilderUtil.java | 4 ++-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java index e994b3180..2df9a1926 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java @@ -217,16 +217,11 @@ public class MainController implements ViewController { private void gracefulShutdown() { vaults.filtered(Vault.NOT_LOCKED).forEach(Vault::prepareForShutdown); if (!vaults.filtered(Vault.NOT_LOCKED).isEmpty()) { - ButtonType tryAgainButtonType = new ButtonType( - localization.getString("main.gracefulShutdown.button.tryAgain")); - ButtonType forceShutdownButtonType = new ButtonType( - localization.getString("main.gracefulShutdown.button.forceShutdown")); + ButtonType tryAgainButtonType = new ButtonType(localization.getString("main.gracefulShutdown.button.tryAgain")); + ButtonType forceShutdownButtonType = new ButtonType(localization.getString("main.gracefulShutdown.button.forceShutdown")); Alert gracefulShutdownDialog = DialogBuilderUtil.buildGracefulShutdownDialog( - localization.getString("main.gracefulShutdown.dialog.title"), - localization.getString("main.gracefulShutdown.dialog.header"), - localization.getString("main.gracefulShutdown.dialog.content"), - tryAgainButtonType, - forceShutdownButtonType); + localization.getString("main.gracefulShutdown.dialog.title"), localization.getString("main.gracefulShutdown.dialog.header"), localization.getString("main.gracefulShutdown.dialog.content"), + forceShutdownButtonType, forceShutdownButtonType, tryAgainButtonType); Optional choice = gracefulShutdownDialog.showAndWait(); if (choice.isPresent()) { diff --git a/main/ui/src/main/java/org/cryptomator/ui/util/DialogBuilderUtil.java b/main/ui/src/main/java/org/cryptomator/ui/util/DialogBuilderUtil.java index 0f6990415..744c37cff 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/util/DialogBuilderUtil.java +++ b/main/ui/src/main/java/org/cryptomator/ui/util/DialogBuilderUtil.java @@ -38,8 +38,8 @@ public class DialogBuilderUtil { return buildDialog(title, header, content, Alert.AlertType.CONFIRMATION, defaultButton, ButtonType.YES, ButtonType.NO); } - public static Alert buildGracefulShutdownDialog(String title, String header, String content, ButtonType tryAgainButton, ButtonType forceShutdownButton) { - return buildDialog(title, header, content, Alert.AlertType.WARNING, tryAgainButton, tryAgainButton, forceShutdownButton); + public static Alert buildGracefulShutdownDialog(String title, String header, String content, ButtonType defaultButton, ButtonType... buttons) { + return buildDialog(title, header, content, Alert.AlertType.WARNING, defaultButton, buttons); } private static Alert buildDialog(String title, String header, String content, Alert.AlertType type, ButtonType defaultButton, ButtonType... buttons) {