git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6f5064f
)
fix for JAL-888
author
jprocter
<jprocter@compbio.dundee.ac.uk>
Wed, 17 Aug 2011 11:15:36 +0000
(12:15 +0100)
committer
jprocter
<jprocter@compbio.dundee.ac.uk>
Wed, 17 Aug 2011 11:15:36 +0000
(12:15 +0100)
src/jalview/gui/WsPreferences.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/WsPreferences.java
b/src/jalview/gui/WsPreferences.java
index
ff149c1
..
e14b358
100644
(file)
--- a/
src/jalview/gui/WsPreferences.java
+++ b/
src/jalview/gui/WsPreferences.java
@@
-159,6
+159,10
@@
public class WsPreferences extends GWsPreferences
{
if (old)
{
{
if (old)
{
+ if (oldUrls!=wsUrls || (wsUrls!=null && oldUrls!=null && !wsUrls.equals(oldUrls)))
+ {
+ update++;
+ }
wsUrls = (oldUrls == null) ? null : new Vector(oldUrls);
}
else
wsUrls = (oldUrls == null) ? null : new Vector(oldUrls);
}
else
@@
-419,8
+423,14
@@
public class WsPreferences extends GWsPreferences
protected void resetWs_actionPerformed(ActionEvent e)
{
jalview.ws.jws2.Jws2Discoverer.setServiceUrls(null);
protected void resetWs_actionPerformed(ActionEvent e)
{
jalview.ws.jws2.Jws2Discoverer.setServiceUrls(null);
- wsUrls = jalview.ws.jws2.Jws2Discoverer.getServiceUrls();
+ Vector nwsUrls = jalview.ws.jws2.Jws2Discoverer.getServiceUrls();
+ if (!wsUrls.equals(nwsUrls)) {
+ update++;
+ }
+ wsUrls=nwsUrls;
updateList();
updateList();
+
+ updateAndRefreshWsMenuConfig(true);
}
protected void ok_ActionPerformed(ActionEvent e)
}
protected void ok_ActionPerformed(ActionEvent e)