From ed0540e78f2fea7634b7c4989ca425a3a86c4ff5 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2016 15:55:54 +0100 Subject: [PATCH] Using Runnable instead of Consumer for InMemoryWritableFile's reference to InMemoryFile's delete function [ci skip] --- .../org/cryptomator/filesystem/inmem/InMemoryFile.java | 3 ++- .../filesystem/inmem/InMemoryWritableFile.java | 9 ++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/main/filesystem-inmemory/src/main/java/org/cryptomator/filesystem/inmem/InMemoryFile.java b/main/filesystem-inmemory/src/main/java/org/cryptomator/filesystem/inmem/InMemoryFile.java index 1cc6dd4de..ddf7d7ee2 100644 --- a/main/filesystem-inmemory/src/main/java/org/cryptomator/filesystem/inmem/InMemoryFile.java +++ b/main/filesystem-inmemory/src/main/java/org/cryptomator/filesystem/inmem/InMemoryFile.java @@ -97,7 +97,8 @@ class InMemoryFile extends InMemoryNode implements File { this.content = content; } - private void delete(Void param) { + @Override + public void delete() { content = ByteBuffer.allocate(INITIAL_SIZE); content.flip(); final InMemoryFolder parent = parent().get(); diff --git a/main/filesystem-inmemory/src/main/java/org/cryptomator/filesystem/inmem/InMemoryWritableFile.java b/main/filesystem-inmemory/src/main/java/org/cryptomator/filesystem/inmem/InMemoryWritableFile.java index a49a2421f..2294b7043 100644 --- a/main/filesystem-inmemory/src/main/java/org/cryptomator/filesystem/inmem/InMemoryWritableFile.java +++ b/main/filesystem-inmemory/src/main/java/org/cryptomator/filesystem/inmem/InMemoryWritableFile.java @@ -24,14 +24,13 @@ public class InMemoryWritableFile implements WritableFile { private final Consumer creationTimeSetter; private final Supplier contentGetter; private final Consumer contentSetter; - private final Consumer deleter; + private final Runnable deleter; private final WriteLock writeLock; private boolean open = true; private volatile int position = 0; - public InMemoryWritableFile(Consumer lastModifiedSetter, Consumer creationTimeSetter, Supplier contentGetter, Consumer contentSetter, Consumer deleter, - WriteLock writeLock) { + public InMemoryWritableFile(Consumer lastModifiedSetter, Consumer creationTimeSetter, Supplier contentGetter, Consumer contentSetter, Runnable deleter, WriteLock writeLock) { this.lastModifiedSetter = lastModifiedSetter; this.contentGetter = contentGetter; this.contentSetter = contentSetter; @@ -52,7 +51,7 @@ public class InMemoryWritableFile implements WritableFile { destination.contentSetter.accept(this.contentGetter.get()); destination.contentGetter.get().rewind(); } - deleter.accept(null); + deleter.run(); } @Override @@ -62,7 +61,7 @@ public class InMemoryWritableFile implements WritableFile { @Override public void delete() throws UncheckedIOException { - deleter.accept(null); + deleter.run(); open = false; }