git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3690 switching to CompletableFuture to allow chaining
[jalview.git]
/
src
/
jalview
/
gui
/
SlivkaPreferences.java
diff --git
a/src/jalview/gui/SlivkaPreferences.java
b/src/jalview/gui/SlivkaPreferences.java
index
0743d58
..
6c365b9
100644
(file)
--- a/
src/jalview/gui/SlivkaPreferences.java
+++ b/
src/jalview/gui/SlivkaPreferences.java
@@
-308,18
+308,19
@@
public class SlivkaPreferences extends JPanel
// Discoverer buttons action listeners
private ActionListener refreshServicesAction = (ActionEvent e) -> {
progressBar.setVisible(true);
// Discoverer buttons action listeners
private ActionListener refreshServicesAction = (ActionEvent e) -> {
progressBar.setVisible(true);
- new Thread(() -> {
- Cache.log.info("Requesting service reload");
- var task = discoverer.startDiscoverer();
- try {
- task.get();
+ Cache.log.info("Requesting service reload");
+ discoverer.startDiscoverer().handle((_discoverer, exception) -> {
+ if (exception == null)
+ {
Cache.log.info("Reloading done");
Cache.log.info("Reloading done");
- } catch (Exception exc) {
- Cache.log.error("Reloading failed", exc);
- } finally {
- SwingUtilities.invokeLater(() -> progressBar.setVisible(false));
}
}
- }).start();
+ else
+ {
+ Cache.log.error("Reloading failed", exception);
+ }
+ SwingUtilities.invokeLater(() -> progressBar.setVisible(false));
+ return null;
+ });
};
private ActionListener resetServicesAction = (ActionEvent e) -> {
};
private ActionListener resetServicesAction = (ActionEvent e) -> {