Refactor FCP dialog

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

diff --git a/src/main/java/net/pterodactylus/fcp/quelaton/ModifyConfigCommandImpl.java b/src/main/java/net/pterodactylus/fcp/quelaton/ModifyConfigCommandImpl.java
index 3de75c2..4e3b373 100644 (file)
--- a/src/main/java/net/pterodactylus/fcp/quelaton/ModifyConfigCommandImpl.java
+++ b/src/main/java/net/pterodactylus/fcp/quelaton/ModifyConfigCommandImpl.java
@@ -3,8 +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.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
 
 import net.pterodactylus.fcp.ConfigData;
 import net.pterodactylus.fcp.ModifyConfig;
@@ -20,13 +19,14 @@ import com.google.common.util.concurrent.MoreExecutors;
  */
 public class ModifyConfigCommandImpl implements ModifyConfigCommand {
 
-       private final ModifyConfig modifyConfig = new ModifyConfig(new RandomIdentifierGenerator().generate());
        private final ListeningExecutorService threadPool;
        private final ConnectionSupplier connectionSupplier;
+       private final ModifyConfig modifyConfig;
 
-       public ModifyConfigCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier) {
+       public ModifyConfigCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier, Supplier<String> identifierGenerator) {
                this.threadPool = MoreExecutors.listeningDecorator(threadPool);
                this.connectionSupplier = connectionSupplier;
+               modifyConfig = new ModifyConfig(identifierGenerator.get());
        }
 
        @Override
@@ -52,27 +52,13 @@ public class ModifyConfigCommandImpl implements ModifyConfigCommand {
 
        private class ModifyConfigDialog extends FcpDialog<ConfigData> {
 
-               private final AtomicBoolean finished = new AtomicBoolean();
-               private final AtomicReference<ConfigData> configData = new AtomicReference<>();
-
                public ModifyConfigDialog() throws IOException {
-                       super(threadPool, connectionSupplier.get());
-               }
-
-               @Override
-               protected boolean isFinished() {
-                       return finished.get();
-               }
-
-               @Override
-               protected ConfigData getResult() {
-                       return configData.get();
+                       super(threadPool, connectionSupplier.get(), null);
                }
 
                @Override
                protected void consumeConfigData(ConfigData configData) {
-                       this.configData.set(configData);
-                       finished.set(true);
+                       setResult(configData);
                }
 
        }