projects
/
jFCPlib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor FCP dialog
[jFCPlib.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
fcp
/
quelaton
/
AddPeerCommandImpl.java
diff --git
a/src/main/java/net/pterodactylus/fcp/quelaton/AddPeerCommandImpl.java
b/src/main/java/net/pterodactylus/fcp/quelaton/AddPeerCommandImpl.java
index
b34d2ba
..
9dca0dc
100644
(file)
--- a/
src/main/java/net/pterodactylus/fcp/quelaton/AddPeerCommandImpl.java
+++ b/
src/main/java/net/pterodactylus/fcp/quelaton/AddPeerCommandImpl.java
@@
-6,7
+6,6
@@
import java.net.URL;
import java.util.Optional;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
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 java.util.concurrent.atomic.AtomicReference;
import java.util.function.Supplier;
@@
-77,32
+76,18
@@
public class AddPeerCommandImpl implements AddPeerCommand {
private class AddPeerDialog extends FcpDialog<Optional<Peer>> {
private class AddPeerDialog extends FcpDialog<Optional<Peer>> {
- private final AtomicBoolean finished = new AtomicBoolean();
- private final AtomicReference<Peer> peer = new AtomicReference<>();
-
public AddPeerDialog() throws IOException {
public AddPeerDialog() throws IOException {
- super(threadPool, connectionSupplier.get());
- }
-
- @Override
- protected boolean isFinished() {
- return finished.get();
- }
-
- @Override
- protected Optional<Peer> getResult() {
- return Optional.ofNullable(peer.get());
+ super(threadPool, connectionSupplier.get(), Optional.empty());
}
@Override
protected void consumePeer(Peer peer) {
}
@Override
protected void consumePeer(Peer peer) {
- this.peer.set(peer);
- finished.set(true);
+ setResult(Optional.ofNullable(peer));
}
@Override
protected void consumeProtocolError(ProtocolError protocolError) {
}
@Override
protected void consumeProtocolError(ProtocolError protocolError) {
- finish
ed.set(true
);
+ finish
(
);
}
}
}
}