From 9d47f272936b42367314b8fa92a61e6932bf05df Mon Sep 17 00:00:00 2001 From: akwizgran Date: Fri, 7 May 2021 14:31:53 +0100 Subject: [PATCH] Fix typo in class names. --- ...ReaderTask.java => RemovableDriveReaderTask.java} | 12 ++++++------ .../plugin/file/RemovableDriveTaskFactoryImpl.java | 4 ++-- ...WriterTask.java => RemovableDriveWriterTask.java} | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) rename bramble-core/src/main/java/org/briarproject/bramble/plugin/file/{RemovableDriverReaderTask.java => RemovableDriveReaderTask.java} (89%) rename bramble-core/src/main/java/org/briarproject/bramble/plugin/file/{RemovableDriverWriterTask.java => RemovableDriveWriterTask.java} (91%) diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriverReaderTask.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveReaderTask.java similarity index 89% rename from bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriverReaderTask.java rename to bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveReaderTask.java index a7374fc53..2e0f02e0b 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriverReaderTask.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveReaderTask.java @@ -22,16 +22,16 @@ import static java.util.logging.Logger.getLogger; import static org.briarproject.bramble.api.plugin.file.RemovableDriveConstants.ID; @NotNullByDefault -class RemovableDriverReaderTask extends RemovableDriveTaskImpl +class RemovableDriveReaderTask extends RemovableDriveTaskImpl implements EventListener { private final static Logger LOG = - getLogger(RemovableDriverReaderTask.class.getName()); + getLogger(RemovableDriveReaderTask.class.getName()); private final AtomicLong fileLength = new AtomicLong(0); private final AtomicLong totalMessageLength = new AtomicLong(0); - RemovableDriverReaderTask( + RemovableDriveReaderTask( Executor eventExecutor, PluginManager pluginManager, ConnectionManager connectionManager, @@ -49,7 +49,7 @@ class RemovableDriverReaderTask extends RemovableDriveTaskImpl getPlugin().createReader(createProperties()); if (r == null) { LOG.warning("Failed to create reader"); - registry.removeReader(contactId, RemovableDriverReaderTask.this); + registry.removeReader(contactId, RemovableDriveReaderTask.this); visitObservers(o -> o.onCompletion(false)); return; } @@ -92,8 +92,8 @@ class RemovableDriverReaderTask extends RemovableDriveTaskImpl public void dispose(boolean exception, boolean recognised) throws IOException { delegate.dispose(exception, recognised); - registry.removeReader(contactId, RemovableDriverReaderTask.this); - eventBus.removeListener(RemovableDriverReaderTask.this); + registry.removeReader(contactId, RemovableDriveReaderTask.this); + eventBus.removeListener(RemovableDriveReaderTask.this); visitObservers(o -> o.onCompletion(!exception && recognised)); } } diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveTaskFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveTaskFactoryImpl.java index d8021ff82..ad1f6ee06 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveTaskFactoryImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveTaskFactoryImpl.java @@ -38,14 +38,14 @@ class RemovableDriveTaskFactoryImpl implements RemovableDriveTaskFactory { @Override public RemovableDriveTask createReader(RemovableDriveTaskRegistry registry, ContactId c, File f) { - return new RemovableDriverReaderTask(eventExecutor, pluginManager, + return new RemovableDriveReaderTask(eventExecutor, pluginManager, connectionManager, eventBus, registry, c, f); } @Override public RemovableDriveTask createWriter(RemovableDriveTaskRegistry registry, ContactId c, File f) { - return new RemovableDriverWriterTask(eventExecutor, pluginManager, + return new RemovableDriveWriterTask(eventExecutor, pluginManager, connectionManager, eventBus, registry, c, f); } } diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriverWriterTask.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveWriterTask.java similarity index 91% rename from bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriverWriterTask.java rename to bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveWriterTask.java index 7394b1ac2..858d6a19c 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriverWriterTask.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/file/RemovableDriveWriterTask.java @@ -19,12 +19,12 @@ import static org.briarproject.bramble.util.IoUtils.tryToClose; import static org.briarproject.bramble.util.LogUtils.logException; @NotNullByDefault -class RemovableDriverWriterTask extends RemovableDriveTaskImpl { +class RemovableDriveWriterTask extends RemovableDriveTaskImpl { private static final Logger LOG = - getLogger(RemovableDriverWriterTask.class.getName()); + getLogger(RemovableDriveWriterTask.class.getName()); - RemovableDriverWriterTask( + RemovableDriveWriterTask( Executor eventExecutor, PluginManager pluginManager, ConnectionManager connectionManager,