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 1e725f617..8ec04383f 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 @@ -17,7 +17,6 @@ import javafx.scene.input.KeyCodeCombination; import javafx.scene.input.KeyCombination; import javafx.stage.Modality; import javafx.stage.Stage; -import javafx.stage.StageStyle; import org.apache.commons.lang3.SystemUtils; import org.cryptomator.common.vaults.Vault; import org.cryptomator.ui.common.FXMLLoaderFactory; @@ -39,16 +38,16 @@ import java.util.Set; public abstract class AddVaultModule { @Provides - @AddVaultWizard + @AddVaultWizardWindow @AddVaultWizardScoped static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, ResourceBundle resourceBundle) { return new FXMLLoaderFactory(factories, resourceBundle); } @Provides - @AddVaultWizard + @AddVaultWizardWindow @AddVaultWizardScoped - static Stage provideStage(@MainWindow Stage owner, ResourceBundle resourceBundle, @Named("windowIcon") Optional windowIcon, @AddVaultWizard Lazy> accelerators) { + static Stage provideStage(@MainWindow Stage owner, ResourceBundle resourceBundle, @Named("windowIcon") Optional windowIcon, @AddVaultWizardWindow Lazy> accelerators) { Stage stage = new Stage(); stage.setTitle(resourceBundle.getString("addvaultwizard.title")); stage.setResizable(false); @@ -74,7 +73,7 @@ public abstract class AddVaultModule { } @Provides - @AddVaultWizard + @AddVaultWizardWindow @AddVaultWizardScoped static ObjectProperty provideVault() { return new SimpleObjectProperty<>(); @@ -83,16 +82,16 @@ public abstract class AddVaultModule { // ------------------ @Provides - @AddVaultWizard + @AddVaultWizardWindow @AddVaultWizardScoped - static Map provideDefaultAccellerators(@AddVaultWizard Set> accelerators) { + static Map provideDefaultAccellerators(@AddVaultWizardWindow Set> accelerators) { return Map.ofEntries(accelerators.toArray(Map.Entry[]::new)); } @Provides @IntoSet - @AddVaultWizard - static Map.Entry provideCloseWindowShortcut(@AddVaultWizard Stage window) { + @AddVaultWizardWindow + static Map.Entry provideCloseWindowShortcut(@AddVaultWizardWindow Stage window) { if (SystemUtils.IS_OS_WINDOWS) { return Map.entry(new KeyCodeCombination(KeyCode.F4, KeyCombination.ALT_DOWN), window::close); } else { @@ -105,7 +104,7 @@ public abstract class AddVaultModule { @Provides @FxmlScene(FxmlFile.ADDVAULT_WELCOME) @AddVaultWizardScoped - static Scene provideWelcomeScene(@AddVaultWizard FXMLLoaderFactory fxmlLoaders, @AddVaultWizard Stage window) { + static Scene provideWelcomeScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders, @AddVaultWizardWindow Stage window) { Scene scene = fxmlLoaders.createScene("/fxml/addvault_welcome.fxml"); KeyCombination cmdW = new KeyCodeCombination(KeyCode.W, KeyCombination.SHORTCUT_DOWN); @@ -117,35 +116,35 @@ public abstract class AddVaultModule { @Provides @FxmlScene(FxmlFile.ADDVAULT_EXISTING) @AddVaultWizardScoped - static Scene provideChooseExistingVaultScene(@AddVaultWizard FXMLLoaderFactory fxmlLoaders, @AddVaultWizard Stage window) { + static Scene provideChooseExistingVaultScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders, @AddVaultWizardWindow Stage window) { return fxmlLoaders.createScene("/fxml/addvault_existing.fxml"); } @Provides @FxmlScene(FxmlFile.ADDVAULT_NEW_NAME) @AddVaultWizardScoped - static Scene provideCreateNewVaultNameScene(@AddVaultWizard FXMLLoaderFactory fxmlLoaders, @AddVaultWizard Stage window) { + static Scene provideCreateNewVaultNameScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders, @AddVaultWizardWindow Stage window) { return fxmlLoaders.createScene("/fxml/addvault_new_name.fxml"); } @Provides @FxmlScene(FxmlFile.ADDVAULT_NEW_LOCATION) @AddVaultWizardScoped - static Scene provideCreateNewVaultLocationScene(@AddVaultWizard FXMLLoaderFactory fxmlLoaders, @AddVaultWizard Stage window) { + static Scene provideCreateNewVaultLocationScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders, @AddVaultWizardWindow Stage window) { return fxmlLoaders.createScene("/fxml/addvault_new_location.fxml"); } @Provides @FxmlScene(FxmlFile.ADDVAULT_NEW_PASSWORD) @AddVaultWizardScoped - static Scene provideCreateNewVaultPasswordScene(@AddVaultWizard FXMLLoaderFactory fxmlLoaders, @AddVaultWizard Stage window) { + static Scene provideCreateNewVaultPasswordScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders, @AddVaultWizardWindow Stage window) { return fxmlLoaders.createScene("/fxml/addvault_new_password.fxml"); } @Provides @FxmlScene(FxmlFile.ADDVAULT_SUCCESS) @AddVaultWizardScoped - static Scene provideCreateNewVaultSuccessScene(@AddVaultWizard FXMLLoaderFactory fxmlLoaders, @AddVaultWizard Stage window) { + static Scene provideCreateNewVaultSuccessScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders, @AddVaultWizardWindow Stage window) { return fxmlLoaders.createScene("/fxml/addvault_success.fxml"); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultSuccessController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultSuccessController.java index c28f4602e..88862894e 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultSuccessController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultSuccessController.java @@ -2,7 +2,6 @@ package org.cryptomator.ui.addvaultwizard; import javafx.beans.property.ObjectProperty; import javafx.beans.property.ReadOnlyObjectProperty; -import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.stage.Stage; import org.cryptomator.common.vaults.Vault; @@ -19,7 +18,7 @@ public class AddVaultSuccessController implements FxController { private final ReadOnlyObjectProperty vault; @Inject - AddVaultSuccessController(FxApplication fxApplication, @AddVaultWizard Stage window, @AddVaultWizard ObjectProperty vault) { + AddVaultSuccessController(FxApplication fxApplication, @AddVaultWizardWindow Stage window, @AddVaultWizardWindow ObjectProperty vault) { this.fxApplication = fxApplication; this.window = window; this.vault = vault; 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 43f589c11..bec137eed 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_NAME) Lazy createNewVaultScene) { + AddVaultWelcomeController(@AddVaultWizardWindow 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/AddVaultWizardComponent.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardComponent.java index 32edfaaf8..60238abbe 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardComponent.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardComponent.java @@ -16,7 +16,7 @@ import org.cryptomator.ui.common.FxmlScene; @Subcomponent(modules = {AddVaultModule.class}) public interface AddVaultWizardComponent { - @AddVaultWizard + @AddVaultWizardWindow Stage window(); @FxmlScene(FxmlFile.ADDVAULT_WELCOME) diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizard.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardWindow.java similarity index 88% rename from main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizard.java rename to main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardWindow.java index c876cede1..3ec546dec 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizard.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardWindow.java @@ -9,6 +9,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; @Qualifier @Documented @Retention(RUNTIME) -public @interface AddVaultWizard { +@interface AddVaultWizardWindow { } diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java index 38776d308..8856dc4cf 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java @@ -34,7 +34,7 @@ public class ChooseExistingVaultController implements FxController { private final ResourceBundle resourceBundle; @Inject - ChooseExistingVaultController(@AddVaultWizard Stage window, @FxmlScene(FxmlFile.ADDVAULT_WELCOME) Lazy welcomeScene, @FxmlScene(FxmlFile.ADDVAULT_SUCCESS) Lazy successScene, ObjectProperty vaultPath, @AddVaultWizard ObjectProperty vault, VaultListManager vaultListManager, ResourceBundle resourceBundle) { + ChooseExistingVaultController(@AddVaultWizardWindow Stage window, @FxmlScene(FxmlFile.ADDVAULT_WELCOME) Lazy welcomeScene, @FxmlScene(FxmlFile.ADDVAULT_SUCCESS) Lazy successScene, ObjectProperty vaultPath, @AddVaultWizardWindow ObjectProperty vault, VaultListManager vaultListManager, ResourceBundle resourceBundle) { this.window = window; this.welcomeScene = welcomeScene; this.successScene = successScene; diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultLocationController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultLocationController.java index 4c985a336..f766d2fce 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultLocationController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultLocationController.java @@ -1,7 +1,6 @@ package org.cryptomator.ui.addvaultwizard; import dagger.Lazy; -import javafx.beans.Observable; import javafx.beans.binding.Bindings; import javafx.beans.binding.BooleanBinding; import javafx.beans.property.BooleanProperty; @@ -59,7 +58,7 @@ public class CreateNewVaultLocationController implements FxController { public RadioButton customRadioButton; @Inject - CreateNewVaultLocationController(@AddVaultWizard Stage window, @FxmlScene(FxmlFile.ADDVAULT_NEW_NAME) Lazy chooseNameScene, @FxmlScene(FxmlFile.ADDVAULT_NEW_PASSWORD) Lazy choosePasswordScene, LocationPresets locationPresets, ObjectProperty vaultPath, StringProperty vaultName, ResourceBundle resourceBundle) { + CreateNewVaultLocationController(@AddVaultWizardWindow Stage window, @FxmlScene(FxmlFile.ADDVAULT_NEW_NAME) Lazy chooseNameScene, @FxmlScene(FxmlFile.ADDVAULT_NEW_PASSWORD) Lazy choosePasswordScene, LocationPresets locationPresets, ObjectProperty vaultPath, StringProperty vaultName, ResourceBundle resourceBundle) { this.window = window; this.chooseNameScene = chooseNameScene; this.choosePasswordScene = choosePasswordScene; diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java index d4d1d2065..8cc8fa9a2 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java @@ -6,9 +6,7 @@ import javafx.beans.binding.Bindings; import javafx.beans.binding.BooleanBinding; import javafx.beans.binding.StringBinding; import javafx.beans.property.ObjectProperty; -import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; -import javafx.beans.value.ObservableValue; import javafx.fxml.FXML; import javafx.scene.Scene; import javafx.scene.control.TextField; @@ -18,9 +16,6 @@ import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; import javax.inject.Inject; -import java.io.IOException; -import java.nio.file.FileAlreadyExistsException; -import java.nio.file.Files; import java.nio.file.Path; import java.util.ResourceBundle; import java.util.regex.Pattern; @@ -41,7 +36,7 @@ public class CreateNewVaultNameController implements FxController { private final StringBinding warningText; @Inject - CreateNewVaultNameController(@AddVaultWizard Stage window, @FxmlScene(FxmlFile.ADDVAULT_WELCOME) Lazy welcomeScene, @FxmlScene(FxmlFile.ADDVAULT_NEW_LOCATION) Lazy chooseLocationScene, ObjectProperty vaultPath, StringProperty vaultName, ResourceBundle resourceBundle) { + CreateNewVaultNameController(@AddVaultWizardWindow Stage window, @FxmlScene(FxmlFile.ADDVAULT_WELCOME) Lazy welcomeScene, @FxmlScene(FxmlFile.ADDVAULT_NEW_LOCATION) Lazy chooseLocationScene, ObjectProperty vaultPath, StringProperty vaultName, ResourceBundle resourceBundle) { this.window = window; this.welcomeScene = welcomeScene; this.chooseLocationScene = chooseLocationScene; diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java index 071eef96e..26091ec73 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java @@ -80,7 +80,7 @@ public class CreateNewVaultPasswordController implements FxController { public CheckBox finalConfirmationCheckbox; @Inject - CreateNewVaultPasswordController(@AddVaultWizard Stage window, @FxmlScene(FxmlFile.ADDVAULT_NEW_LOCATION) Lazy chooseLocationScene, @FxmlScene(FxmlFile.ADDVAULT_SUCCESS) Lazy successScene, ExecutorService executor, StringProperty vaultName, ObjectProperty vaultPath, @AddVaultWizard ObjectProperty vault, VaultListManager vaultListManager, ResourceBundle resourceBundle, PasswordStrengthUtil strengthRater, ReadmeGenerator readmeGenerator) { + CreateNewVaultPasswordController(@AddVaultWizardWindow Stage window, @FxmlScene(FxmlFile.ADDVAULT_NEW_LOCATION) Lazy chooseLocationScene, @FxmlScene(FxmlFile.ADDVAULT_SUCCESS) Lazy successScene, ExecutorService executor, StringProperty vaultName, ObjectProperty vaultPath, @AddVaultWizardWindow ObjectProperty vault, VaultListManager vaultListManager, ResourceBundle resourceBundle, PasswordStrengthUtil strengthRater, ReadmeGenerator readmeGenerator) { this.window = window; this.chooseLocationScene = chooseLocationScene; this.successScene = successScene; diff --git a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordComponent.java b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordComponent.java index 995c18f2d..013fa2b5b 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordComponent.java +++ b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordComponent.java @@ -9,6 +9,8 @@ import org.cryptomator.common.vaults.Vault; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; +import javax.inject.Named; + @ChangePasswordScoped @Subcomponent(modules = {ChangePasswordModule.class}) public interface ChangePasswordComponent { @@ -31,6 +33,9 @@ public interface ChangePasswordComponent { @BindsInstance Builder vault(@ChangePasswordWindow Vault vault); + @BindsInstance + Builder owner(@Named("changePasswordOwner") Stage owner); + ChangePasswordComponent build(); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordModule.java b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordModule.java index f51c3a7ac..f47e18fcb 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordModule.java @@ -13,7 +13,6 @@ import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; -import org.cryptomator.ui.vaultoptions.VaultOptionsWindow; import javax.inject.Named; import javax.inject.Provider; @@ -34,7 +33,7 @@ abstract class ChangePasswordModule { @Provides @ChangePasswordWindow @ChangePasswordScoped - static Stage provideStage(@VaultOptionsWindow Stage owner, ResourceBundle resourceBundle, @Named("windowIcon") Optional windowIcon) { + static Stage provideStage(@Named("changePasswordOwner") Stage owner, ResourceBundle resourceBundle, @Named("windowIcon") Optional windowIcon) { Stage stage = new Stage(); stage.setTitle(resourceBundle.getString("changepassword.title")); stage.setResizable(false); diff --git a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordWindow.java b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordWindow.java index 4e4030fb0..f8b184e89 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordWindow.java +++ b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordWindow.java @@ -9,6 +9,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; @Qualifier @Documented @Retention(RUNTIME) -public @interface ChangePasswordWindow { +@interface ChangePasswordWindow { } diff --git a/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordComponent.java b/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordComponent.java index ddf310ab3..05a33c870 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordComponent.java +++ b/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordComponent.java @@ -17,10 +17,10 @@ import java.util.concurrent.CompletableFuture; @Subcomponent(modules = {ForgetPasswordModule.class}) public interface ForgetPasswordComponent { - @ForgetPassword + @ForgetPasswordWindow ReadOnlyBooleanProperty confirmedProperty(); - @ForgetPassword + @ForgetPasswordWindow Stage window(); @FxmlScene(FxmlFile.FORGET_PASSWORD) @@ -40,7 +40,7 @@ public interface ForgetPasswordComponent { interface Builder { @BindsInstance - Builder vault(@ForgetPassword Vault vault); + Builder vault(@ForgetPasswordWindow Vault vault); @BindsInstance Builder owner(@Named("forgetPasswordOwner") Stage owner); diff --git a/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java index c49e9aa27..e072840ba 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java @@ -24,7 +24,7 @@ public class ForgetPasswordController implements FxController { private final BooleanProperty confirmedResult; @Inject - public ForgetPasswordController(@ForgetPassword Stage window, @ForgetPassword Vault vault, Optional keychainAccess, @ForgetPassword BooleanProperty confirmedResult) { + public ForgetPasswordController(@ForgetPasswordWindow Stage window, @ForgetPasswordWindow Vault vault, Optional keychainAccess, @ForgetPasswordWindow BooleanProperty confirmedResult) { this.window = window; this.vault = vault; this.keychainAccess = keychainAccess; diff --git a/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordModule.java b/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordModule.java index cce71b707..f0d055db7 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordModule.java @@ -27,14 +27,14 @@ import java.util.ResourceBundle; abstract class ForgetPasswordModule { @Provides - @ForgetPassword + @ForgetPasswordWindow @ForgetPasswordScoped static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, ResourceBundle resourceBundle) { return new FXMLLoaderFactory(factories, resourceBundle); } @Provides - @ForgetPassword + @ForgetPasswordWindow @ForgetPasswordScoped static Stage provideStage(ResourceBundle resourceBundle, @Named("windowIcon") Optional windowIcon, @Named("forgetPasswordOwner") Stage owner) { Stage stage = new Stage(); @@ -49,21 +49,21 @@ abstract class ForgetPasswordModule { @Provides @FxmlScene(FxmlFile.FORGET_PASSWORD) @ForgetPasswordScoped - static Scene provideForgetPasswordScene(@ForgetPassword FXMLLoaderFactory fxmlLoaders, @ForgetPassword Stage window) { + static Scene provideForgetPasswordScene(@ForgetPasswordWindow FXMLLoaderFactory fxmlLoaders, @ForgetPasswordWindow Stage window) { return fxmlLoaders.createScene("/fxml/forget_password.fxml"); } @Provides - @ForgetPassword + @ForgetPasswordWindow @ForgetPasswordScoped static BooleanProperty provideConfirmedProperty() { return new SimpleBooleanProperty(false); } @Binds - @ForgetPassword + @ForgetPasswordWindow @ForgetPasswordScoped - abstract ReadOnlyBooleanProperty bindReadOnlyConfirmedProperty(@ForgetPassword BooleanProperty confirmedProperty); + abstract ReadOnlyBooleanProperty bindReadOnlyConfirmedProperty(@ForgetPasswordWindow BooleanProperty confirmedProperty); // ------------------ diff --git a/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPassword.java b/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordWindow.java similarity index 88% rename from main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPassword.java rename to main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordWindow.java index ec6bd793b..285119e0a 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPassword.java +++ b/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordWindow.java @@ -9,6 +9,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; @Qualifier @Documented @Retention(RUNTIME) -public @interface ForgetPassword { +@interface ForgetPasswordWindow { } diff --git a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationWindow.java b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationWindow.java index 0cb2d37b4..626f92881 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationWindow.java +++ b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationWindow.java @@ -9,6 +9,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; @Qualifier @Documented @Retention(RUNTIME) -public @interface MigrationWindow { +@interface MigrationWindow { } diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesWindow.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesWindow.java index 0f0e335cb..b203530d5 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesWindow.java +++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesWindow.java @@ -9,6 +9,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; @Qualifier @Documented @Retention(RUNTIME) -public @interface PreferencesWindow { +@interface PreferencesWindow { } diff --git a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitWindow.java b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitWindow.java index 4771884c2..b6500ffb5 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitWindow.java +++ b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitWindow.java @@ -9,6 +9,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; @Qualifier @Documented @Retention(RUNTIME) -public @interface QuitWindow { +@interface QuitWindow { } diff --git a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultComponent.java b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultComponent.java index bfa613ef4..55e7daf4e 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultComponent.java +++ b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultComponent.java @@ -13,7 +13,7 @@ import org.cryptomator.ui.common.FxmlScene; @Subcomponent(modules = {RemoveVaultModule.class}) public interface RemoveVaultComponent { - @RemoveVault + @RemoveVaultWindow Stage window(); @FxmlScene(FxmlFile.REMOVE_VAULT) @@ -30,7 +30,7 @@ public interface RemoveVaultComponent { interface Builder { @BindsInstance - Builder vault(@RemoveVault Vault vault); + Builder vault(@RemoveVaultWindow Vault vault); RemoveVaultComponent build(); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java index 382746431..e2d5ec024 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java @@ -20,7 +20,7 @@ public class RemoveVaultController implements FxController { private final ObservableList vaults; @Inject - public RemoveVaultController(@RemoveVault Stage window, @RemoveVault Vault vault, ObservableList vaults) { + public RemoveVaultController(@RemoveVaultWindow Stage window, @RemoveVaultWindow Vault vault, ObservableList vaults) { this.window = window; this.vault = vault; this.vaults = vaults; diff --git a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultModule.java b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultModule.java index 89bc78fb2..60d541704 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultModule.java @@ -28,14 +28,14 @@ import java.util.ResourceBundle; abstract class RemoveVaultModule { @Provides - @RemoveVault + @RemoveVaultWindow @RemoveVaultScoped static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, ResourceBundle resourceBundle) { return new FXMLLoaderFactory(factories, resourceBundle); } @Provides - @RemoveVault + @RemoveVaultWindow @RemoveVaultScoped static Stage provideStage(@MainWindow Stage owner, ResourceBundle resourceBundle, @Named("windowIcon") Optional windowIcon) { Stage stage = new Stage(); @@ -50,7 +50,7 @@ abstract class RemoveVaultModule { @Provides @FxmlScene(FxmlFile.REMOVE_VAULT) @RemoveVaultScoped - static Scene provideRemoveVaultScene(@RemoveVault FXMLLoaderFactory fxmlLoaders, @RemoveVault Stage window) { + static Scene provideRemoveVaultScene(@RemoveVaultWindow FXMLLoaderFactory fxmlLoaders, @RemoveVaultWindow Stage window) { Scene scene = fxmlLoaders.createScene("/fxml/remove_vault.fxml"); KeyCombination cmdW = new KeyCodeCombination(KeyCode.W, KeyCombination.SHORTCUT_DOWN); diff --git a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVault.java b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultWindow.java similarity index 89% rename from main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVault.java rename to main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultWindow.java index d927fb1c1..7348e213b 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVault.java +++ b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultWindow.java @@ -9,6 +9,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; @Qualifier @Documented @Retention(RUNTIME) -public @interface RemoveVault { +@interface RemoveVaultWindow { } diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWindow.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWindow.java index 67451591b..55376ece2 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWindow.java +++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWindow.java @@ -9,6 +9,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; @Qualifier @Documented @Retention(RUNTIME) -public @interface UnlockWindow { +@interface UnlockWindow { } diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java index 0b09239ba..cf8a804c6 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java @@ -1,6 +1,7 @@ package org.cryptomator.ui.vaultoptions; import javafx.fxml.FXML; +import javafx.stage.Stage; import org.cryptomator.common.vaults.Vault; import org.cryptomator.ui.changepassword.ChangePasswordComponent; import org.cryptomator.ui.common.FxController; @@ -11,17 +12,19 @@ import javax.inject.Inject; public class GeneralVaultOptionsController implements FxController { private final Vault vault; + private final Stage window; private final ChangePasswordComponent.Builder changePasswordWindow; @Inject - GeneralVaultOptionsController(@VaultOptionsWindow Vault vault, ChangePasswordComponent.Builder changePasswordWindow) { + GeneralVaultOptionsController(@VaultOptionsWindow Vault vault, @VaultOptionsWindow Stage window, ChangePasswordComponent.Builder changePasswordWindow) { this.vault = vault; + this.window = window; this.changePasswordWindow = changePasswordWindow; } @FXML public void changePassword() { - changePasswordWindow.vault(vault).build().showChangePasswordWindow(); + changePasswordWindow.vault(vault).owner(window).build().showChangePasswordWindow(); } } diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsWindow.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsWindow.java index db3e25bd2..5c2b5dfe0 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsWindow.java +++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsWindow.java @@ -9,6 +9,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; @Qualifier @Documented @Retention(RUNTIME) -public @interface VaultOptionsWindow { +@interface VaultOptionsWindow { } diff --git a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertComponent.java b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertComponent.java index 5b333328c..a79567f9d 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertComponent.java +++ b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertComponent.java @@ -11,7 +11,7 @@ import org.cryptomator.ui.common.FxmlScene; @Subcomponent(modules = {WrongFileAlertModule.class}) public interface WrongFileAlertComponent { - @WrongFileAlert + @WrongFileAlertWindow Stage window(); @FxmlScene(FxmlFile.WRONGFILEALERT) diff --git a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java index 52f0e99a4..7d2efcf26 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java @@ -11,7 +11,7 @@ public class WrongFileAlertController implements FxController { private final Stage window; @Inject - public WrongFileAlertController(@WrongFileAlert Stage window) { + public WrongFileAlertController(@WrongFileAlertWindow Stage window) { this.window = window; } diff --git a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java index fbfb4872f..174db9805 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java @@ -27,14 +27,14 @@ import java.util.ResourceBundle; abstract class WrongFileAlertModule { @Provides - @WrongFileAlert + @WrongFileAlertWindow @WrongFileAlertScoped static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, ResourceBundle resourceBundle) { return new FXMLLoaderFactory(factories, resourceBundle); } @Provides - @WrongFileAlert + @WrongFileAlertWindow @WrongFileAlertScoped static Stage provideStage(ResourceBundle resourceBundle, @Named("windowIcon") Optional windowIcon) { Stage stage = new Stage(); @@ -48,7 +48,7 @@ abstract class WrongFileAlertModule { @Provides @FxmlScene(FxmlFile.WRONGFILEALERT) @WrongFileAlertScoped - static Scene provideWrongFileAlertScene(@WrongFileAlert FXMLLoaderFactory fxmlLoaders, @WrongFileAlert Stage window) { + static Scene provideWrongFileAlertScene(@WrongFileAlertWindow FXMLLoaderFactory fxmlLoaders, @WrongFileAlertWindow Stage window) { Scene scene = fxmlLoaders.createScene("/fxml/wrongfilealert.fxml"); // TODO rename fxml file KeyCombination cmdW = new KeyCodeCombination(KeyCode.W, KeyCombination.SHORTCUT_DOWN); diff --git a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlert.java b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertWindow.java similarity index 88% rename from main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlert.java rename to main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertWindow.java index 9a0057090..75ddf0803 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlert.java +++ b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertWindow.java @@ -9,6 +9,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; @Qualifier @Documented @Retention(RUNTIME) -public @interface WrongFileAlert { +@interface WrongFileAlertWindow { }