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
/
ModifyPeerCommandImpl.java
diff --git
a/src/main/java/net/pterodactylus/fcp/quelaton/ModifyPeerCommandImpl.java
b/src/main/java/net/pterodactylus/fcp/quelaton/ModifyPeerCommandImpl.java
index
9fff845
..
d5f5840
100644
(file)
--- a/
src/main/java/net/pterodactylus/fcp/quelaton/ModifyPeerCommandImpl.java
+++ b/
src/main/java/net/pterodactylus/fcp/quelaton/ModifyPeerCommandImpl.java
@@
-4,7
+4,6
@@
import java.io.IOException;
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;
@@
-135,32
+134,18
@@
public class ModifyPeerCommandImpl implements ModifyPeerCommand {
private class ModifyPeerDialog extends FcpDialog<Optional<Peer>> {
private class ModifyPeerDialog extends FcpDialog<Optional<Peer>> {
- private final AtomicBoolean finished = new AtomicBoolean();
- private final AtomicReference<Peer> peer = new AtomicReference<>();
-
public ModifyPeerDialog() throws IOException {
public ModifyPeerDialog() 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.<Peer>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 consumeUnknownNodeIdentifier(UnknownNodeIdentifier unknownNodeIdentifier) {
}
@Override
protected void consumeUnknownNodeIdentifier(UnknownNodeIdentifier unknownNodeIdentifier) {
- finish
ed.set(true
);
+ finish
(
);
}
}
}
}