From cb3c46744e565b68f1be6b31bf171641af0853ac Mon Sep 17 00:00:00 2001 From: Jan-Peter Klein Date: Thu, 14 Nov 2024 16:38:44 +0100 Subject: [PATCH] removed replaced files --- .../org/cryptomator/ui/common/FxmlFile.java | 3 - .../DokanySupportEndComponent.java | 34 ----------- .../DokanySupportEndController.java | 34 ----------- .../DokanySupportEndModule.java | 57 ------------------ .../DokanySupportEndScoped.java | 13 ---- .../DokanySupportEndWindow.java | 14 ----- .../ui/fxapp/FxApplicationModule.java | 4 -- .../ui/fxapp/FxApplicationWindows.java | 4 -- .../ui/removecert/RemoveCertComponent.java | 34 ----------- .../ui/removecert/RemoveCertController.java | 32 ---------- .../ui/removecert/RemoveCertModule.java | 56 ------------------ .../ui/removecert/RemoveCertScoped.java | 13 ---- .../ui/removecert/RemoveCertWindow.java | 14 ----- .../ui/removevault/RemoveVaultComponent.java | 39 ------------ .../ui/removevault/RemoveVaultController.java | 40 ------------- .../ui/removevault/RemoveVaultModule.java | 59 ------------------- .../ui/removevault/RemoveVaultScoped.java | 13 ---- .../ui/removevault/RemoveVaultWindow.java | 14 ----- .../resources/fxml/dokany_support_end.fxml | 53 ----------------- src/main/resources/fxml/remove_cert.fxml | 51 ---------------- src/main/resources/fxml/remove_vault.fxml | 52 ---------------- 21 files changed, 633 deletions(-) delete mode 100644 src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndComponent.java delete mode 100644 src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndController.java delete mode 100644 src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndModule.java delete mode 100644 src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndScoped.java delete mode 100644 src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndWindow.java delete mode 100644 src/main/java/org/cryptomator/ui/removecert/RemoveCertComponent.java delete mode 100644 src/main/java/org/cryptomator/ui/removecert/RemoveCertController.java delete mode 100644 src/main/java/org/cryptomator/ui/removecert/RemoveCertModule.java delete mode 100644 src/main/java/org/cryptomator/ui/removecert/RemoveCertScoped.java delete mode 100644 src/main/java/org/cryptomator/ui/removecert/RemoveCertWindow.java delete mode 100644 src/main/java/org/cryptomator/ui/removevault/RemoveVaultComponent.java delete mode 100644 src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java delete mode 100644 src/main/java/org/cryptomator/ui/removevault/RemoveVaultModule.java delete mode 100644 src/main/java/org/cryptomator/ui/removevault/RemoveVaultScoped.java delete mode 100644 src/main/java/org/cryptomator/ui/removevault/RemoveVaultWindow.java delete mode 100644 src/main/resources/fxml/dokany_support_end.fxml delete mode 100644 src/main/resources/fxml/remove_cert.fxml delete mode 100644 src/main/resources/fxml/remove_vault.fxml diff --git a/src/main/java/org/cryptomator/ui/common/FxmlFile.java b/src/main/java/org/cryptomator/ui/common/FxmlFile.java index 2ad072992..da6bad383 100644 --- a/src/main/java/org/cryptomator/ui/common/FxmlFile.java +++ b/src/main/java/org/cryptomator/ui/common/FxmlFile.java @@ -13,7 +13,6 @@ public enum FxmlFile { CONVERTVAULT_HUBTOPASSWORD_CONVERT("/fxml/convertvault_hubtopassword_convert.fxml"), // CONVERTVAULT_HUBTOPASSWORD_SUCCESS("/fxml/convertvault_hubtopassword_success.fxml"), // CUSTOM_DIALOG("/fxml/custom_dialog.fxml"), // - DOKANY_SUPPORT_END("/fxml/dokany_support_end.fxml"), // ERROR("/fxml/error.fxml"), // FORGET_PASSWORD("/fxml/forget_password.fxml"), // HEALTH_START("/fxml/health_start.fxml"), // @@ -46,8 +45,6 @@ public enum FxmlFile { RECOVERYKEY_RESET_PASSWORD("/fxml/recoverykey_reset_password.fxml"), // RECOVERYKEY_RESET_PASSWORD_SUCCESS("/fxml/recoverykey_reset_password_success.fxml"), // RECOVERYKEY_SUCCESS("/fxml/recoverykey_success.fxml"), // - REMOVE_CERT("/fxml/remove_cert.fxml"), // - REMOVE_VAULT("/fxml/remove_vault.fxml"), // SHARE_VAULT("/fxml/share_vault.fxml"), // UPDATE_REMINDER("/fxml/update_reminder.fxml"), // UNLOCK_ENTER_PASSWORD("/fxml/unlock_enter_password.fxml"), diff --git a/src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndComponent.java b/src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndComponent.java deleted file mode 100644 index 48a5ab36c..000000000 --- a/src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndComponent.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.cryptomator.ui.dokanysupportend; - -import dagger.Lazy; -import dagger.Subcomponent; -import org.cryptomator.ui.common.FxmlFile; -import org.cryptomator.ui.common.FxmlScene; - -import javafx.scene.Scene; -import javafx.stage.Stage; - -@DokanySupportEndScoped -@Subcomponent(modules = {DokanySupportEndModule.class}) -public interface DokanySupportEndComponent { - - @DokanySupportEndWindow - Stage window(); - - @FxmlScene(FxmlFile.DOKANY_SUPPORT_END) - Lazy dokanySupportEndScene(); - - - default void showDokanySupportEndWindow() { - Stage stage = window(); - stage.setScene(dokanySupportEndScene().get()); - stage.sizeToScene(); - stage.show(); - } - - @Subcomponent.Factory - interface Factory { - - DokanySupportEndComponent create(); - } -} \ No newline at end of file diff --git a/src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndController.java b/src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndController.java deleted file mode 100644 index a1d626402..000000000 --- a/src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndController.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.cryptomator.ui.dokanysupportend; - -import org.cryptomator.ui.common.FxController; -import org.cryptomator.ui.fxapp.FxApplicationWindows; -import org.cryptomator.ui.preferences.SelectedPreferencesTab; - -import javax.inject.Inject; -import javafx.fxml.FXML; -import javafx.stage.Stage; - - -@DokanySupportEndScoped -public class DokanySupportEndController implements FxController { - - private final Stage window; - private final FxApplicationWindows applicationWindows; - - @Inject - DokanySupportEndController(@DokanySupportEndWindow Stage window, FxApplicationWindows applicationWindows) { - this.window = window; - this.applicationWindows = applicationWindows; - } - - @FXML - public void close() { - window.close(); - } - - public void openVolumePreferences() { - applicationWindows.showPreferencesWindow(SelectedPreferencesTab.VOLUME); - window.close(); - } - -} \ No newline at end of file diff --git a/src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndModule.java b/src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndModule.java deleted file mode 100644 index 64689eb26..000000000 --- a/src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndModule.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.cryptomator.ui.dokanysupportend; - -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 org.cryptomator.ui.common.StageFactory; - -import javax.inject.Provider; -import javafx.scene.Scene; -import javafx.stage.Modality; -import javafx.stage.Stage; -import java.util.Map; -import java.util.ResourceBundle; - -@Module -abstract class DokanySupportEndModule { - - @Provides - @DokanySupportEndWindow - @DokanySupportEndScoped - static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); - } - - @Provides - @DokanySupportEndWindow - @DokanySupportEndScoped - static Stage provideStage(StageFactory factory, ResourceBundle resourceBundle) { - Stage stage = factory.create(); - stage.setTitle(resourceBundle.getString("dokanySupportEnd.title")); - stage.setMinWidth(500); - stage.setMinHeight(100); - stage.initModality(Modality.APPLICATION_MODAL); - return stage; - } - - @Provides - @FxmlScene(FxmlFile.DOKANY_SUPPORT_END) - @DokanySupportEndScoped - static Scene provideDokanySupportEndScene(@DokanySupportEndWindow FxmlLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene(FxmlFile.DOKANY_SUPPORT_END); - } - - - @Binds - @IntoMap - @FxControllerKey(DokanySupportEndController.class) - abstract FxController bindDokanySupportEndController(DokanySupportEndController controller); - -} diff --git a/src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndScoped.java b/src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndScoped.java deleted file mode 100644 index 967e6f86f..000000000 --- a/src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndScoped.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.cryptomator.ui.dokanysupportend; - -import javax.inject.Scope; -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -@Scope -@Documented -@Retention(RetentionPolicy.RUNTIME) -@interface DokanySupportEndScoped { - -} diff --git a/src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndWindow.java b/src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndWindow.java deleted file mode 100644 index bb9b1617c..000000000 --- a/src/main/java/org/cryptomator/ui/dokanysupportend/DokanySupportEndWindow.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.cryptomator.ui.dokanysupportend; - -import javax.inject.Qualifier; -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; - -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -@Qualifier -@Documented -@Retention(RUNTIME) -@interface DokanySupportEndWindow { - -} diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java index 98d152fa1..0938e6064 100644 --- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java +++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java @@ -8,14 +8,12 @@ package org.cryptomator.ui.fxapp; import dagger.Module; import dagger.Provides; import org.cryptomator.ui.controls.CustomDialog; -import org.cryptomator.ui.dokanysupportend.DokanySupportEndComponent; import org.cryptomator.ui.error.ErrorComponent; import org.cryptomator.ui.health.HealthCheckComponent; import org.cryptomator.ui.lock.LockComponent; import org.cryptomator.ui.mainwindow.MainWindowComponent; import org.cryptomator.ui.preferences.PreferencesComponent; import org.cryptomator.ui.quit.QuitComponent; -import org.cryptomator.ui.removecert.RemoveCertComponent; import org.cryptomator.ui.sharevault.ShareVaultComponent; import org.cryptomator.ui.traymenu.TrayMenuComponent; import org.cryptomator.ui.unlock.UnlockComponent; @@ -37,8 +35,6 @@ import java.util.ResourceBundle; ErrorComponent.class, // HealthCheckComponent.class, // UpdateReminderComponent.class, // - DokanySupportEndComponent.class, // - RemoveCertComponent.class, // ShareVaultComponent.class}) abstract class FxApplicationModule { diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java index fc7602fc2..2e8cbb026 100644 --- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java +++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java @@ -7,7 +7,6 @@ import org.cryptomator.common.vaults.VaultState; import org.cryptomator.integrations.tray.TrayIntegrationProvider; import org.cryptomator.ui.controls.CustomDialog; import org.cryptomator.ui.controls.FontAwesome5Icon; -import org.cryptomator.ui.dokanysupportend.DokanySupportEndComponent; import org.cryptomator.ui.error.ErrorComponent; import org.cryptomator.ui.lock.LockComponent; import org.cryptomator.ui.mainwindow.MainWindowComponent; @@ -51,7 +50,6 @@ public class FxApplicationWindows { private final QuitComponent.Builder quitWindowBuilder; private final UnlockComponent.Factory unlockWorkflowFactory; private final UpdateReminderComponent.Factory updateReminderWindowBuilder; - private final DokanySupportEndComponent.Factory dokanySupportEndWindowBuilder; private final LockComponent.Factory lockWorkflowFactory; private final ErrorComponent.Factory errorWindowFactory; private final ExecutorService executor; @@ -68,7 +66,6 @@ public class FxApplicationWindows { QuitComponent.Builder quitWindowBuilder, // UnlockComponent.Factory unlockWorkflowFactory, // UpdateReminderComponent.Factory updateReminderWindowBuilder, // - DokanySupportEndComponent.Factory dokanySupportEndWindowBuilder, // LockComponent.Factory lockWorkflowFactory, // ErrorComponent.Factory errorWindowFactory, // VaultOptionsComponent.Factory vaultOptionsWindow, // @@ -82,7 +79,6 @@ public class FxApplicationWindows { this.quitWindowBuilder = quitWindowBuilder; this.unlockWorkflowFactory = unlockWorkflowFactory; this.updateReminderWindowBuilder = updateReminderWindowBuilder; - this.dokanySupportEndWindowBuilder = dokanySupportEndWindowBuilder; this.lockWorkflowFactory = lockWorkflowFactory; this.errorWindowFactory = errorWindowFactory; this.executor = executor; diff --git a/src/main/java/org/cryptomator/ui/removecert/RemoveCertComponent.java b/src/main/java/org/cryptomator/ui/removecert/RemoveCertComponent.java deleted file mode 100644 index 40fc867f9..000000000 --- a/src/main/java/org/cryptomator/ui/removecert/RemoveCertComponent.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.cryptomator.ui.removecert; - -import dagger.Lazy; -import dagger.Subcomponent; -import org.cryptomator.ui.common.FxmlFile; -import org.cryptomator.ui.common.FxmlScene; - -import javafx.scene.Scene; -import javafx.stage.Stage; - -@RemoveCertScoped -@Subcomponent(modules = {RemoveCertModule.class}) -public interface RemoveCertComponent { - - @RemoveCertWindow - Stage window(); - - @FxmlScene(FxmlFile.REMOVE_CERT) - Lazy scene(); - - default void showRemoveCert(Stage owner) { - Stage stage = window(); - stage.setScene(scene().get()); - stage.sizeToScene(); - stage.initOwner(owner); - stage.show(); - } - - @Subcomponent.Builder - interface Builder { - RemoveCertComponent build(); - } - -} diff --git a/src/main/java/org/cryptomator/ui/removecert/RemoveCertController.java b/src/main/java/org/cryptomator/ui/removecert/RemoveCertController.java deleted file mode 100644 index 2ac08a02d..000000000 --- a/src/main/java/org/cryptomator/ui/removecert/RemoveCertController.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.cryptomator.ui.removecert; - -import org.cryptomator.common.settings.Settings; -import org.cryptomator.ui.common.FxController; - -import javax.inject.Inject; -import javafx.fxml.FXML; -import javafx.stage.Stage; - -@RemoveCertScoped -public class RemoveCertController implements FxController { - - private final Stage window; - private final Settings settings; - - @Inject - public RemoveCertController(@RemoveCertWindow Stage window, Settings settings) { - this.window = window; - this.settings = settings; - } - - @FXML - public void close() { - window.close(); - } - - @FXML - public void remove() { - settings.licenseKey.set(null); - window.close(); - } -} diff --git a/src/main/java/org/cryptomator/ui/removecert/RemoveCertModule.java b/src/main/java/org/cryptomator/ui/removecert/RemoveCertModule.java deleted file mode 100644 index fb4b8d22a..000000000 --- a/src/main/java/org/cryptomator/ui/removecert/RemoveCertModule.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.cryptomator.ui.removecert; - -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 org.cryptomator.ui.common.StageFactory; - -import javax.inject.Provider; -import javafx.scene.Scene; -import javafx.stage.Modality; -import javafx.stage.Stage; -import java.util.Map; -import java.util.ResourceBundle; - -@Module -abstract class RemoveCertModule { - - @Provides - @RemoveCertWindow - @RemoveCertScoped - static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); - } - - @Provides - @RemoveCertWindow - @RemoveCertScoped - static Stage provideStage(StageFactory factory, ResourceBundle resourceBundle) { - Stage stage = factory.create(); - stage.setTitle(resourceBundle.getString("removeCert.title")); - stage.setResizable(false); - stage.initModality(Modality.WINDOW_MODAL); - return stage; - } - - @Provides - @FxmlScene(FxmlFile.REMOVE_CERT) - @RemoveCertScoped - static Scene provideRemoveCertScene(@RemoveCertWindow FxmlLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene(FxmlFile.REMOVE_CERT); - } - - // ------------------ - - @Binds - @IntoMap - @FxControllerKey(RemoveCertController.class) - abstract FxController bindRemoveCertController(RemoveCertController controller); -} diff --git a/src/main/java/org/cryptomator/ui/removecert/RemoveCertScoped.java b/src/main/java/org/cryptomator/ui/removecert/RemoveCertScoped.java deleted file mode 100644 index d7df8b80c..000000000 --- a/src/main/java/org/cryptomator/ui/removecert/RemoveCertScoped.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.cryptomator.ui.removecert; - -import javax.inject.Scope; -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -@Scope -@Documented -@Retention(RetentionPolicy.RUNTIME) -public @interface RemoveCertScoped { - -} diff --git a/src/main/java/org/cryptomator/ui/removecert/RemoveCertWindow.java b/src/main/java/org/cryptomator/ui/removecert/RemoveCertWindow.java deleted file mode 100644 index cd226d794..000000000 --- a/src/main/java/org/cryptomator/ui/removecert/RemoveCertWindow.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.cryptomator.ui.removecert; - -import javax.inject.Qualifier; -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; - -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -@Qualifier -@Documented -@Retention(RUNTIME) -@interface RemoveCertWindow { - -} diff --git a/src/main/java/org/cryptomator/ui/removevault/RemoveVaultComponent.java b/src/main/java/org/cryptomator/ui/removevault/RemoveVaultComponent.java deleted file mode 100644 index c8b3fd574..000000000 --- a/src/main/java/org/cryptomator/ui/removevault/RemoveVaultComponent.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.cryptomator.ui.removevault; - -import dagger.BindsInstance; -import dagger.Lazy; -import dagger.Subcomponent; -import org.cryptomator.common.vaults.Vault; -import org.cryptomator.ui.common.FxmlFile; -import org.cryptomator.ui.common.FxmlScene; - -import javafx.scene.Scene; -import javafx.stage.Stage; - -@RemoveVaultScoped -@Subcomponent(modules = {RemoveVaultModule.class}) -public interface RemoveVaultComponent { - - @RemoveVaultWindow - Stage window(); - - @FxmlScene(FxmlFile.REMOVE_VAULT) - Lazy scene(); - - default void showRemoveVault() { - Stage stage = window(); - stage.setScene(scene().get()); - stage.sizeToScene(); - stage.show(); - } - - @Subcomponent.Builder - interface Builder { - - @BindsInstance - Builder vault(@RemoveVaultWindow Vault vault); - - RemoveVaultComponent build(); - } - -} diff --git a/src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java b/src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java deleted file mode 100644 index e486d65f0..000000000 --- a/src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.cryptomator.ui.removevault; - -import org.cryptomator.common.vaults.Vault; -import org.cryptomator.ui.common.FxController; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.inject.Inject; -import javafx.collections.ObservableList; -import javafx.fxml.FXML; -import javafx.stage.Stage; - -@RemoveVaultScoped -public class RemoveVaultController implements FxController { - - private static final Logger LOG = LoggerFactory.getLogger(RemoveVaultController.class); - - private final Stage window; - private final Vault vault; - private final ObservableList vaults; - - @Inject - public RemoveVaultController(@RemoveVaultWindow Stage window, @RemoveVaultWindow Vault vault, ObservableList vaults) { - this.window = window; - this.vault = vault; - this.vaults = vaults; - } - - @FXML - public void close() { - window.close(); - } - - @FXML - public void finish() { - vaults.remove(vault); - LOG.debug("Removing vault {}.", vault.getDisplayName()); - window.close(); - } -} diff --git a/src/main/java/org/cryptomator/ui/removevault/RemoveVaultModule.java b/src/main/java/org/cryptomator/ui/removevault/RemoveVaultModule.java deleted file mode 100644 index 2fcac4add..000000000 --- a/src/main/java/org/cryptomator/ui/removevault/RemoveVaultModule.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.cryptomator.ui.removevault; - -import dagger.Binds; -import dagger.Module; -import dagger.Provides; -import dagger.multibindings.IntoMap; -import org.cryptomator.common.vaults.Vault; -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 org.cryptomator.ui.common.StageFactory; -import org.cryptomator.ui.fxapp.PrimaryStage; - -import javax.inject.Provider; -import javafx.scene.Scene; -import javafx.stage.Modality; -import javafx.stage.Stage; -import java.util.Map; -import java.util.ResourceBundle; - -@Module -abstract class RemoveVaultModule { - - @Provides - @RemoveVaultWindow - @RemoveVaultScoped - static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); - } - - @Provides - @RemoveVaultWindow - @RemoveVaultScoped - static Stage provideStage(StageFactory factory, @PrimaryStage Stage primaryStage, @RemoveVaultWindow Vault vault, ResourceBundle resourceBundle) { - Stage stage = factory.create(); - stage.setTitle(String.format(resourceBundle.getString("removeVault.title"), vault.getDisplayName())); - stage.setResizable(false); - stage.initModality(Modality.WINDOW_MODAL); - stage.initOwner(primaryStage); - return stage; - } - - @Provides - @FxmlScene(FxmlFile.REMOVE_VAULT) - @RemoveVaultScoped - static Scene provideRemoveVaultScene(@RemoveVaultWindow FxmlLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene(FxmlFile.REMOVE_VAULT); - } - - // ------------------ - - @Binds - @IntoMap - @FxControllerKey(RemoveVaultController.class) - abstract FxController bindRemoveVaultController(RemoveVaultController controller); -} diff --git a/src/main/java/org/cryptomator/ui/removevault/RemoveVaultScoped.java b/src/main/java/org/cryptomator/ui/removevault/RemoveVaultScoped.java deleted file mode 100644 index aa2281541..000000000 --- a/src/main/java/org/cryptomator/ui/removevault/RemoveVaultScoped.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.cryptomator.ui.removevault; - -import javax.inject.Scope; -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -@Scope -@Documented -@Retention(RetentionPolicy.RUNTIME) -public @interface RemoveVaultScoped { - -} diff --git a/src/main/java/org/cryptomator/ui/removevault/RemoveVaultWindow.java b/src/main/java/org/cryptomator/ui/removevault/RemoveVaultWindow.java deleted file mode 100644 index 7348e213b..000000000 --- a/src/main/java/org/cryptomator/ui/removevault/RemoveVaultWindow.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.cryptomator.ui.removevault; - -import javax.inject.Qualifier; -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; - -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -@Qualifier -@Documented -@Retention(RUNTIME) -@interface RemoveVaultWindow { - -} diff --git a/src/main/resources/fxml/dokany_support_end.fxml b/src/main/resources/fxml/dokany_support_end.fxml deleted file mode 100644 index 423a54c72..000000000 --- a/src/main/resources/fxml/dokany_support_end.fxml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -