X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FJws2Discoverer.java;fp=src%2Fjalview%2Fws%2Fjws2%2FJws2Discoverer.java;h=d624c5ca3bedf88ed817221003c7f786a3d9e1eb;hb=1db943794a28bdd593776ef14fe5ef9f3cd50ba8;hp=516a7190aa3d7329737b7493b3e8e49b8cb429cc;hpb=a031a30fa5066c659a589f768cf7982bdeaa1252;p=jalview.git diff --git a/src/jalview/ws/jws2/Jws2Discoverer.java b/src/jalview/ws/jws2/Jws2Discoverer.java index 516a719..d624c5c 100644 --- a/src/jalview/ws/jws2/Jws2Discoverer.java +++ b/src/jalview/ws/jws2/Jws2Discoverer.java @@ -21,6 +21,7 @@ package jalview.ws.jws2; import jalview.bin.Cache; +import jalview.bin.Console; import jalview.gui.AlignFrame; import jalview.gui.Desktop; import jalview.gui.JvSwingUtils; @@ -164,7 +165,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI { try { - Cache.log.debug( + Console.debug( "Waiting around for old discovery thread to finish."); // wait around until old discoverer dies Thread.sleep(100); @@ -173,7 +174,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI } } aborted = false; - Cache.log.debug("Old discovery thread has finished."); + Console.debug("Old discovery thread has finished."); } running = true; @@ -258,7 +259,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI } if (aborted) { - Cache.log.debug( + Console.debug( "Aborting " + qrys.size() + " JABAWS discovery threads."); for (JabaWsServerQuery squery : qrys) { @@ -711,23 +712,23 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI } else { - Cache.log.warn("Ignoring duplicate url " + url + " in " + Console.warn("Ignoring duplicate url " + url + " in " + JWS2HOSTURLS + " list"); } } catch (MalformedURLException ex) { - Cache.log.warn("Problem whilst trying to make a URL from '" + Console.warn("Problem whilst trying to make a URL from '" + ((url != null) ? url : "") + "'"); - Cache.log.warn( + Console.warn( "This was probably due to a malformed comma separated list" + " in the " + JWS2HOSTURLS + " entry of $(HOME)/.jalview_properties)"); - Cache.log.debug("Exception was ", ex); + Console.debug("Exception was ", ex); } } } catch (Exception ex) { - Cache.log.warn("Error parsing comma separated list of urls in " + Console.warn("Error parsing comma separated list of urls in " + JWS2HOSTURLS + " preference.", ex); } return urls;