From f430f3c57975727dd323601a8dca6b10222eec5a Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Fri, 16 Oct 2015 13:24:52 +0200 Subject: [PATCH] just fixes some warnings in eclipse [ci skip] --- .../java/org/cryptomator/ui/model/Vault.java | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) 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 8d0196c1a..455a58a66 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 @@ -11,11 +11,6 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import javafx.beans.property.ObjectProperty; -import javafx.beans.property.SimpleObjectProperty; -import javafx.collections.FXCollections; -import javafx.collections.ObservableList; - import javax.security.auth.DestroyFailedException; import org.apache.commons.lang3.CharUtils; @@ -35,6 +30,11 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.ImmutableMap; +import javafx.beans.property.ObjectProperty; +import javafx.beans.property.SimpleObjectProperty; +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; + public class Vault implements Serializable { private static final long serialVersionUID = 3754487289683599469L; @@ -114,15 +114,15 @@ public class Vault implements Serializable { whitelistedResourcesWithInvalidMac.clear(); namesOfResourcesWithInvalidMac.clear(); } - + private Map> getMountParams() { return ImmutableMap.of( // MountParam.MOUNT_NAME, Optional.ofNullable(mountName), // MountParam.WIN_DRIVE_LETTER, Optional.ofNullable(CharUtils.toString(winDriveLetter)) // - ); + ); } - public boolean mount() { + public Boolean mount() { final ServletLifeCycleAdapter servlet = webDavServlet.get().orElse(null); if (servlet == null || !servlet.isRunning()) { return false; @@ -180,8 +180,6 @@ public class Vault implements Serializable { this.unlocked.set(unlocked); } - - public ObservableList getNamesOfResourcesWithInvalidMac() { return namesOfResourcesWithInvalidMac; } @@ -215,7 +213,7 @@ public class Vault implements Serializable { } return builder.toString(); } - + public String getMountName() { return mountName; } @@ -233,7 +231,7 @@ public class Vault implements Serializable { } this.mountName = mountName; } - + public Character getWinDriveLetter() { return winDriveLetter; }