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 a5398d51b..504136f4a 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 @@ -4,7 +4,7 @@ import dagger.Lazy; import org.apache.commons.lang3.SystemUtils; import org.cryptomator.common.vaults.Vault; import org.cryptomator.common.vaults.VaultListManager; -import org.cryptomator.ui.common.ErrorComponent; +import org.cryptomator.ui.error.ErrorComponent; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; 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 4eeea5c3d..9da33eaad 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,7 @@ package org.cryptomator.ui.addvaultwizard; import dagger.Lazy; -import org.cryptomator.ui.common.ErrorComponent; +import org.cryptomator.ui.error.ErrorComponent; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; 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 c4e226359..cf0c68040 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 @@ -5,7 +5,7 @@ import org.cryptomator.common.vaults.Vault; import org.cryptomator.common.vaults.VaultListManager; import org.cryptomator.cryptofs.CryptoFileSystemProperties; import org.cryptomator.cryptofs.CryptoFileSystemProvider; -import org.cryptomator.ui.common.ErrorComponent; +import org.cryptomator.ui.error.ErrorComponent; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; diff --git a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java index 52cfe2b81..eca3e5a8e 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java @@ -6,7 +6,7 @@ import org.cryptomator.cryptofs.CryptoFileSystemProvider; import org.cryptomator.cryptolib.api.InvalidPassphraseException; import org.cryptomator.integrations.keychain.KeychainAccessException; import org.cryptomator.ui.common.Animations; -import org.cryptomator.ui.common.ErrorComponent; +import org.cryptomator.ui.error.ErrorComponent; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.controls.NiceSecurePasswordField; import org.slf4j.Logger; diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/ErrorComponent.java b/main/ui/src/main/java/org/cryptomator/ui/error/ErrorComponent.java similarity index 87% rename from main/ui/src/main/java/org/cryptomator/ui/common/ErrorComponent.java rename to main/ui/src/main/java/org/cryptomator/ui/error/ErrorComponent.java index 285270b4c..666d4b715 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/common/ErrorComponent.java +++ b/main/ui/src/main/java/org/cryptomator/ui/error/ErrorComponent.java @@ -1,7 +1,9 @@ -package org.cryptomator.ui.common; +package org.cryptomator.ui.error; import dagger.BindsInstance; import dagger.Subcomponent; +import org.cryptomator.ui.common.FxmlFile; +import org.cryptomator.ui.common.FxmlScene; import javax.annotation.Nullable; import javafx.application.Platform; diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/ErrorController.java b/main/ui/src/main/java/org/cryptomator/ui/error/ErrorController.java similarity index 91% rename from main/ui/src/main/java/org/cryptomator/ui/common/ErrorController.java rename to main/ui/src/main/java/org/cryptomator/ui/error/ErrorController.java index c7f19a9e6..f90ec09b1 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/common/ErrorController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/error/ErrorController.java @@ -1,4 +1,6 @@ -package org.cryptomator.ui.common; +package org.cryptomator.ui.error; + +import org.cryptomator.ui.common.FxController; import javax.annotation.Nullable; import javax.inject.Inject; diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/ErrorModule.java b/main/ui/src/main/java/org/cryptomator/ui/error/ErrorModule.java similarity index 79% rename from main/ui/src/main/java/org/cryptomator/ui/common/ErrorModule.java rename to main/ui/src/main/java/org/cryptomator/ui/error/ErrorModule.java index d2515e661..dba3e41e8 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/common/ErrorModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/error/ErrorModule.java @@ -1,9 +1,15 @@ -package org.cryptomator.ui.common; +package org.cryptomator.ui.error; import dagger.Binds; import dagger.Module; import dagger.Provides; import dagger.multibindings.IntoMap; +import org.cryptomator.ui.common.DefaultSceneFactory; +import org.cryptomator.ui.common.FxController; +import org.cryptomator.ui.common.FxControllerKey; +import org.cryptomator.ui.common.FxmlFile; +import org.cryptomator.ui.common.FxmlLoaderFactory; +import org.cryptomator.ui.common.FxmlScene; import javax.inject.Named; import javax.inject.Provider; diff --git a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java index 74c201372..a904ed7b7 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java @@ -9,7 +9,7 @@ import dagger.Binds; import dagger.Module; import dagger.Provides; import org.apache.commons.lang3.SystemUtils; -import org.cryptomator.ui.common.ErrorComponent; +import org.cryptomator.ui.error.ErrorComponent; import org.cryptomator.ui.common.StageFactory; import org.cryptomator.ui.lock.LockComponent; import org.cryptomator.ui.mainwindow.MainWindowComponent; @@ -19,9 +19,7 @@ import org.cryptomator.ui.unlock.UnlockComponent; import javax.inject.Named; import javafx.application.Application; -import javafx.collections.ObservableSet; import javafx.scene.image.Image; -import javafx.stage.Stage; import java.io.IOException; import java.io.InputStream; import java.io.UncheckedIOException; diff --git a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java index 830e15819..444b78166 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java @@ -12,7 +12,7 @@ import org.cryptomator.cryptofs.migration.api.MigrationProgressListener; import org.cryptomator.cryptolib.api.InvalidPassphraseException; import org.cryptomator.integrations.keychain.KeychainAccessException; import org.cryptomator.ui.common.Animations; -import org.cryptomator.ui.common.ErrorComponent; +import org.cryptomator.ui.error.ErrorComponent; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java index ea1fbfe3a..a6bb52ee5 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java @@ -8,7 +8,7 @@ import org.cryptomator.common.settings.UiTheme; import org.cryptomator.integrations.autostart.AutoStartProvider; import org.cryptomator.integrations.autostart.ToggleAutoStartFailedException; import org.cryptomator.integrations.keychain.KeychainAccessProvider; -import org.cryptomator.ui.common.ErrorComponent; +import org.cryptomator.ui.error.ErrorComponent; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.traymenu.TrayMenuComponent; import org.slf4j.Logger; diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java index 902f2cd50..2bbb9b0b2 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java @@ -4,7 +4,7 @@ import dagger.Lazy; import org.cryptomator.common.vaults.Vault; import org.cryptomator.cryptolib.api.InvalidPassphraseException; import org.cryptomator.ui.common.Animations; -import org.cryptomator.ui.common.ErrorComponent; +import org.cryptomator.ui.error.ErrorComponent; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java index cdf54990f..37d309ef6 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java @@ -2,7 +2,7 @@ package org.cryptomator.ui.recoverykey; import dagger.Lazy; import org.cryptomator.common.vaults.Vault; -import org.cryptomator.ui.common.ErrorComponent; +import org.cryptomator.ui.error.ErrorComponent; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; 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 c1b5fbd45..99af514f0 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 @@ -10,7 +10,7 @@ import org.cryptomator.common.vaults.Volume.VolumeException; import org.cryptomator.cryptolib.api.InvalidPassphraseException; import org.cryptomator.integrations.keychain.KeychainAccessException; import org.cryptomator.ui.common.Animations; -import org.cryptomator.ui.common.ErrorComponent; +import org.cryptomator.ui.error.ErrorComponent; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; import org.cryptomator.ui.common.UserInteractionLock; diff --git a/main/ui/src/main/resources/fxml/error.fxml b/main/ui/src/main/resources/fxml/error.fxml index adcebdb67..1a8c7c878 100644 --- a/main/ui/src/main/resources/fxml/error.fxml +++ b/main/ui/src/main/resources/fxml/error.fxml @@ -12,7 +12,7 @@