From a0667ff36105e0868b67fcddb0b7264836b316be Mon Sep 17 00:00:00 2001 From: Jan-Peter Klein Date: Tue, 7 Jan 2025 14:39:22 +0100 Subject: [PATCH] add validation for required parameters and changed exception message --- .../java/org/cryptomator/ui/dialogs/SimpleDialog.java | 9 ++++++++- src/main/resources/fxml/custom_dialog.fxml | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/dialogs/SimpleDialog.java b/src/main/java/org/cryptomator/ui/dialogs/SimpleDialog.java index bae0e8843..344630d98 100644 --- a/src/main/java/org/cryptomator/ui/dialogs/SimpleDialog.java +++ b/src/main/java/org/cryptomator/ui/dialogs/SimpleDialog.java @@ -12,6 +12,7 @@ import javafx.stage.Stage; import java.io.IOException; import java.io.UncheckedIOException; import java.util.IllegalFormatException; +import java.util.Objects; import java.util.ResourceBundle; import java.util.function.Consumer; @@ -128,10 +129,16 @@ public class SimpleDialog { } public SimpleDialog build() { + Objects.requireNonNull(titleKey,"SimpleDialog titleKey must be set."); + Objects.requireNonNull(messageKey,"SimpleDialog messageKey must be set."); + Objects.requireNonNull(descriptionKey,"SimpleDialog descriptionKey must be set."); + Objects.requireNonNull(okButtonKey,"SimpleDialog okButtonKey must be set."); + Objects.requireNonNull(cancelButtonKey,"SimpleDialog cancelButtonKey must be set."); + try { return new SimpleDialog(this); } catch (IOException e) { - throw new UncheckedIOException("Failed to create CustomDialog.", e); + throw new UncheckedIOException("Failed to create SimpleDialog.", e); } } } diff --git a/src/main/resources/fxml/custom_dialog.fxml b/src/main/resources/fxml/custom_dialog.fxml index 340798bb3..3cb2c38ef 100644 --- a/src/main/resources/fxml/custom_dialog.fxml +++ b/src/main/resources/fxml/custom_dialog.fxml @@ -41,8 +41,8 @@ -