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
Merge branch 'kjvdh/features/PhylogenyViewer_tabbedsupport' into merge/2_11_2/kjvdh...
[jalview.git]
/
src
/
jalview
/
ws
/
jws2
/
Jws2Discoverer.java
diff --git
a/src/jalview/ws/jws2/Jws2Discoverer.java
b/src/jalview/ws/jws2/Jws2Discoverer.java
index
d624c5c
..
7bf5a97
100644
(file)
--- a/
src/jalview/ws/jws2/Jws2Discoverer.java
+++ b/
src/jalview/ws/jws2/Jws2Discoverer.java
@@
-238,7
+238,7
@@
public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
}
qrys.add(squery);
}
qrys.add(squery);
- new Thread(squery).start();
+ new Thread(squery, "JabaQueryThread").start();
}
boolean finished = true;
do
}
boolean finished = true;
do
@@
-457,9
+457,8
@@
public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
sv.action, sv);
changeSupport.firePropertyChange("services",
new Vector<Jws2Instance>(), services);
sv.action, sv);
changeSupport.firePropertyChange("services",
new Vector<Jws2Instance>(), services);
- }
- }).start();
-
+ };
+ }, "LoadPreferredServiceThread").start();
}
});
}
}
});
}
@@
-492,8
+491,7
@@
public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
ArrayList<Jws2Instance> hostservices = hosts.get(service.getHost());
if (hostservices == null)
{
ArrayList<Jws2Instance> hostservices = hosts.get(service.getHost());
if (hostservices == null)
{
- hosts.put(service.getHost(),
- hostservices = new ArrayList<>());
+ hosts.put(service.getHost(), hostservices = new ArrayList<>());
hostlist.add(service.getHost());
}
hostservices.add(service);
hostlist.add(service.getHost());
}
hostservices.add(service);
@@
-736,7
+734,7
@@
public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
public Vector<Jws2Instance> getServices()
{
public Vector<Jws2Instance> getServices()
{
- return (services == null) ? new Vector<>()
+ return (services == null) ? new Vector<Jws2Instance>()
: new Vector<>(services);
}
: new Vector<>(services);
}