*/
package jalview.ws.jws1;
-import jalview.bin.Instance;
import jalview.gui.JvOptionPane;
import jalview.util.MessageManager;
public class Discoverer implements Runnable
{
-
- public static Discoverer getInstance()
- {
- Instance j = Instance.getInstance();
- return (j.discoverer == null ? j.discoverer = new Discoverer()
- : j.discoverer);
- }
-
- private Discoverer()
- {
- // use getInstance()
- }
-
- private java.net.URL RootServiceURL = null;
-
- private Vector<URL> ServiceURLList = null;
-
- private boolean reallyDiscoverServices = true;
-
- private Hashtable<String, Vector<ServiceHandle>> services = null;
-
- public Hashtable<String, Vector<ServiceHandle>> getServices()
- {
- return services;
- }
-
- private Vector<ServiceHandle> serviceList = null;
-
- // private ext.vamsas.IRegistry registry; // the root registry service.
-
+ ext.vamsas.IRegistry registry; // the root registry service.
private java.beans.PropertyChangeSupport changeSupport = new java.beans.PropertyChangeSupport(
this);
return server;
}
+ static private java.net.URL RootServiceURL = null;
+
+ static public Vector<URL> ServiceURLList = null;
+
+ static private boolean reallyDiscoverServices = true;
+
+ public static java.util.Hashtable<String, Vector<ServiceHandle>> services = null;
+ // stored by
+ // abstractServiceType
+ // string
+
+ public static java.util.Vector<ServiceHandle> serviceList = null;
+
static private Vector<URL> getDiscoveryURLS()
{
Vector<URL> urls = new Vector<>();
{
jalview.bin.Cache.log
.debug("(Re)-Initialising the discovery URL list.");
- Discoverer d = getInstance();
try
{
- d.reallyDiscoverServices = jalview.bin.Cache
+ reallyDiscoverServices = jalview.bin.Cache
.getDefault("DISCOVERY_START", false);
- if (d.reallyDiscoverServices)
+ if (reallyDiscoverServices)
{
- d.ServiceURLList = getDiscoveryURLS();
+ ServiceURLList = getDiscoveryURLS();
}
else
{
jalview.bin.Cache.log.debug("Setting default services");
- d.services = new Hashtable<>();
+ services = new Hashtable<>();
// Muscle, Clustal and JPred.
ServiceHandle[] defServices = { new ServiceHandle("MsaWS",
"Edgar, Robert C. (2004), MUSCLE: multiple sequence alignment "
+ "\ndoi://10.1093/nar/gkv332",
"http://www.compbio.dundee.ac.uk/JalviewWS/services/jpred",
"JPred Secondary Structure Prediction") };
- d.services = new Hashtable<>();
- d.serviceList = new Vector<>();
- buildServiceLists(defServices, d.serviceList, d.services);
+ services = new Hashtable<>();
+ serviceList = new Vector<>();
+ buildServiceLists(defServices, serviceList, services);
}
} catch (Exception e)
{
System.err.println(
"jalview.rootRegistry is not a proper url!\nWas set to "
- + d.RootServiceURL + "\n" + e);
+ + RootServiceURL + "\n" + e);
}
}
// JBPNote - should do this a better way!
if (f.getFaultReason().indexOf("(407)") > -1)
{
- if (jalview.gui.Desktop.getDesktopPane() != null)
+ if (jalview.gui.Desktop.desktop != null)
{
- JvOptionPane.showMessageDialog(jalview.gui.Desktop.getDesktopPane(),
+ JvOptionPane.showMessageDialog(jalview.gui.Desktop.desktop,
MessageManager.getString("label.set_proxy_settings"),
MessageManager
.getString("label.proxy_authorization_failed"),
cat.add(sh[i]);
if (sh[i].getAbstractName().equals("Registry"))
{
- Vector<URL> list = getInstance().ServiceURLList;
- for (int s = 0, sUrls = list.size(); s < sUrls; s++)
+ for (int s = 0, sUrls = ServiceURLList.size(); s < sUrls; s++)
{
java.net.URL disc_serv = null;
try
{
disc_serv = new java.net.URL(sh[i].getEndpointURL());
- if (!list.contains(disc_serv))
+ if (!ServiceURLList.contains(disc_serv))
{
jalview.bin.Cache.log.debug(
"Adding new discovery service at " + disc_serv);
- list.add(disc_serv);
+ ServiceURLList.add(disc_serv);
seenNewDiscovery = true;
}
} catch (Exception e)