mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-20 11:41:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

reformatting & removing unused imports

Browse Source
This commit is contained in:
infeo
2018-02-03 17:02:05 +01:00
parent fa10a92fa4
commit 2914af5f7b
3 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/ui/src/main/java/org/cryptomator/ui/model/CommandFailedException.java
View File

@@ -10,8 +10,8 @@ public class CommandFailedException extends Exception {
super(cause);
}
public CommandFailedException(String message, Throwable cause){
super(message,cause);
public CommandFailedException(String message, Throwable cause) {
super(message, cause);
}
}

10
main/ui/src/main/java/org/cryptomator/ui/model/NioAdapter.java
View File

@@ -2,9 +2,6 @@ package org.cryptomator.ui.model;
import org.cryptomator.cryptofs.CryptoFileSystem;
import java.util.HashMap;
public interface NioAdapter {
void unlock(CryptoFileSystem fs);
@@ -13,6 +10,10 @@ public interface NioAdapter {
void unmount() throws CommandFailedException;
default void unmountForced() throws CommandFailedException {
throw new CommandFailedException("Operation not supported");
}
void stop();
String getFilesystemRootUrl();
@@ -25,7 +26,4 @@ public interface NioAdapter {
return false;
}
default void unmountForced() throws CommandFailedException {
throw new CommandFailedException("Operation not supported");
}
}

16
main/ui/src/main/java/org/cryptomator/ui/model/WebDavNioAdapter.java
View File

@@ -12,7 +12,6 @@ import org.cryptomator.frontend.webdav.servlet.WebDavServletController;
import javax.inject.Inject;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.function.Function;
@VaultModule.PerVault
public class WebDavNioAdapter implements NioAdapter {
@@ -27,18 +26,18 @@ public class WebDavNioAdapter implements NioAdapter {
private Mounter.Mount mount;
@Inject
public WebDavNioAdapter(WebDavServer server, VaultSettings vaultSettings, Settings settings){
public WebDavNioAdapter(WebDavServer server, VaultSettings vaultSettings, Settings settings) {
this.server = server;
this.vaultSettings = vaultSettings;
this.settings = settings;
}
@Override
public void unlock(CryptoFileSystem fs){
if(!server.isRunning()){
public void unlock(CryptoFileSystem fs) {
if (!server.isRunning()) {
server.start();
}
servlet = server.createWebDavServlet(fs.getPath("/"), vaultSettings.getId()+ "/" + vaultSettings.mountName().get());
servlet = server.createWebDavServlet(fs.getPath("/"), vaultSettings.getId() + "/" + vaultSettings.mountName().get());
servlet.start();
}
@@ -64,14 +63,13 @@ public class WebDavNioAdapter implements NioAdapter {
public synchronized void unmount() throws CommandFailedException {
try {
mount.unmount();
}
catch (Mounter.CommandFailedException e){
} catch (Mounter.CommandFailedException e) {
throw new CommandFailedException(e);
}
}
@Override
public synchronized void unmountForced(){
public synchronized void unmountForced() {
mount.forced();
}
@@ -90,7 +88,7 @@ public class WebDavNioAdapter implements NioAdapter {
@Override
public void stop() {
if(servlet != null){
if (servlet != null) {
servlet.stop();
}