From 78e458f01a36d41028f981cef038fc4388298015 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Mon, 27 Jun 2022 17:26:21 +0200 Subject: [PATCH] rename recovery_create.fxml file --- src/main/java/org/cryptomator/ui/common/FxmlFile.java | 2 +- .../org/cryptomator/ui/recoverykey/RecoveryKeyComponent.java | 2 +- .../org/cryptomator/ui/recoverykey/RecoveryKeyModule.java | 4 ++-- ...recoverykey_create.fxml => recoverykey_authenticate.fxml} | 5 +++-- src/main/resources/i18n/strings.properties | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) rename src/main/resources/fxml/{recoverykey_create.fxml => recoverykey_authenticate.fxml} (87%) diff --git a/src/main/java/org/cryptomator/ui/common/FxmlFile.java b/src/main/java/org/cryptomator/ui/common/FxmlFile.java index bc952f9d1..3f723d109 100644 --- a/src/main/java/org/cryptomator/ui/common/FxmlFile.java +++ b/src/main/java/org/cryptomator/ui/common/FxmlFile.java @@ -23,7 +23,7 @@ public enum FxmlFile { MIGRATION_SUCCESS("/fxml/migration_success.fxml"), // PREFERENCES("/fxml/preferences.fxml"), // QUIT("/fxml/quit.fxml"), // - RECOVERYKEY_CREATE("/fxml/recoverykey_create.fxml"), // + RECOVERYKEY_AUTHENTICATE("/fxml/recoverykey_authenticate.fxml"), // RECOVERYKEY_RECOVER("/fxml/recoverykey_recover.fxml"), // RECOVERYKEY_RESET_PASSWORD("/fxml/recoverykey_reset_password.fxml"), // RECOVERYKEY_SUCCESS("/fxml/recoverykey_success.fxml"), // diff --git a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyComponent.java b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyComponent.java index cfec43e3e..ee5ea53d1 100644 --- a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyComponent.java +++ b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyComponent.java @@ -18,7 +18,7 @@ public interface RecoveryKeyComponent { @RecoveryKeyWindow Stage window(); - @FxmlScene(FxmlFile.RECOVERYKEY_CREATE) + @FxmlScene(FxmlFile.RECOVERYKEY_AUTHENTICATE) Lazy creationScene(); @FxmlScene(FxmlFile.RECOVERYKEY_RECOVER) diff --git a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java index 0522e3a8d..cea20f51c 100644 --- a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java +++ b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java @@ -72,10 +72,10 @@ abstract class RecoveryKeyModule { // ------------------ @Provides - @FxmlScene(FxmlFile.RECOVERYKEY_CREATE) + @FxmlScene(FxmlFile.RECOVERYKEY_AUTHENTICATE) @RecoveryKeyScoped static Scene provideRecoveryKeyCreationScene(@RecoveryKeyWindow FxmlLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene(FxmlFile.RECOVERYKEY_CREATE); + return fxmlLoaders.createScene(FxmlFile.RECOVERYKEY_AUTHENTICATE); } @Provides diff --git a/src/main/resources/fxml/recoverykey_create.fxml b/src/main/resources/fxml/recoverykey_authenticate.fxml similarity index 87% rename from src/main/resources/fxml/recoverykey_create.fxml rename to src/main/resources/fxml/recoverykey_authenticate.fxml index 971c516af..463211f92 100644 --- a/src/main/resources/fxml/recoverykey_create.fxml +++ b/src/main/resources/fxml/recoverykey_authenticate.fxml @@ -35,12 +35,13 @@ -