Refactor FCP dialog

[jFCPlib.git] / src / main / java / net / pterodactylus / fcp / quelaton / RemovePluginCommandImpl.java

diff --git a/src/main/java/net/pterodactylus/fcp/quelaton/RemovePluginCommandImpl.java b/src/main/java/net/pterodactylus/fcp/quelaton/RemovePluginCommandImpl.java
index 4bc0781..1e9ed56 100644 (file)
--- a/src/main/java/net/pterodactylus/fcp/quelaton/RemovePluginCommandImpl.java
+++ b/src/main/java/net/pterodactylus/fcp/quelaton/RemovePluginCommandImpl.java
@@ -3,7 +3,7 @@ package net.pterodactylus.fcp.quelaton;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Supplier;
 
 import net.pterodactylus.fcp.PluginRemoved;
 import net.pterodactylus.fcp.ProtocolError;
@@ -20,14 +20,14 @@ import com.google.common.util.concurrent.MoreExecutors;
  */
 public class RemovePluginCommandImpl implements RemovePluginCommand {
 
-       private static final RandomIdentifierGenerator IDENTIFIER = new RandomIdentifierGenerator();
        private final ListeningExecutorService threadPool;
        private final ConnectionSupplier connectionSupplier;
-       private final RemovePlugin removePlugin = new RemovePlugin(IDENTIFIER.generate());
+       private final RemovePlugin removePlugin;
 
-       public RemovePluginCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier) {
+       public RemovePluginCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier, Supplier<String> identifierGenerator) {
                this.threadPool = MoreExecutors.listeningDecorator(threadPool);
                this.connectionSupplier = connectionSupplier;
+               removePlugin = new RemovePlugin(identifierGenerator.get());
        }
 
        @Override
@@ -37,6 +37,12 @@ public class RemovePluginCommandImpl implements RemovePluginCommand {
        }
 
        @Override
+       public RemovePluginCommand purge() {
+               removePlugin.setPurge(true);
+               return this;
+       }
+
+       @Override
        public Executable<Boolean> plugin(String pluginClass) {
                removePlugin.setPluginName(pluginClass);
                return this::execute;
@@ -54,32 +60,18 @@ public class RemovePluginCommandImpl implements RemovePluginCommand {
 
        private class RemovePluginDialog extends FcpDialog<Boolean> {
 
-               private final AtomicBoolean finished = new AtomicBoolean();
-               private final AtomicBoolean pluginRemoved = new AtomicBoolean();
-
                public RemovePluginDialog() throws IOException {
-                       super(threadPool, connectionSupplier.get());
-               }
-
-               @Override
-               protected boolean isFinished() {
-                       return finished.get();
-               }
-
-               @Override
-               protected Boolean getResult() {
-                       return pluginRemoved.get();
+                       super(threadPool, connectionSupplier.get(), false);
                }
 
                @Override
                protected void consumePluginRemoved(PluginRemoved pluginRemoved) {
-                       this.pluginRemoved.set(true);
-                       finished.set(true);
+                       setResult(true);
                }
 
                @Override
                protected void consumeProtocolError(ProtocolError protocolError) {
-                       finished.set(true);
+                       finish();
                }
 
        }