Refactor FCP dialog

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

diff --git a/src/main/java/net/pterodactylus/fcp/quelaton/LoadPluginCommandImpl.java b/src/main/java/net/pterodactylus/fcp/quelaton/LoadPluginCommandImpl.java
index 209e394..fa6bd65 100644 (file)
--- a/src/main/java/net/pterodactylus/fcp/quelaton/LoadPluginCommandImpl.java
+++ b/src/main/java/net/pterodactylus/fcp/quelaton/LoadPluginCommandImpl.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.LoadPlugin;
 import net.pterodactylus.fcp.LoadPlugin.OfficialSource;
@@ -24,14 +23,14 @@ import com.google.common.util.concurrent.MoreExecutors;
  */
 public class LoadPluginCommandImpl implements LoadPluginCommand {
 
-       private static final RandomIdentifierGenerator IDENTIFIER = new RandomIdentifierGenerator();
        private final ListeningExecutorService threadPool;
        private final ConnectionSupplier connectionSupplier;
-       private final LoadPlugin loadPlugin = new LoadPlugin(IDENTIFIER.generate());
+       private final LoadPlugin loadPlugin;
 
-       public LoadPluginCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier) {
+       public LoadPluginCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier, Supplier<String> identifierGenerator) {
                this.threadPool = MoreExecutors.listeningDecorator(threadPool);
                this.connectionSupplier = connectionSupplier;
+               loadPlugin = new LoadPlugin(identifierGenerator.get());
        }
 
        @Override
@@ -57,12 +56,26 @@ public class LoadPluginCommandImpl implements LoadPluginCommand {
        }
 
        @Override
+       public Executable<Optional<PluginInfo>> fromFreenet(String key) {
+               loadPlugin.setUrlType(UrlType.FREENET);
+               loadPlugin.setPluginUrl(key);
+               return this::execute;
+       }
+
+       @Override
        public Executable<Optional<PluginInfo>> fromFile(String filename) {
                loadPlugin.setUrlType(UrlType.FILE);
                loadPlugin.setPluginUrl(filename);
                return this::execute;
        }
 
+       @Override
+       public Executable<Optional<PluginInfo>> fromUrl(String url) {
+               loadPlugin.setUrlType(UrlType.URL);
+               loadPlugin.setPluginUrl(url);
+               return this::execute;
+       }
+
        private ListenableFuture<Optional<PluginInfo>> execute() {
                return threadPool.submit(this::executeDialog);
        }
@@ -75,32 +88,18 @@ public class LoadPluginCommandImpl implements LoadPluginCommand {
 
        private class LoadPluginDialog extends FcpDialog<Optional<PluginInfo>> {
 
-               private final AtomicBoolean finished = new AtomicBoolean();
-               private final AtomicReference<PluginInfo> pluginInfo = new AtomicReference<>();
-
                public LoadPluginDialog() 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();
                }
 
        }