瀏覽代碼

moving the nioAdapterImpl to the commons package

infeo 7 年之前
父節點
當前提交
3bc7df9e83

+ 8 - 0
main/commons/src/main/java/org/cryptomator/common/settings/NioAdapterImpl.java

@@ -0,0 +1,8 @@
+package org.cryptomator.common.settings;
+
+public enum NioAdapterImpl {
+
+	WEBDAV,
+	FUSE
+
+}

+ 1 - 1
main/commons/src/main/java/org/cryptomator/common/settings/Settings.java

@@ -30,7 +30,7 @@ public class Settings {
 	public static final int DEFAULT_NUM_TRAY_NOTIFICATIONS = 3;
 	public static final String DEFAULT_GVFS_SCHEME = "dav";
 	public static final boolean DEFAULT_DEBUG_MODE = false;
-	public static final String DEFAULT_NIO_ADAPTER = "WEBDAV";
+	public static final String DEFAULT_NIO_ADAPTER = NioAdapterImpl.WEBDAV.name();
 
 	private final ObservableList<VaultSettings> directories = FXCollections.observableArrayList(VaultSettings::observables);
 	private final BooleanProperty checkForUpdates = new SimpleBooleanProperty(DEFAULT_CHECK_FOR_UDPATES);

+ 3 - 3
main/ui/src/main/java/org/cryptomator/ui/controllers/SettingsController.java

@@ -19,7 +19,7 @@ import javafx.scene.layout.GridPane;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.ui.l10n.Localization;
-import org.cryptomator.ui.model.NioAdapterImpl;
+import org.cryptomator.common.settings.NioAdapterImpl;
 
 import com.google.common.base.CharMatcher;
 import com.google.common.base.Strings;
@@ -138,8 +138,8 @@ public class SettingsController implements ViewController {
 	}
 
 	private void changeNioView(String newVal) {
-		fuseNioAdapter.setVisible(newVal.equalsIgnoreCase("FUSE"));
-		webdavNioAdapter.setVisible(newVal.equalsIgnoreCase("WEBDAV"));
+		fuseNioAdapter.setVisible(newVal.equalsIgnoreCase(NioAdapterImpl.FUSE.name()));
+		webdavNioAdapter.setVisible(newVal.equalsIgnoreCase(NioAdapterImpl.WEBDAV.name()));
 	}
 
 	@Override

+ 0 - 10
main/ui/src/main/java/org/cryptomator/ui/model/NioAdapterImpl.java

@@ -1,10 +0,0 @@
-package org.cryptomator.ui.model;
-
-import java.util.ArrayList;
-
-public enum NioAdapterImpl {
-
-	WEBDAV,
-	FUSE
-
-}

+ 1 - 1
main/ui/src/main/java/org/cryptomator/ui/model/VaultModule.java

@@ -12,7 +12,7 @@ import java.util.Objects;
 
 import javax.inject.Scope;
 
-import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.settings.NioAdapterImpl;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.VaultSettings;