X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Ffcp%2Fquelaton%2FAddPeerCommandImpl.java;h=a54f1666a926ab4dd2eb567e094c9d80823b9d67;hb=3351e5f36c74fc270152688c251ea32365808222;hp=67aa56338a1be9bdb51ad9ac93461e8d9eb93bd5;hpb=5d5612c9bfcc8c30abca5556f94cbd01c8a1f4be;p=jFCPlib.git

diff --git a/src/main/java/net/pterodactylus/fcp/quelaton/AddPeerCommandImpl.java b/src/main/java/net/pterodactylus/fcp/quelaton/AddPeerCommandImpl.java
index 67aa563..a54f166 100644
--- a/src/main/java/net/pterodactylus/fcp/quelaton/AddPeerCommandImpl.java
+++ b/src/main/java/net/pterodactylus/fcp/quelaton/AddPeerCommandImpl.java
@@ -2,6 +2,7 @@ package net.pterodactylus.fcp.quelaton;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URL;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
@@ -9,6 +10,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
 import net.pterodactylus.fcp.AddPeer;
+import net.pterodactylus.fcp.NodeRef;
 import net.pterodactylus.fcp.Peer;
 import net.pterodactylus.fcp.ProtocolError;
 
@@ -17,7 +19,7 @@ import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 
 /**
- * Default {@link AddPeerCommand} implementation based on {@link FcpReplySequence}.
+ * Default {@link AddPeerCommand} implementation based on {@link FcpDialog}.
  *
  * @author <a href="mailto:bombe@freenetproject.org">David ‘Bombe’ Roden</a>
  */
@@ -26,6 +28,8 @@ public class AddPeerCommandImpl implements AddPeerCommand {
 	private final ListeningExecutorService threadPool;
 	private final ConnectionSupplier connectionSupplier;
 	private final AtomicReference<File> file = new AtomicReference<>();
+	private final AtomicReference<URL> url = new AtomicReference<>();
+	private final AtomicReference<NodeRef> nodeRef = new AtomicReference<>();
 
 	public AddPeerCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier) {
 		this.threadPool = MoreExecutors.listeningDecorator(threadPool);
@@ -33,26 +37,42 @@ public class AddPeerCommandImpl implements AddPeerCommand {
 	}
 
 	@Override
-	public Executable<Optional<Peer>> withFile(File file) {
+	public Executable<Optional<Peer>> fromFile(File file) {
 		this.file.set(file);
 		return this::execute;
 	}
 
+	@Override
+	public Executable<Optional<Peer>> fromURL(URL url) {
+		this.url.set(url);
+		return this::execute;
+	}
+
+	@Override
+	public Executable<Optional<Peer>> fromNodeRef(NodeRef nodeRef) {
+		this.nodeRef.set(nodeRef);
+		return this::execute;
+	}
+
 	private ListenableFuture<Optional<Peer>> execute() {
 		return threadPool.submit(this::executeSequence);
 	}
 
 	private Optional<Peer> executeSequence() throws IOException, ExecutionException, InterruptedException {
-		AddPeer addPeer = null;
+		AddPeer addPeer;
 		if (file.get() != null) {
 			addPeer = new AddPeer(new RandomIdentifierGenerator().generate(), file.get().getPath());
+		} else if (url.get() != null) {
+			addPeer = new AddPeer(new RandomIdentifierGenerator().generate(), url.get());
+		} else {
+			addPeer = new AddPeer(new RandomIdentifierGenerator().generate(), nodeRef.get());
 		}
 		try (AddPeerSequence addPeerSequence = new AddPeerSequence()) {
 			return addPeerSequence.send(addPeer).get();
 		}
 	}
 
-	private class AddPeerSequence extends FcpReplySequence<Optional<Peer>> {
+	private class AddPeerSequence extends FcpDialog<Optional<Peer>> {
 
 		private final AtomicBoolean finished = new AtomicBoolean();
 		private final AtomicReference<Peer> peer = new AtomicReference<>();