From 610460b3e4268ee162e92f596033cc32058d9747 Mon Sep 17 00:00:00 2001 From: infeo Date: Wed, 31 Jul 2019 14:33:12 +0200 Subject: [PATCH] add suffix to to create new vault workflow since there will be more than one step --- .../org/cryptomator/ui/addvaultwizard/AddVaultModule.java | 8 ++++---- .../ui/addvaultwizard/AddVaultWelcomeController.java | 2 +- ...tController.java => CreateNewVaultNameController.java} | 6 +++--- .../src/main/java/org/cryptomator/ui/common/FxmlFile.java | 2 +- .../fxml/{addvault_new.fxml => addvault_new_name.fxml} | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) rename main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/{CreateNewVaultController.java => CreateNewVaultNameController.java} (80%) rename main/ui/src/main/resources/fxml/{addvault_new.fxml => addvault_new_name.fxml} (98%) diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java index 91486be5a..9eace8fd6 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java @@ -74,10 +74,10 @@ public abstract class AddVaultModule { } @Provides - @FxmlScene(FxmlFile.ADDVAULT_NEW) + @FxmlScene(FxmlFile.ADDVAULT_NEW_NAME) @AddVaultWizardScoped static Scene provideCreateNewVaultScene(@AddVaultWizard FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/addvault_new.fxml"); + return fxmlLoaders.createScene("/fxml/addvault_new_name.fxml"); } // ------------------ @@ -94,8 +94,8 @@ public abstract class AddVaultModule { @Binds @IntoMap - @FxControllerKey(CreateNewVaultController.class) - abstract FxController bindCreateNewVaultController(CreateNewVaultController controller); + @FxControllerKey(CreateNewVaultNameController.class) + abstract FxController bindCreateNewVaultNameController(CreateNewVaultNameController controller); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWelcomeController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWelcomeController.java index e3159236c..43f589c11 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWelcomeController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWelcomeController.java @@ -20,7 +20,7 @@ public class AddVaultWelcomeController implements FxController { private final Lazy createNewVaultScene; @Inject - AddVaultWelcomeController(@AddVaultWizard Stage window, @FxmlScene(FxmlFile.ADDVAULT_EXISTING) Lazy chooseExistingVaultScene, @FxmlScene(FxmlFile.ADDVAULT_NEW) Lazy createNewVaultScene) { + AddVaultWelcomeController(@AddVaultWizard Stage window, @FxmlScene(FxmlFile.ADDVAULT_EXISTING) Lazy chooseExistingVaultScene, @FxmlScene(FxmlFile.ADDVAULT_NEW_NAME) Lazy createNewVaultScene) { this.window = window; this.chooseExistingVaultScene = chooseExistingVaultScene; this.createNewVaultScene = createNewVaultScene; diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java similarity index 80% rename from main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultController.java rename to main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java index 72a684fe0..bdc0c4341 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java @@ -21,7 +21,7 @@ import java.util.ResourceBundle; * TODO: Add trim() filter to vaultName */ @AddVaultWizardScoped -public class CreateNewVaultController implements FxController { +public class CreateNewVaultNameController implements FxController { public TextField textField; private final Stage window; @@ -30,7 +30,7 @@ public class CreateNewVaultController implements FxController { private final ResourceBundle resourceBundle; @Inject - CreateNewVaultController(@AddVaultWizard Stage window, @FxmlScene(FxmlFile.ADDVAULT_WELCOME) Lazy welcomeScene, StringProperty vaultName, ResourceBundle resourceBundle) { + CreateNewVaultNameController(@AddVaultWizard Stage window, @FxmlScene(FxmlFile.ADDVAULT_WELCOME) Lazy welcomeScene, StringProperty vaultName, ResourceBundle resourceBundle) { this.window = window; this.welcomeScene = welcomeScene; this.vaultName = vaultName; @@ -57,7 +57,7 @@ public class CreateNewVaultController implements FxController { } /** - * Checks if {@link CreateNewVaultController#vaultName}is a valid directory name in the OS by creating and deleting a directory with the giving name in the temporary section of the OS + * Checks if {@link CreateNewVaultNameController#vaultName}is a valid directory name in the OS by creating and deleting a directory with the giving name in the temporary section of the OS * TODO: Logging * * @return true, if a directory with the name already exists or can be created diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java index 1c0385ff1..f0cf3e306 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java +++ b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java @@ -4,7 +4,7 @@ public enum FxmlFile { MAIN_WINDOW("/fxml/main_window.fxml"), // ADDVAULT_WELCOME("/fxml/addvault_welcome.fxml"), // ADDVAULT_EXISTING("/fxml/addvault_existing.fxml"), // - ADDVAULT_NEW("/fxml/addvault_new.fxml"), // + ADDVAULT_NEW_NAME("/fxml/addvault_new_name.fxml"), // PREFERENCES("/fxml/preferences.fxml"), // UNLOCK("/fxml/unlock2.fxml"), // TODO rename UNLOCK_SUCCESS("/fxml/unlock_success.fxml"), diff --git a/main/ui/src/main/resources/fxml/addvault_new.fxml b/main/ui/src/main/resources/fxml/addvault_new_name.fxml similarity index 98% rename from main/ui/src/main/resources/fxml/addvault_new.fxml rename to main/ui/src/main/resources/fxml/addvault_new_name.fxml index 31c2335f3..f3f311218 100644 --- a/main/ui/src/main/resources/fxml/addvault_new.fxml +++ b/main/ui/src/main/resources/fxml/addvault_new_name.fxml @@ -10,7 +10,7 @@