From c85823fe04ef1dc5aa6db51ec7a0904e47b556af Mon Sep 17 00:00:00 2001 From: Jan-Peter Klein Date: Thu, 26 Oct 2023 12:18:40 +0200 Subject: [PATCH] code cleanup --- .../ui/preferences/VolumePreferencesController.java | 9 ++++----- .../ui/vaultoptions/MountOptionsController.java | 9 +++++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java b/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java index fe3979d9f..38b6eb9b6 100644 --- a/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java +++ b/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java @@ -60,12 +60,11 @@ public class VolumePreferencesController implements FxController { this.mountToDriveLetterSupported = selectedMountService.map(s -> s.hasCapability(MountCapability.MOUNT_AS_DRIVE_LETTER)); this.mountFlagsSupported = selectedMountService.map(s -> s.hasCapability(MountCapability.MOUNT_FLAGS)); this.readonlySupported = selectedMountService.map(s -> s.hasCapability(MountCapability.READ_ONLY)); - this.fuseRestartRequired = selectedMountService.map(s -> {// - return firstUsedProblematicFuseMountService.get() != null // + this.fuseRestartRequired = selectedMountService.map(s -> // + firstUsedProblematicFuseMountService.get() != null // && VaultModule.isProblematicFuseService(s) // - && !firstUsedProblematicFuseMountService.get().equals(s); - }); - + && !firstUsedProblematicFuseMountService.get().equals(s) + ); } public void initialize() { diff --git a/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java b/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java index 5637633b4..80b2214a5 100644 --- a/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java +++ b/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java @@ -84,7 +84,8 @@ public class MountOptionsController implements FxController { @VaultOptionsWindow Vault vault, // WindowsDriveLetters windowsDriveLetters, // ResourceBundle resourceBundle, // - Lazy application, List mountProviders, // + Lazy application, // + List mountProviders, // @Named("FUPFMS") AtomicReference firstUsedProblematicFuseMountService) { this.window = window; this.vaultSettings = vault.getVaultSettings(); @@ -95,7 +96,11 @@ public class MountOptionsController implements FxController { this.mountProviders = mountProviders; var fallbackProvider = mountProviders.stream().findFirst().orElse(null); this.selectedMountService = ObservableUtil.mapWithDefault(vaultSettings.mountService, serviceName -> mountProviders.stream().filter(s -> s.getClass().getName().equals(serviceName)).findFirst().orElse(fallbackProvider), fallbackProvider); - this.fuseRestartRequired = selectedMountService.map(s -> firstUsedProblematicFuseMountService.get() != null && VaultModule.isProblematicFuseService(s) && !firstUsedProblematicFuseMountService.get().equals(s)); + this.fuseRestartRequired = selectedMountService.map(s -> // + firstUsedProblematicFuseMountService.get() != null // + && VaultModule.isProblematicFuseService(s) // + && !firstUsedProblematicFuseMountService.get().equals(s) + ); this.loopbackPortSupported = BooleanExpression.booleanExpression(selectedMountService.map(s -> s.hasCapability(MountCapability.LOOPBACK_PORT))); this.defaultMountFlags = selectedMountService.map(s -> {