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
TreeBuilder now stores the used ScoreModel and ScoreParams
[jalview.git]
/
src
/
jalview
/
gui
/
WsPreferences.java
diff --git
a/src/jalview/gui/WsPreferences.java
b/src/jalview/gui/WsPreferences.java
index
850ef21
..
dc3cadd
100644
(file)
--- a/
src/jalview/gui/WsPreferences.java
+++ b/
src/jalview/gui/WsPreferences.java
@@
-37,7
+37,6
@@
import java.util.List;
import java.util.Vector;
import javax.swing.JLabel;
import java.util.Vector;
import javax.swing.JLabel;
-import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JTable;
import javax.swing.JTextField;
import javax.swing.JPanel;
import javax.swing.JTable;
import javax.swing.JTextField;
@@
-68,12
+67,12
@@
public class WsPreferences extends GWsPreferences
wsUrls = Jws2Discoverer.getDiscoverer().getServiceUrls();
if (!wsUrls.isEmpty())
{
wsUrls = Jws2Discoverer.getDiscoverer().getServiceUrls();
if (!wsUrls.isEmpty())
{
- oldUrls = new Vector<String>(wsUrls);
+ oldUrls = new Vector<>(wsUrls);
}
else
{
oldUrls = null;
}
else
{
oldUrls = null;
- wsUrls = new Vector<String>();
+ wsUrls = new Vector<>();
}
wsList.setDefaultRenderer(Integer.class, new JabaWSStatusRenderer());
wsList.setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS);
}
wsList.setDefaultRenderer(Integer.class, new JabaWSStatusRenderer());
wsList.setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS);
@@
-81,12
+80,12
@@
public class WsPreferences extends GWsPreferences
rsbsUrls = jalview.ws.rest.RestClient.getRsbsDescriptions();
if (rsbsUrls != null)
{
rsbsUrls = jalview.ws.rest.RestClient.getRsbsDescriptions();
if (rsbsUrls != null)
{
- oldRsbsUrls = new Vector<String>(rsbsUrls);
+ oldRsbsUrls = new Vector<>(rsbsUrls);
}
else
{
oldRsbsUrls = null;
}
else
{
oldRsbsUrls = null;
- rsbsUrls = new Vector<String>();
+ rsbsUrls = new Vector<>();
}
updateRsbsList();
enableEnfinServices.setSelected(
}
updateRsbsList();
enableEnfinServices.setSelected(
@@
-568,7
+567,7
@@
public class WsPreferences extends GWsPreferences
updateWsMenuConfig(false);
refreshWsMenu(true);
}
updateWsMenuConfig(false);
refreshWsMenu(true);
}
- }).start();
+ }, "RefreshWebServicesThread").start();
}
}
@@
-604,7
+603,7
@@
public class WsPreferences extends GWsPreferences
progressBar.setVisible(false);
validate();
}
progressBar.setVisible(false);
validate();
}
- }).start();
+ }, "RefreshWebServicesMenuProgressBarThread").start();
}
else
}
else
@@
-627,7
+626,7
@@
public class WsPreferences extends GWsPreferences
Desktop.instance.setProgressBar(null, ct);
}
Desktop.instance.setProgressBar(null, ct);
}
- }).start();
+ }, "RefreshWebServicesMenuThread").start();
}
}
}
}
@@
-676,7
+675,7
@@
public class WsPreferences extends GWsPreferences
updateWsMenuConfig(false);
refreshWsMenu(showProgressInDialog);
}
updateWsMenuConfig(false);
refreshWsMenu(showProgressInDialog);
}
- }).start();
+ }, "UpdateAndRefreshWebServicesMenuThread").start();
}
}
}
}