diff --git a/main/pom.xml b/main/pom.xml index edd0b1c91..0d6866531 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -28,7 +28,7 @@ 0.1.6 0.2.1 0.1.0-beta3 - 0.1.0-beta2 + 0.1.1 1.2.8 1.2.3 1.1.1 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 3c9c53e5b..42d243e80 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 @@ -6,7 +6,7 @@ import dagger.Provides; import dagger.multibindings.IntoMap; import org.cryptomator.common.vaults.Vault; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -43,8 +43,8 @@ public abstract class AddVaultModule { @Provides @AddVaultWizardWindow @AddVaultWizardScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -91,50 +91,50 @@ public abstract class AddVaultModule { @Provides @FxmlScene(FxmlFile.ADDVAULT_WELCOME) @AddVaultWizardScoped - static Scene provideWelcomeScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene(FxmlFile.ADDVAULT_WELCOME.getRessourcePathString()); + static Scene provideWelcomeScene(@AddVaultWizardWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.ADDVAULT_WELCOME); } @Provides @FxmlScene(FxmlFile.ADDVAULT_EXISTING) @AddVaultWizardScoped - static Scene provideChooseExistingVaultScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene(FxmlFile.ADDVAULT_EXISTING.getRessourcePathString()); + static Scene provideChooseExistingVaultScene(@AddVaultWizardWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.ADDVAULT_EXISTING); } @Provides @FxmlScene(FxmlFile.ADDVAULT_NEW_NAME) @AddVaultWizardScoped - static Scene provideCreateNewVaultNameScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene(FxmlFile.ADDVAULT_NEW_NAME.getRessourcePathString()); + static Scene provideCreateNewVaultNameScene(@AddVaultWizardWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.ADDVAULT_NEW_NAME); } @Provides @FxmlScene(FxmlFile.ADDVAULT_NEW_LOCATION) @AddVaultWizardScoped - static Scene provideCreateNewVaultLocationScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene(FxmlFile.ADDVAULT_NEW_LOCATION.getRessourcePathString()); + static Scene provideCreateNewVaultLocationScene(@AddVaultWizardWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.ADDVAULT_NEW_LOCATION); } @Provides @FxmlScene(FxmlFile.ADDVAULT_NEW_PASSWORD) @AddVaultWizardScoped - static Scene provideCreateNewVaultPasswordScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene(FxmlFile.ADDVAULT_NEW_PASSWORD.getRessourcePathString()); + static Scene provideCreateNewVaultPasswordScene(@AddVaultWizardWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.ADDVAULT_NEW_PASSWORD); } @Provides @FxmlScene(FxmlFile.ADDVAULT_NEW_RECOVERYKEY) @AddVaultWizardScoped - static Scene provideCreateNewVaultRecoveryKeyScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene(FxmlFile.ADDVAULT_NEW_RECOVERYKEY.getRessourcePathString()); + static Scene provideCreateNewVaultRecoveryKeyScene(@AddVaultWizardWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.ADDVAULT_NEW_RECOVERYKEY); } @Provides @FxmlScene(FxmlFile.ADDVAULT_SUCCESS) @AddVaultWizardScoped - static Scene provideCreateNewVaultSuccessScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene(FxmlFile.ADDVAULT_SUCCESS.getRessourcePathString()); + static Scene provideCreateNewVaultSuccessScene(@AddVaultWizardWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.ADDVAULT_SUCCESS); } // ------------------ 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 aff1b1e0d..e80871208 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 @@ -5,7 +5,7 @@ import dagger.Module; import dagger.Provides; import dagger.multibindings.IntoMap; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -37,8 +37,8 @@ abstract class ChangePasswordModule { @Provides @ChangePasswordWindow @ChangePasswordScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -56,8 +56,8 @@ abstract class ChangePasswordModule { @Provides @FxmlScene(FxmlFile.CHANGEPASSWORD) @ChangePasswordScoped - static Scene provideUnlockScene(@ChangePasswordWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/changepassword.fxml"); + static Scene provideUnlockScene(@ChangePasswordWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.CHANGEPASSWORD); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/ErrorModule.java b/main/ui/src/main/java/org/cryptomator/ui/common/ErrorModule.java index 3dd0a6a14..d2515e661 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/common/ErrorModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/common/ErrorModule.java @@ -18,8 +18,8 @@ import java.util.ResourceBundle; abstract class ErrorModule { @Provides - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -38,8 +38,8 @@ abstract class ErrorModule { @Provides @FxmlScene(FxmlFile.ERROR) - static Scene provideErrorScene(FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene(FxmlFile.ERROR.getRessourcePathString()); + static Scene provideErrorScene(FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.ERROR); } 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 d79237baa..d63167c3b 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 @@ -40,7 +40,7 @@ public enum FxmlFile { this.ressourcePathString = ressourcePathString; } - public String getRessourcePathString() { + String getRessourcePathString() { return ressourcePathString; } } diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/FXMLLoaderFactory.java b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlLoaderFactory.java similarity index 91% rename from main/ui/src/main/java/org/cryptomator/ui/common/FXMLLoaderFactory.java rename to main/ui/src/main/java/org/cryptomator/ui/common/FxmlLoaderFactory.java index c1f7f8350..cf8940cc2 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/common/FXMLLoaderFactory.java +++ b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlLoaderFactory.java @@ -11,13 +11,13 @@ import java.util.Map; import java.util.ResourceBundle; import java.util.function.Function; -public class FXMLLoaderFactory { +public class FxmlLoaderFactory { private final Map, Provider> controllerFactories; private final Function sceneFactory; private final ResourceBundle resourceBundle; - public FXMLLoaderFactory(Map, Provider> controllerFactories, Function sceneFactory, ResourceBundle resourceBundle) { + public FxmlLoaderFactory(Map, Provider> controllerFactories, Function sceneFactory, ResourceBundle resourceBundle) { this.controllerFactories = controllerFactories; this.sceneFactory = sceneFactory; this.resourceBundle = resourceBundle; @@ -48,13 +48,17 @@ public class FXMLLoaderFactory { return loader; } + public Scene createScene(FxmlFile fxmlFile) { + return createScene(fxmlFile.getRessourcePathString()); + } + /** * {@link #load(String) Loads} the FXML file and creates a new Scene containing the loaded ui. * * @param fxmlResourceName Name of the resource (as in {@link Class#getResource(String)}). * @throws UncheckedIOException wrapping any IOException thrown by {@link #load(String)). */ - public Scene createScene(String fxmlResourceName) { + private Scene createScene(String fxmlResourceName) { final FXMLLoader loader; try { loader = load(fxmlResourceName); 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 5164eea30..b0c34e9f5 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 @@ -5,7 +5,7 @@ import dagger.Module; import dagger.Provides; import dagger.multibindings.IntoMap; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -29,8 +29,8 @@ abstract class ForgetPasswordModule { @Provides @ForgetPasswordWindow @ForgetPasswordScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -62,8 +62,8 @@ abstract class ForgetPasswordModule { @Provides @FxmlScene(FxmlFile.FORGET_PASSWORD) @ForgetPasswordScoped - static Scene provideForgetPasswordScene(@ForgetPasswordWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/forget_password.fxml"); + static Scene provideForgetPasswordScene(@ForgetPasswordWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.FORGET_PASSWORD); } // ------------------ diff --git a/main/ui/src/main/java/org/cryptomator/ui/lock/LockModule.java b/main/ui/src/main/java/org/cryptomator/ui/lock/LockModule.java index bbc8c2209..160dcf6fb 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/lock/LockModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/lock/LockModule.java @@ -6,7 +6,7 @@ import dagger.Provides; import dagger.multibindings.IntoMap; import org.cryptomator.common.vaults.Vault; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -40,8 +40,8 @@ abstract class LockModule { @Provides @LockWindow @LockScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -63,15 +63,15 @@ abstract class LockModule { @Provides @FxmlScene(FxmlFile.LOCK_FORCED) @LockScoped - static Scene provideForceLockScene(@LockWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/lock_forced.fxml"); + static Scene provideForceLockScene(@LockWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.LOCK_FORCED); } @Provides @FxmlScene(FxmlFile.LOCK_FAILED) @LockScoped - static Scene provideLockFailedScene(@LockWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/lock_failed.fxml"); + static Scene provideLockFailedScene(@LockWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.LOCK_FAILED); } // ------------------ diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java index e39a9d991..f8316d289 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java @@ -6,7 +6,7 @@ import dagger.Provides; import dagger.multibindings.IntoMap; import org.cryptomator.common.vaults.Vault; import org.cryptomator.ui.addvaultwizard.AddVaultWizardComponent; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -39,8 +39,8 @@ abstract class MainWindowModule { @Provides @MainWindow @MainWindowScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, MainWindowSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, MainWindowSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -60,8 +60,8 @@ abstract class MainWindowModule { @Provides @FxmlScene(FxmlFile.MAIN_WINDOW) @MainWindowScoped - static Scene provideMainScene(@MainWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/main_window.fxml"); + static Scene provideMainScene(@MainWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.MAIN_WINDOW); } // ------------------ diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellFactory.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellFactory.java index 80cf2f82b..d73109d0e 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellFactory.java +++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellFactory.java @@ -1,7 +1,7 @@ package org.cryptomator.ui.mainwindow; import org.cryptomator.common.vaults.Vault; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.controls.DraggableListCell; import javax.inject.Inject; @@ -17,10 +17,10 @@ import java.io.UncheckedIOException; @MainWindowScoped public class VaultListCellFactory implements Callback, ListCell> { - private final FXMLLoaderFactory fxmlLoaders; + private final FxmlLoaderFactory fxmlLoaders; @Inject - VaultListCellFactory(@MainWindow FXMLLoaderFactory fxmlLoaders) { + VaultListCellFactory(@MainWindow FxmlLoaderFactory fxmlLoaders) { this.fxmlLoaders = fxmlLoaders; } diff --git a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationModule.java b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationModule.java index 9f41b497e..44f6960b1 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationModule.java @@ -6,7 +6,7 @@ import dagger.Provides; import dagger.multibindings.IntoMap; import org.cryptomator.cryptofs.common.FileSystemCapabilityChecker; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -30,8 +30,8 @@ abstract class MigrationModule { @Provides @MigrationWindow @MigrationScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -56,36 +56,36 @@ abstract class MigrationModule { @Provides @FxmlScene(FxmlFile.MIGRATION_START) @MigrationScoped - static Scene provideMigrationStartScene(@MigrationWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/migration_start.fxml"); + static Scene provideMigrationStartScene(@MigrationWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.MIGRATION_START); } @Provides @FxmlScene(FxmlFile.MIGRATION_RUN) @MigrationScoped - static Scene provideMigrationRunScene(@MigrationWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/migration_run.fxml"); + static Scene provideMigrationRunScene(@MigrationWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.MIGRATION_RUN); } @Provides @FxmlScene(FxmlFile.MIGRATION_SUCCESS) @MigrationScoped - static Scene provideMigrationSuccessScene(@MigrationWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/migration_success.fxml"); + static Scene provideMigrationSuccessScene(@MigrationWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.MIGRATION_SUCCESS); } @Provides @FxmlScene(FxmlFile.MIGRATION_CAPABILITY_ERROR) @MigrationScoped - static Scene provideMigrationCapabilityErrorScene(@MigrationWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/migration_capability_error.fxml"); + static Scene provideMigrationCapabilityErrorScene(@MigrationWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.MIGRATION_CAPABILITY_ERROR); } @Provides @FxmlScene(FxmlFile.MIGRATION_IMPOSSIBLE) @MigrationScoped - static Scene provideMigrationImpossibleScene(@MigrationWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/migration_impossible.fxml"); + static Scene provideMigrationImpossibleScene(@MigrationWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.MIGRATION_IMPOSSIBLE); } // ------------------ diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java index 3cc012b03..51fa6b581 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java @@ -5,7 +5,7 @@ import dagger.Module; import dagger.Provides; import dagger.multibindings.IntoMap; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -32,8 +32,8 @@ abstract class PreferencesModule { @Provides @PreferencesWindow @PreferencesScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -49,8 +49,8 @@ abstract class PreferencesModule { @Provides @FxmlScene(FxmlFile.PREFERENCES) @PreferencesScoped - static Scene providePreferencesScene(@PreferencesWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/preferences.fxml"); + static Scene providePreferencesScene(@PreferencesWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.PREFERENCES); } // ------------------ diff --git a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitModule.java b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitModule.java index 9c779f434..ee90d747b 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitModule.java @@ -5,7 +5,7 @@ import dagger.Module; import dagger.Provides; import dagger.multibindings.IntoMap; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -25,8 +25,8 @@ abstract class QuitModule { @Provides @QuitWindow @QuitScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -43,8 +43,8 @@ abstract class QuitModule { @Provides @FxmlScene(FxmlFile.QUIT) @QuitScoped - static Scene provideQuitScene(@QuitWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/quit.fxml"); + static Scene provideQuitScene(@QuitWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.QUIT); } // ------------------ diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java index c6f502886..58d9fbde9 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java @@ -6,7 +6,7 @@ import dagger.Provides; import dagger.multibindings.IntoMap; import org.cryptomator.common.vaults.Vault; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -33,8 +33,8 @@ abstract class RecoveryKeyModule { @Provides @RecoveryKeyWindow @RecoveryKeyScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -69,29 +69,29 @@ abstract class RecoveryKeyModule { @Provides @FxmlScene(FxmlFile.RECOVERYKEY_CREATE) @RecoveryKeyScoped - static Scene provideRecoveryKeyCreationScene(@RecoveryKeyWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/recoverykey_create.fxml"); + static Scene provideRecoveryKeyCreationScene(@RecoveryKeyWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.RECOVERYKEY_CREATE); } @Provides @FxmlScene(FxmlFile.RECOVERYKEY_SUCCESS) @RecoveryKeyScoped - static Scene provideRecoveryKeySuccessScene(@RecoveryKeyWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/recoverykey_success.fxml"); + static Scene provideRecoveryKeySuccessScene(@RecoveryKeyWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.RECOVERYKEY_SUCCESS); } @Provides @FxmlScene(FxmlFile.RECOVERYKEY_RECOVER) @RecoveryKeyScoped - static Scene provideRecoveryKeyRecoverScene(@RecoveryKeyWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/recoverykey_recover.fxml"); + static Scene provideRecoveryKeyRecoverScene(@RecoveryKeyWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.RECOVERYKEY_RECOVER); } @Provides @FxmlScene(FxmlFile.RECOVERYKEY_RESET_PASSWORD) @RecoveryKeyScoped - static Scene provideRecoveryKeyResetPasswordScene(@RecoveryKeyWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/recoverykey_reset_password.fxml"); + static Scene provideRecoveryKeyResetPasswordScene(@RecoveryKeyWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.RECOVERYKEY_RESET_PASSWORD); } // ------------------ 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 5e717c431..5915766ed 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 @@ -5,7 +5,7 @@ import dagger.Module; import dagger.Provides; import dagger.multibindings.IntoMap; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -26,8 +26,8 @@ abstract class RemoveVaultModule { @Provides @RemoveVaultWindow @RemoveVaultScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -45,8 +45,8 @@ abstract class RemoveVaultModule { @Provides @FxmlScene(FxmlFile.REMOVE_VAULT) @RemoveVaultScoped - static Scene provideRemoveVaultScene(@RemoveVaultWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/remove_vault.fxml"); + static Scene provideRemoveVaultScene(@RemoveVaultWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.REMOVE_VAULT); } // ------------------ diff --git a/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsModule.java b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsModule.java index 14395af24..803de314c 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsModule.java @@ -11,7 +11,7 @@ import javafx.stage.Stage; import org.cryptomator.common.vaults.Vault; import org.cryptomator.common.vaults.VaultState; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -29,8 +29,8 @@ abstract class VaultStatisticsModule { @Provides @VaultStatisticsWindow @VaultStatisticsScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -60,8 +60,8 @@ abstract class VaultStatisticsModule { @Provides @FxmlScene(FxmlFile.VAULT_STATISTICS) @VaultStatisticsScoped - static Scene provideVaultStatisticsScene(@VaultStatisticsWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/stats.fxml"); + static Scene provideVaultStatisticsScene(@VaultStatisticsWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.VAULT_STATISTICS); } // ------------------ diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java index 97821ab25..37940e3a2 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java @@ -8,7 +8,7 @@ import org.cryptomator.common.keychain.KeychainManager; import org.cryptomator.common.vaults.Vault; import org.cryptomator.integrations.keychain.KeychainAccessException; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -97,8 +97,8 @@ abstract class UnlockModule { @Provides @UnlockWindow @UnlockScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -120,29 +120,29 @@ abstract class UnlockModule { @Provides @FxmlScene(FxmlFile.UNLOCK) @UnlockScoped - static Scene provideUnlockScene(@UnlockWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/unlock.fxml"); + static Scene provideUnlockScene(@UnlockWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.UNLOCK); } @Provides @FxmlScene(FxmlFile.UNLOCK_SELECT_MASTERKEYFILE) @UnlockScoped - static Scene provideUnlockSelectMasterkeyFileScene(@UnlockWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/unlock_select_masterkeyfile.fxml"); + static Scene provideUnlockSelectMasterkeyFileScene(@UnlockWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.UNLOCK_SELECT_MASTERKEYFILE); } @Provides @FxmlScene(FxmlFile.UNLOCK_SUCCESS) @UnlockScoped - static Scene provideUnlockSuccessScene(@UnlockWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/unlock_success.fxml"); + static Scene provideUnlockSuccessScene(@UnlockWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.UNLOCK_SUCCESS); } @Provides @FxmlScene(FxmlFile.UNLOCK_INVALID_MOUNT_POINT) @UnlockScoped - static Scene provideInvalidMountPointScene(@UnlockWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/unlock_invalid_mount_point.fxml"); + static Scene provideInvalidMountPointScene(@UnlockWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.UNLOCK_INVALID_MOUNT_POINT); } // ------------------ diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java index 2c6e3be65..926658f06 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java +++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java @@ -251,6 +251,7 @@ public class UnlockWorkflow extends Task implements MasterkeyFileLoader private void showInvalidMountPointScene() { Platform.runLater(() -> { window.setScene(invalidMountPointScene.get()); + window.show(); }); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java index 0e65ed0d2..bf47c294c 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java @@ -7,7 +7,7 @@ import dagger.multibindings.IntoMap; import org.cryptomator.common.vaults.Vault; import org.cryptomator.ui.changepassword.ChangePasswordComponent; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -29,8 +29,8 @@ abstract class VaultOptionsModule { @Provides @VaultOptionsWindow @VaultOptionsScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -50,8 +50,8 @@ abstract class VaultOptionsModule { @Provides @FxmlScene(FxmlFile.VAULT_OPTIONS) @VaultOptionsScoped - static Scene provideVaultOptionsScene(@VaultOptionsWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/vault_options.fxml"); + static Scene provideVaultOptionsScene(@VaultOptionsWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.VAULT_OPTIONS); } // ------------------ 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 4d26a371c..7600146e5 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 @@ -5,7 +5,7 @@ import dagger.Module; import dagger.Provides; import dagger.multibindings.IntoMap; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -26,8 +26,8 @@ abstract class WrongFileAlertModule { @Provides @WrongFileAlertWindow @WrongFileAlertScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -45,8 +45,8 @@ abstract class WrongFileAlertModule { @Provides @FxmlScene(FxmlFile.WRONGFILEALERT) @WrongFileAlertScoped - static Scene provideWrongFileAlertScene(@WrongFileAlertWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/wrongfilealert.fxml"); + static Scene provideWrongFileAlertScene(@WrongFileAlertWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.WRONGFILEALERT); } // ------------------ diff --git a/main/ui/src/main/resources/license/THIRD-PARTY.txt b/main/ui/src/main/resources/license/THIRD-PARTY.txt index 6d60273ac..fb586ad94 100644 --- a/main/ui/src/main/resources/license/THIRD-PARTY.txt +++ b/main/ui/src/main/resources/license/THIRD-PARTY.txt @@ -72,7 +72,7 @@ Cryptomator uses 46 third-party dependencies under the following licenses: - Java Native Access (net.java.dev.jna:jna:5.6.0 - https://github.com/java-native-access/jna) - Java Native Access Platform (net.java.dev.jna:jna-platform:5.5.0 - https://github.com/java-native-access/jna) MIT License: - - java jwt (com.auth0:java-jwt:3.11.0 - https://github.com/auth0/java-jwt) + - java jwt (com.auth0:java-jwt:3.12.0 - https://github.com/auth0/java-jwt) - jnr-x86asm (com.github.jnr:jnr-x86asm:1.0.2 - http://github.com/jnr/jnr-x86asm) - jnr-fuse (com.github.serceman:jnr-fuse:0.5.4 - no url defined) - zxcvbn4j (com.nulab-inc:zxcvbn:1.3.0 - https://github.com/nulab/zxcvbn4j)