mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-10-01 12:15:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed nioAdapterImpl to volumeImpl.

Browse Source
This commit is contained in:
Sebastian Stenzel
2018-03-17 16:08:58 +01:00
parent a666c80ef5
commit 7c1a0b5fdf
8 changed files with 63 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/ui/src/main/java/org/cryptomator/ui/controllers/SettingsController.java
+13 -13
View File
@@ -30,7 +30,7 @@ import javafx.scene.layout.GridPane;
import javafx.scene.layout.VBox;
import javafx.util.StringConverter;
import org.apache.commons.lang3.SystemUtils;
import org.cryptomator.common.settings.NioAdapterImpl;
import org.cryptomator.common.settings.VolumeImpl;
import org.cryptomator.common.settings.Settings;
import org.cryptomator.ui.l10n.Localization;
@@ -81,7 +81,7 @@ public class SettingsController implements ViewController {
private Label volumeLabel;
@FXML
private ChoiceBox<NioAdapterImpl> volume;
private ChoiceBox<VolumeImpl> volume;
@FXML
private CheckBox debugModeCheckbox;
@@ -97,12 +97,12 @@ public class SettingsController implements ViewController {
//NIOADAPTER
volume.getItems().addAll(getSupportedAdapters());
volume.setValue(settings.usedNioAdapterImpl().get());
volume.setValue(settings.volumeImpl().get());
volume.setVisible(true);
volume.setConverter(new NioAdapterImplStringConverter());
//WEBDAV
webdavVolume.visibleProperty().bind(volume.valueProperty().isEqualTo(NioAdapterImpl.WEBDAV));
webdavVolume.visibleProperty().bind(volume.valueProperty().isEqualTo(VolumeImpl.WEBDAV));
webdavVolume.managedProperty().bind(webdavVolume.visibleProperty());
prefGvfsScheme.managedProperty().bind(webdavVolume.visibleProperty());
prefGvfsSchemeLabel.managedProperty().bind(webdavVolume.visibleProperty());
@@ -120,20 +120,20 @@ public class SettingsController implements ViewController {
prefGvfsScheme.setVisible(SystemUtils.IS_OS_LINUX);
//FUSE
fuseVolume.visibleProperty().bind(volume.valueProperty().isEqualTo(NioAdapterImpl.FUSE));
fuseVolume.visibleProperty().bind(volume.valueProperty().isEqualTo(VolumeImpl.FUSE));
fuseVolume.managedProperty().bind(fuseVolume.visibleProperty());
debugModeCheckbox.setSelected(settings.debugMode().get());
settings.checkForUpdates().bind(checkForUpdatesCheckbox.selectedProperty());
settings.preferredGvfsScheme().bind(prefGvfsScheme.valueProperty());
settings.usedNioAdapterImpl().bind(volume.valueProperty());
settings.volumeImpl().bind(volume.valueProperty());
settings.debugMode().bind(debugModeCheckbox.selectedProperty());
}
//TODO: how to implement this?
private NioAdapterImpl[] getSupportedAdapters() {
return new NioAdapterImpl[]{NioAdapterImpl.FUSE, NioAdapterImpl.WEBDAV};
private VolumeImpl[] getSupportedAdapters() {
return new VolumeImpl[]{VolumeImpl.FUSE, VolumeImpl.WEBDAV};
}
@Override
@@ -175,16 +175,16 @@ public class SettingsController implements ViewController {
return Boolean.parseBoolean(System.getProperty("cryptomator.updatesManagedExternally", "false"));
}
private static class NioAdapterImplStringConverter extends StringConverter<NioAdapterImpl> {
private static class NioAdapterImplStringConverter extends StringConverter<VolumeImpl> {
@Override
public String toString(NioAdapterImpl object) {
return object.name();
public String toString(VolumeImpl object) {
return object.getDisplayName();
}
@Override
public NioAdapterImpl fromString(String string) {
return NioAdapterImpl.valueOf(string);
public VolumeImpl fromString(String string) {
return VolumeImpl.forDisplayName(string);
}
}
main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java
+2 -2
View File
@@ -21,7 +21,7 @@ import javafx.beans.binding.Bindings;
import javafx.scene.layout.HBox;
import org.apache.commons.lang3.CharUtils;
import org.apache.commons.lang3.SystemUtils;
import org.cryptomator.common.settings.NioAdapterImpl;
import org.cryptomator.common.settings.VolumeImpl;
import org.cryptomator.common.settings.Settings;
import org.cryptomator.common.settings.VaultSettings;
import org.cryptomator.cryptolib.api.InvalidPassphraseException;
@@ -175,7 +175,7 @@ public class UnlockController implements ViewController {
winDriveLetterLabel.setManaged(false);
winDriveLetter.setVisible(false);
winDriveLetter.setManaged(false);
if(NioAdapterImpl.WEBDAV.equals(settings.usedNioAdapterImpl().get())){
if(VolumeImpl.WEBDAV.equals(settings.volumeImpl().get())){
mountPathLabel.setVisible(false);
mountPathLabel.setManaged(false);
}
main/ui/src/main/java/org/cryptomator/ui/model/VaultModule.java
+2 -2
View File
@@ -12,7 +12,7 @@ import java.util.Objects;
import javax.inject.Scope;
import org.cryptomator.common.settings.NioAdapterImpl;
import org.cryptomator.common.settings.VolumeImpl;
import org.cryptomator.common.settings.Settings;
import org.cryptomator.common.settings.VaultSettings;
@@ -44,7 +44,7 @@ public class VaultModule {
@Provides
@PerVault
public Volume provideNioAdpater(Settings settings, WebDavVolume webDavVolume, FuseVolume fuseVolume) {
NioAdapterImpl impl = settings.usedNioAdapterImpl().get();
VolumeImpl impl = settings.volumeImpl().get();
switch (impl) {
case WEBDAV:
return webDavVolume;