From 4fc31cb13f08b6f0103e5b1a7ac7c2c5e4d399ba Mon Sep 17 00:00:00 2001 From: Jan-Peter Klein Date: Mon, 11 Dec 2023 15:16:41 +0100 Subject: [PATCH] refactored 'loopbackPortSupported' from 'BooleanExpression' to 'ObservableValue' in VolumePreferencesController and MountOptionsController --- .../ui/preferences/VolumePreferencesController.java | 8 ++++---- .../ui/vaultoptions/MountOptionsController.java | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java b/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java index 7250fac49..bf1b8be35 100644 --- a/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java +++ b/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java @@ -30,7 +30,7 @@ public class VolumePreferencesController implements FxController { private final Settings settings; private final ObservableValue selectedMountService; private final ResourceBundle resourceBundle; - private final BooleanExpression loopbackPortSupported; + private final ObservableValue loopbackPortSupported; private final ObservableValue mountToDirSupported; private final ObservableValue mountToDriveLetterSupported; private final ObservableValue mountFlagsSupported; @@ -53,7 +53,7 @@ public class VolumePreferencesController implements FxController { var fallbackProvider = mountProviders.stream().findFirst().orElse(null); this.selectedMountService = ObservableUtil.mapWithDefault(settings.mountService, serviceName -> mountProviders.stream().filter(s -> s.getClass().getName().equals(serviceName)).findFirst().orElse(fallbackProvider), fallbackProvider); - this.loopbackPortSupported = BooleanExpression.booleanExpression(selectedMountService.map(s -> s.hasCapability(MountCapability.LOOPBACK_PORT))); + this.loopbackPortSupported = selectedMountService.map(s -> s.hasCapability(MountCapability.LOOPBACK_PORT)); this.mountToDirSupported = selectedMountService.map(s -> s.hasCapability(MountCapability.MOUNT_WITHIN_EXISTING_PARENT) || s.hasCapability(MountCapability.MOUNT_TO_EXISTING_DIR)); this.mountToDriveLetterSupported = selectedMountService.map(s -> s.hasCapability(MountCapability.MOUNT_AS_DRIVE_LETTER)); this.mountFlagsSupported = selectedMountService.map(s -> s.hasCapability(MountCapability.MOUNT_FLAGS)); @@ -94,12 +94,12 @@ public class VolumePreferencesController implements FxController { /* Property Getters */ - public BooleanExpression loopbackPortSupportedProperty() { + public ObservableValue loopbackPortSupportedProperty() { return loopbackPortSupported; } public boolean isLoopbackPortSupported() { - return loopbackPortSupported.get(); + return loopbackPortSupported.getValue(); } public ObservableValue readonlySupportedProperty() { diff --git a/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java b/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java index 4d8264a71..839f49ddf 100644 --- a/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java +++ b/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java @@ -17,7 +17,6 @@ import javax.inject.Inject; import javax.inject.Named; import javafx.application.Application; import javafx.beans.binding.Bindings; -import javafx.beans.binding.BooleanExpression; import javafx.beans.value.ObservableValue; import javafx.fxml.FXML; import javafx.scene.control.Button; @@ -61,7 +60,7 @@ public class MountOptionsController implements FxController { private final ObservableValue defaultMountService; private final ObservableValue selectedMountService; private final ObservableValue fuseRestartRequired; - private final BooleanExpression loopbackPortSupported; + private final ObservableValue loopbackPortSupported; //-- FXML objects -- @@ -104,7 +103,7 @@ public class MountOptionsController implements FxController { && Mounter.isProblematicFuseService(s) // && !firstUsedProblematicFuseMountService.get().equals(s); }); - this.loopbackPortSupported = BooleanExpression.booleanExpression(selectedMountService.map(s -> s.hasCapability(MountCapability.LOOPBACK_PORT) && vaultSettings.mountService.getValue() != null)); + //this.loopbackPortSupported = BooleanExpression.booleanExpression(selectedMountService.map(s -> s.hasCapability(MountCapability.LOOPBACK_PORT) && vaultSettings.mountService.getValue() != null)); this.defaultMountFlags = selectedMountService.map(s -> { if (s.hasCapability(MountCapability.MOUNT_FLAGS)) { @@ -118,6 +117,7 @@ public class MountOptionsController implements FxController { this.readOnlySupported = selectedMountService.map(s -> s.hasCapability(MountCapability.READ_ONLY)); this.mountpointDirSupported = selectedMountService.map(s -> s.hasCapability(MountCapability.MOUNT_TO_EXISTING_DIR) || s.hasCapability(MountCapability.MOUNT_WITHIN_EXISTING_PARENT)); this.mountpointDriveLetterSupported = selectedMountService.map(s -> s.hasCapability(MountCapability.MOUNT_AS_DRIVE_LETTER)); + this.loopbackPortSupported = selectedMountService.map(s -> s.hasCapability(MountCapability.LOOPBACK_PORT) && vaultSettings.mountService.getValue() != null); } private MountService reselectMountService() { @@ -376,12 +376,12 @@ public class MountOptionsController implements FxController { return fuseRestartRequired.getValue(); } - public BooleanExpression loopbackPortSupportedProperty() { + public ObservableValue loopbackPortSupportedProperty() { return loopbackPortSupported; } public boolean isLoopbackPortSupported() { - return loopbackPortSupported.get(); + return loopbackPortSupported.getValue(); } private class MountServiceConverter extends StringConverter {