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
/
GetPluginInfoCommandImpl.java
diff --git
a/src/main/java/net/pterodactylus/fcp/quelaton/GetPluginInfoCommandImpl.java
b/src/main/java/net/pterodactylus/fcp/quelaton/GetPluginInfoCommandImpl.java
index
49db826
..
e8a30ec
100644
(file)
--- a/
src/main/java/net/pterodactylus/fcp/quelaton/GetPluginInfoCommandImpl.java
+++ b/
src/main/java/net/pterodactylus/fcp/quelaton/GetPluginInfoCommandImpl.java
@@
-4,8
+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 net.pterodactylus.fcp.GetPluginInfo;
import java.util.function.Supplier;
import net.pterodactylus.fcp.GetPluginInfo;
@@
-57,32
+55,18
@@
public class GetPluginInfoCommandImpl implements GetPluginInfoCommand {
private class GetPluginInfoDialog extends FcpDialog<Optional<PluginInfo>> {
private class GetPluginInfoDialog extends FcpDialog<Optional<PluginInfo>> {
- private final AtomicBoolean finished = new AtomicBoolean();
- private final AtomicReference<PluginInfo> pluginInfo = new AtomicReference<>();
-
public GetPluginInfoDialog() throws IOException {
public GetPluginInfoDialog() 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) {
}
@Override
protected void consumePluginInfo(PluginInfo pluginInfo) {
- this.pluginInfo.set(pluginInfo);
- finished.set(true);
+ setResult(Optional.ofNullable(pluginInfo));
}
@Override
protected void consumeProtocolError(ProtocolError protocolError) {
}
@Override
protected void consumeProtocolError(ProtocolError protocolError) {
- finish
ed.set(true
);
+ finish
(
);
}
}
}
}