- moved method from WritableFile to File: moveTo, setLastModified, setCreationTime, delete

- moved method from File and Folder to Node: setLastModified, setCreationTime, delete
This commit is contained in:
Sebastian Stenzel
2016-02-22 16:42:31 +01:00
parent e6a9786b7a
commit 1467c8315c
32 changed files with 468 additions and 783 deletions
@@ -31,7 +31,6 @@ import org.apache.jackrabbit.webdav.property.DefaultDavProperty;
import org.cryptomator.filesystem.File;
import org.cryptomator.filesystem.Folder;
import org.cryptomator.filesystem.ReadableFile;
import org.cryptomator.filesystem.WritableFile;
import org.cryptomator.filesystem.jackrabbit.FileLocator;
import com.google.common.io.ByteStreams;
@@ -155,17 +154,13 @@ class DavFile extends DavNode<FileLocator> {
}
@Override
protected void setModificationTime(Instant instant) {
try (WritableFile writable = node.openWritable()) {
writable.setLastModified(instant);
}
protected void setModificationTime(Instant lastModified) {
node.setLastModified(lastModified);
}
@Override
protected void setCreationTime(Instant instant) {
try (WritableFile writable = node.openWritable()) {
writable.setCreationTime(instant);
}
protected void setCreationTime(Instant creationTime) {
node.setCreationTime(creationTime);
}
@Override
@@ -29,7 +29,6 @@ import org.apache.jackrabbit.webdav.lock.LockManager;
import org.apache.jackrabbit.webdav.property.DavPropertyName;
import org.apache.jackrabbit.webdav.property.DefaultDavProperty;
import org.apache.jackrabbit.webdav.property.ResourceType;
import org.cryptomator.filesystem.File;
import org.cryptomator.filesystem.Folder;
import org.cryptomator.filesystem.Node;
import org.cryptomator.filesystem.WritableFile;
@@ -98,17 +97,7 @@ class DavFolder extends DavNode<FolderLocator> {
@Override
public void removeMember(DavResource member) throws DavException {
final Node child = getMemberNode(member.getDisplayName());
if (child instanceof Folder) {
Folder folder = (Folder) child;
folder.delete();
} else if (child instanceof File) {
File file = (File) child;
try (WritableFile writable = file.openWritable()) {
writable.delete();
}
} else {
throw new IllegalStateException("Unexpected node type: " + child.getClass().getName());
}
child.delete();
}
/**