From 3b38049d710ffea3cc4b2be1914d51e482d69926 Mon Sep 17 00:00:00 2001 From: Jan-Peter Klein Date: Wed, 6 Aug 2025 08:18:32 +0200 Subject: [PATCH] remove Objects.requireNonNull --- .../ui/addvaultwizard/AddVaultWizardComponent.java | 1 - .../ui/addvaultwizard/ChooseExistingVaultController.java | 1 + .../ui/recoverykey/RecoveryKeyRecoverController.java | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardComponent.java b/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardComponent.java index 5b01a6b2f..c67f999e8 100644 --- a/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardComponent.java +++ b/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardComponent.java @@ -23,7 +23,6 @@ public interface AddVaultWizardComponent { @FxmlScene(FxmlFile.ADDVAULT_NEW_NAME) Lazy sceneNew(); - @FxmlScene(FxmlFile.ADDVAULT_EXISTING) Lazy sceneExisting(); diff --git a/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java b/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java index 27c9f6204..be9ea15c7 100644 --- a/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java +++ b/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java @@ -104,4 +104,5 @@ public class ChooseExistingVaultController implements FxController { return screenshot.getValue(); } + } diff --git a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyRecoverController.java b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyRecoverController.java index d3ba87b08..ae0f84b25 100644 --- a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyRecoverController.java +++ b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyRecoverController.java @@ -66,7 +66,7 @@ public class RecoveryKeyRecoverController implements FxController { @FXML public void initialize() { - if (Objects.requireNonNull(recoverType.get()) == RecoveryActionType.RESET_PASSWORD) { + if (recoverType.get() == RecoveryActionType.RESET_PASSWORD) { cancelButton.setText(resourceBundle.getString("generic.button.cancel")); } else { cancelButton.setText(resourceBundle.getString("generic.button.back")); @@ -75,7 +75,7 @@ public class RecoveryKeyRecoverController implements FxController { @FXML public void close() { - if (Objects.requireNonNull(recoverType.get()) == RecoveryActionType.RESET_PASSWORD) { + if (recoverType.get() == RecoveryActionType.RESET_PASSWORD) { window.close(); } else { window.setScene(onBoardingScene.get());