From 9e18215d106bc2241392f5962a6cafffd0604bc6 Mon Sep 17 00:00:00 2001 From: Jan-Peter Klein Date: Tue, 5 Jul 2022 16:17:42 +0200 Subject: [PATCH] removed unused method, del .idea/uiDesigner.xml and code cleanup --- .idea/uiDesigner.xml | 124 ------------------ .../ui/fxapp/FxApplicationModule.java | 4 +- .../ui/fxapp/FxApplicationWindows.java | 6 - .../GeneralPreferencesController.java | 3 - .../cryptomator/ui/quit/QuitController.java | 3 +- .../ui/quit/QuitForcedController.java | 7 - 6 files changed, 2 insertions(+), 145 deletions(-) delete mode 100644 .idea/uiDesigner.xml diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index e96534fb2..000000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java index 81429181a..cdeb764be 100644 --- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java +++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java @@ -58,6 +58,4 @@ abstract class FxApplicationModule { static QuitComponent provideQuitComponent(QuitComponent.Builder builder) { return builder.build(); } - - -} +} \ No newline at end of file diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java index fa4662ad5..5d38a9017 100644 --- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java +++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java @@ -11,7 +11,6 @@ import org.cryptomator.ui.mainwindow.MainWindowComponent; import org.cryptomator.ui.preferences.PreferencesComponent; import org.cryptomator.ui.preferences.SelectedPreferencesTab; import org.cryptomator.ui.quit.QuitComponent; - import org.cryptomator.ui.unlock.UnlockComponent; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; @@ -41,10 +40,7 @@ public class FxApplicationWindows { private final Optional trayIntegration; private final Lazy mainWindow; private final Lazy preferencesWindow; - - private final QuitComponent.Builder quitWindowBuilder; - private final UnlockComponent.Factory unlockWorkflowFactory; private final LockComponent.Factory lockWorkflowFactory; private final ErrorComponent.Factory errorWindowFactory; @@ -57,7 +53,6 @@ public class FxApplicationWindows { this.trayIntegration = trayIntegration; this.mainWindow = mainWindow; this.preferencesWindow = preferencesWindow; - this.quitWindowBuilder = quitWindowBuilder; this.unlockWorkflowFactory = unlockWorkflowFactory; this.lockWorkflowFactory = lockWorkflowFactory; @@ -113,7 +108,6 @@ public class FxApplicationWindows { CompletableFuture.runAsync(() -> quitWindowBuilder.build().showQuitWindow(response,forced), Platform::runLater); } - public CompletionStage startUnlockWorkflow(Vault vault, @Nullable Stage owner) { return CompletableFuture.supplyAsync(() -> { Preconditions.checkState(vault.stateProperty().transition(VaultState.Value.LOCKED, VaultState.Value.PROCESSING), "Vault not locked."); diff --git a/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java b/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java index f35f17f27..ace6dadca 100644 --- a/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java +++ b/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java @@ -55,11 +55,8 @@ public class GeneralPreferencesController implements FxController { @FXML public void initialize() { startHiddenCheckbox.selectedProperty().bindBidirectional(settings.startHidden()); - autoCloseVaultsCheckbox.selectedProperty().bindBidirectional(settings.autoCloseVaults()); - debugModeCheckbox.selectedProperty().bindBidirectional(settings.debugMode()); - autoStartProvider.ifPresent(autoStart -> autoStartCheckbox.setSelected(autoStart.isEnabled())); var keychainSettingsConverter = new KeychainProviderClassNameConverter(keychainAccessProviders); diff --git a/src/main/java/org/cryptomator/ui/quit/QuitController.java b/src/main/java/org/cryptomator/ui/quit/QuitController.java index 5ae54f1f5..787ac23dc 100644 --- a/src/main/java/org/cryptomator/ui/quit/QuitController.java +++ b/src/main/java/org/cryptomator/ui/quit/QuitController.java @@ -34,11 +34,10 @@ public class QuitController implements FxController { private final ExecutorService executorService; private final VaultService vaultService; private final AtomicReference quitResponse; + private final Lazy quitForcedScene; /* FXML */ public Button lockAndQuitButton; - private final Lazy quitForcedScene; - @Inject QuitController(@QuitWindow Stage window, ObservableList vaults, ExecutorService executorService, VaultService vaultService, @FxmlScene(FxmlFile.QUIT_FORCED) Lazy quitForcedScene, @QuitWindow AtomicReference quitResponse) { this.window = window; diff --git a/src/main/java/org/cryptomator/ui/quit/QuitForcedController.java b/src/main/java/org/cryptomator/ui/quit/QuitForcedController.java index 8dd4140ac..64e99d39c 100644 --- a/src/main/java/org/cryptomator/ui/quit/QuitForcedController.java +++ b/src/main/java/org/cryptomator/ui/quit/QuitForcedController.java @@ -43,13 +43,6 @@ public class QuitForcedController implements FxController { window.setOnCloseRequest(windowEvent -> cancel()); } - public void updateQuitRequest(QuitResponse newResponse) { - var oldResponse = quitResponse.getAndSet(newResponse); - if (oldResponse != null) { - oldResponse.cancelQuit(); - } - } - private void respondToQuitRequest(Consumer action) { var response = quitResponse.getAndSet(null); if (response != null) {