package jalview.ws.jws2;
import jalview.bin.Cache;
+import jalview.bin.Console;
import jalview.gui.AlignFrame;
import jalview.gui.Desktop;
import jalview.gui.JvSwingUtils;
{
try
{
- Cache.debug(
+ Console.debug(
"Waiting around for old discovery thread to finish.");
// wait around until old discoverer dies
Thread.sleep(100);
}
}
aborted = false;
- Cache.debug("Old discovery thread has finished.");
+ Console.debug("Old discovery thread has finished.");
}
running = true;
.loadClass("compbio.ws.client.Jws2Client");
} catch (ClassNotFoundException e)
{
- System.err.println(
+ jalview.bin.Console.errPrintln(
"Not enabling JABA Webservices : client jar is not available."
+ "\nPlease check that your webstart JNLP file is up to date!");
running = false;
}
if (aborted)
{
- Cache.debug(
+ Console.debug(
"Aborting " + qrys.size() + " JABAWS discovery threads.");
for (JabaWsServerQuery squery : qrys)
{
{
services = new Vector<>();
}
- System.out.println(
+ jalview.bin.Console.outPrintln(
"Discovered service: " + jwsservers + " " + service.toString());
// Jws2Instance service = new Jws2Instance(jwsservers, srv.toString(),
// service2);
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);
{
if (getDiscoverer().services != null)
{
- System.out.println("Changesupport: There are now "
- + getDiscoverer().services.size() + " services");
+ jalview.bin.Console
+ .outPrintln("Changesupport: There are now "
+ + getDiscoverer().services.size()
+ + " services");
int i = 1;
for (Jws2Instance instance : getDiscoverer().services)
{
- System.out.println("Service " + i++ + " "
+ jalview.bin.Console.outPrintln("Service " + i++ + " "
+ instance.getClass() + "@" + instance.getHost()
+ ": " + instance.getActionText());
}
}
else
{
- Cache.warn("Ignoring duplicate url " + url + " in "
+ Console.warn("Ignoring duplicate url " + url + " in "
+ JWS2HOSTURLS + " list");
}
} catch (MalformedURLException ex)
{
- Cache.warn("Problem whilst trying to make a URL from '"
+ Console.warn("Problem whilst trying to make a URL from '"
+ ((url != null) ? url : "<null>") + "'");
- Cache.warn(
+ Console.warn(
"This was probably due to a malformed comma separated list"
+ " in the " + JWS2HOSTURLS
+ " entry of $(HOME)/.jalview_properties)");
- Cache.debug("Exception was ", ex);
+ Console.debug("Exception was ", ex);
}
}
} catch (Exception ex)
{
- Cache.warn("Error parsing comma separated list of urls in "
+ Console.warn("Error parsing comma separated list of urls in "
+ JWS2HOSTURLS + " preference.", ex);
}
return urls;
public Vector<Jws2Instance> getServices()
{
- return (services == null) ? new Vector<>()
- : new Vector<>(services);
+ return (services == null) ? new Vector<>() : new Vector<>(services);
}
/**