Refactor FCP dialog

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

diff --git a/src/main/java/net/pterodactylus/fcp/quelaton/GetPluginInfoCommandImpl.java b/src/main/java/net/pterodactylus/fcp/quelaton/GetPluginInfoCommandImpl.java
index 67c3e30..e8a30ec 100644 (file)
--- a/src/main/java/net/pterodactylus/fcp/quelaton/GetPluginInfoCommandImpl.java
+++ b/src/main/java/net/pterodactylus/fcp/quelaton/GetPluginInfoCommandImpl.java
@@ -4,8 +4,7 @@ import java.io.IOException;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
 
 import net.pterodactylus.fcp.GetPluginInfo;
 import net.pterodactylus.fcp.PluginInfo;
@@ -22,14 +21,14 @@ import com.google.common.util.concurrent.MoreExecutors;
  */
 public class GetPluginInfoCommandImpl implements GetPluginInfoCommand {
 
-       private static final RandomIdentifierGenerator IDENTIFIER = new RandomIdentifierGenerator();
        private final ListeningExecutorService threadPool;
        private final ConnectionSupplier connectionSupplier;
-       private final GetPluginInfo getPluginInfo = new GetPluginInfo(IDENTIFIER.generate());
+       private final GetPluginInfo getPluginInfo;
 
-       public GetPluginInfoCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier) {
+       public GetPluginInfoCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier, Supplier<String> identifierGenerator) {
                this.threadPool = MoreExecutors.listeningDecorator(threadPool);
                this.connectionSupplier = connectionSupplier;
+               getPluginInfo = new GetPluginInfo(identifierGenerator.get());
        }
 
        @Override
@@ -56,32 +55,18 @@ public class GetPluginInfoCommandImpl implements GetPluginInfoCommand {
 
        private class GetPluginInfoDialog extends FcpDialog<Optional<PluginInfo>> {
 
-               private final AtomicBoolean finished = new AtomicBoolean();
-               private final AtomicReference<PluginInfo> pluginInfo = new AtomicReference<>();
-
                public GetPluginInfoDialog() throws IOException {
-                       super(threadPool, connectionSupplier.get());
-               }
-
-               @Override
-               protected boolean isFinished() {
-                       return finished.get();
-               }
-
-               @Override
-               protected Optional<PluginInfo> getResult() {
-                       return Optional.ofNullable(pluginInfo.get());
+                       super(threadPool, connectionSupplier.get(), Optional.<PluginInfo>empty());
                }
 
                @Override
                protected void consumePluginInfo(PluginInfo pluginInfo) {
-                       this.pluginInfo.set(pluginInfo);
-                       finished.set(true);
+                       setResult(Optional.ofNullable(pluginInfo));
                }
 
                @Override
                protected void consumeProtocolError(ProtocolError protocolError) {
-                       finished.set(true);
+                       finish();
                }
 
        }