From 425d4e8fed16263ca4d3a1407ccfd07956cdb9b2 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 4 May 2017 16:53:58 +0200 Subject: [PATCH] code cleanup --- .../java/org/cryptomator/ui/controllers/MainController.java | 4 ++-- .../java/org/cryptomator/ui/controllers/UnlockController.java | 4 ---- main/ui/src/main/java/org/cryptomator/ui/model/Vault.java | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java index 96eaaeec6..cad61e57b 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java @@ -50,8 +50,8 @@ import javafx.beans.binding.Bindings; import javafx.beans.binding.BooleanBinding; import javafx.beans.binding.BooleanExpression; import javafx.beans.property.ObjectProperty; -import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleObjectProperty; +import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.event.ActionEvent; import javafx.fxml.FXML; @@ -115,7 +115,7 @@ public class MainController implements ViewController { // derived bindings: this.isShowingSettings = Bindings.equal(SettingsController.class, EasyBind.monadic(activeController).map(ViewController::getClass)); this.upgradeStrategyForSelectedVault = EasyBind.monadic(selectedVault).map(upgradeStrategies::getUpgradeStrategy); - this.areAllVaultsLocked = new SimpleBooleanProperty(false).not(); // = Bindings.isEmpty(FXCollections.observableList(vaults, Vault::observables).filtered(Vault::isUnlocked)); + this.areAllVaultsLocked = Bindings.isEmpty(FXCollections.observableList(vaults, Vault::observables).filtered(Vault::isUnlocked)); EasyBind.subscribe(areAllVaultsLocked, Platform::setImplicitExit); autoUnlocker.unlockAllSilently(); diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java index ffaad54cc..065712627 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java @@ -202,10 +202,6 @@ public class UnlockController implements ViewController { mountAfterUnlock.setSelected(settings.mountAfterUnlock().get()); revealAfterMount.setSelected(settings.revealAfterMount().get()); - // settings.unlockAfterStartup().bind(unlockAfterStartup.selectedProperty()); - // settings.mountAfterUnlock().bind(mountAfterUnlock.selectedProperty()); - // settings.revealAfterMount().bind(revealAfterMount.selectedProperty()); - vaultSubs = vaultSubs.and(EasyBind.subscribe(unlockAfterStartup.selectedProperty(), settings.unlockAfterStartup()::set)); vaultSubs = vaultSubs.and(EasyBind.subscribe(mountAfterUnlock.selectedProperty(), settings.mountAfterUnlock()::set)); vaultSubs = vaultSubs.and(EasyBind.subscribe(revealAfterMount.selectedProperty(), settings.revealAfterMount()::set)); diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java b/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java index a9be7c3d3..c33db3492 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java @@ -188,7 +188,7 @@ public class Vault { // *******************************************************************************/ public Observable[] observables() { - return new Observable[] {unlockedProperty(), mountedProperty()}; + return new Observable[] {unlocked, mounted}; } public VaultSettings getVaultSettings() {