X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws1%2FDiscoverer.java;fp=src%2Fjalview%2Fws%2Fjws1%2FDiscoverer.java;h=69e47a3f0b88027177d1f506a423587598bc5619;hb=9c98d4bd666346f6ad3892c5394b7da3be82d93e;hp=4a8f512e563c31054a551f346d570b8f306d020d;hpb=c7b2143c9cf7c5e05ad63251f7d3910751b16d20;p=jalview.git diff --git a/src/jalview/ws/jws1/Discoverer.java b/src/jalview/ws/jws1/Discoverer.java index 4a8f512..69e47a3 100644 --- a/src/jalview/ws/jws1/Discoverer.java +++ b/src/jalview/ws/jws1/Discoverer.java @@ -151,7 +151,7 @@ public class Discoverer implements Runnable } catch (Exception ex) { Console.warn("Problem whilst trying to make a URL from '" - + ((url != null) ? url : "") + "'"); + + ((url != null) ? url : "") + "'"); Console.warn( "This was probably due to a malformed comma separated list" + " in the DISCOVERY_URLS entry of $(HOME)/.jalview_properties)"); @@ -179,8 +179,7 @@ public class Discoverer implements Runnable Console.debug("(Re)-Initialising the discovery URL list."); try { - reallyDiscoverServices = Cache - .getDefault("DISCOVERY_START", false); + reallyDiscoverServices = Cache.getDefault("DISCOVERY_START", false); if (reallyDiscoverServices) { ServiceURLList = getDiscoveryURLS(); @@ -292,9 +291,9 @@ public class Discoverer implements Runnable { if (!cat.contains(sh[i])) { - Console.debug("A " + sh[i].getAbstractName() - + " service called " + sh[i].getName() + " exists at " - + sh[i].getEndpointURL() + "\n"); + Console.debug("A " + sh[i].getAbstractName() + " service called " + + sh[i].getName() + " exists at " + sh[i].getEndpointURL() + + "\n"); if (!sscat.containsKey(sh[i].getAbstractName())) { sscat.put(sh[i].getAbstractName(), cat = new Vector<>()); @@ -322,7 +321,7 @@ public class Discoverer implements Runnable } catch (Exception e) { Console.debug("Ignoring bad discovery service URL " - + sh[i].getEndpointURL(), e); + + sh[i].getEndpointURL(), e); } } } @@ -344,16 +343,14 @@ public class Discoverer implements Runnable } while (s_url < ServiceURLList.size()) { - if ((sh = getServices( - ServiceURLList.get(s_url))) != null) + if ((sh = getServices(ServiceURLList.get(s_url))) != null) { buildServiceLists(sh, cat, sscat); } else { - Console.warn("No services at " - + (ServiceURLList.get(s_url)) + Console.warn("No services at " + (ServiceURLList.get(s_url)) + " - check DISCOVERY_URLS property in .jalview_properties"); } s_url++; @@ -404,8 +401,7 @@ public class Discoverer implements Runnable serviceClientBindings.put("SecStrPred", new JPredClient()); serviceClientBindings.put("SeqSearch", new SeqSearchWSClient()); } - WS1Client instance = serviceClientBindings - .get(sh.getAbstractName()); + WS1Client instance = serviceClientBindings.get(sh.getAbstractName()); if (instance == null) { System.err.println(