Refactor FCP dialog

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

diff --git a/src/main/java/net/pterodactylus/fcp/quelaton/GetConfigCommandImpl.java b/src/main/java/net/pterodactylus/fcp/quelaton/GetConfigCommandImpl.java
index c2095b3..1a5971c 100644 (file)
--- a/src/main/java/net/pterodactylus/fcp/quelaton/GetConfigCommandImpl.java
+++ b/src/main/java/net/pterodactylus/fcp/quelaton/GetConfigCommandImpl.java
@@ -4,7 +4,7 @@ import java.io.IOException;
 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.ConfigData;
 import net.pterodactylus.fcp.GetConfig;
@@ -22,6 +22,7 @@ public class GetConfigCommandImpl implements GetConfigCommand {
 
        private final ListeningExecutorService threadPool;
        private final ConnectionSupplier connectionSupplier;
+       private final Supplier<String> identifierGenerator;
        private final AtomicBoolean withCurrent = new AtomicBoolean();
        private final AtomicBoolean withDefaults = new AtomicBoolean();
        private final AtomicBoolean withSortOrder = new AtomicBoolean();
@@ -31,9 +32,10 @@ public class GetConfigCommandImpl implements GetConfigCommand {
        private final AtomicBoolean withLongDescription = new AtomicBoolean();
        private final AtomicBoolean withDataTypes = new AtomicBoolean();
 
-       public GetConfigCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier) {
+       public GetConfigCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier, Supplier<String> identifierGenerator) {
                this.threadPool = MoreExecutors.listeningDecorator(threadPool);
                this.connectionSupplier = connectionSupplier;
+               this.identifierGenerator = identifierGenerator;
        }
 
        @Override
@@ -90,7 +92,7 @@ public class GetConfigCommandImpl implements GetConfigCommand {
        }
 
        private ConfigData executeDialog() throws IOException, ExecutionException, InterruptedException {
-               GetConfig getConfig = new GetConfig(new RandomIdentifierGenerator().generate());
+               GetConfig getConfig = new GetConfig(identifierGenerator.get());
                getConfig.setWithCurrent(withCurrent.get());
                getConfig.setWithDefaults(withDefaults.get());
                getConfig.setWithSortOrder(withSortOrder.get());
@@ -106,25 +108,13 @@ public class GetConfigCommandImpl implements GetConfigCommand {
 
        private class GetConfigDialog extends FcpDialog<ConfigData> {
 
-               private final AtomicReference<ConfigData> configData = new AtomicReference<>();
-
                public GetConfigDialog() throws IOException {
-                       super(threadPool, connectionSupplier.get());
-               }
-
-               @Override
-               protected boolean isFinished() {
-                       return configData.get() != null;
-               }
-
-               @Override
-               protected ConfigData getResult() {
-                       return configData.get();
+                       super(threadPool, connectionSupplier.get(), null);
                }
 
                @Override
                protected void consumeConfigData(ConfigData configData) {
-                       this.configData.set(configData);
+                       setResult(configData);
                }
 
        }