X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FJabaWsServerQuery.java;h=84aa1a68dc3cb4445dd88c8fd1943f23ff3484e6;hb=bc1a3842b31a35a7794f4afec4911ad421c7c3e4;hp=a3ed47a444e7ad6de65e677138c91ee94435f049;hpb=4d7f98a6dd54d9863ba449ec79dcd95d25ed863d;p=jalview.git

diff --git a/src/jalview/ws/jws2/JabaWsServerQuery.java b/src/jalview/ws/jws2/JabaWsServerQuery.java
index a3ed47a..84aa1a6 100644
--- a/src/jalview/ws/jws2/JabaWsServerQuery.java
+++ b/src/jalview/ws/jws2/JabaWsServerQuery.java
@@ -23,7 +23,7 @@
  */
 package jalview.ws.jws2;
 
-import jalview.bin.Cache;
+import jalview.bin.Console;
 import jalview.ws.jws2.jabaws2.Jws2Instance;
 import jalview.ws.jws2.jabaws2.Jws2InstanceFactory;
 
@@ -117,7 +117,7 @@ public class JabaWsServerQuery implements Runnable
           registry = Jws2Client.connectToRegistry(jwsserver);
           if (registry != null)
           {
-            // System.err.println("Test Services Output\n"
+            // jalview.bin.Console.errPrintln("Test Services Output\n"
             // + registry.testAllServices());
             // TODO: enumerate services and test those that haven't been tested
             // in the last n-days/hours/etc.
@@ -126,23 +126,25 @@ public class JabaWsServerQuery implements Runnable
             srv_set = registry.getSupportedServices();
 
             // dan test
-            System.out.println("registry.getSupportedServices: "
-                    + srv_set.toString());
+            jalview.bin.Console.outPrintln(
+                    "registry.getSupportedServices: " + srv_set.toString());
 
             svccategories = registry.getServiceCategories();
 
             // dan test
-            // System.out.println("registry.getServiceCategories: " +
+            // jalview.bin.Console.outPrintln("registry.getServiceCategories: "
+            // +
             // svccategories.toString());
 
           }
         } catch (Exception ex)
         {
-          System.err.println("Exception whilst trying to get at registry:");
+          jalview.bin.Console.errPrintln(
+                  "Exception whilst trying to get at registry:");
           ex.printStackTrace();
           // if that failed, then we are probably working with a JABAWS1 server.
           // in that case, look for each service endpoint
-          System.err.println("JWS2 Discoverer: " + jwsserver
+          jalview.bin.Console.errPrintln("JWS2 Discoverer: " + jwsserver
                   + " is a JABAWS1 server. Using hardwired list.");
           for (Services srv : JABAWS1SERVERS)
           {
@@ -169,8 +171,9 @@ public class JabaWsServerQuery implements Runnable
               service = Jws2Client.connect(jwsserver, srv);
             } catch (Exception e)
             {
-              System.err.println("Jws2 Discoverer: Problem on " + jwsserver
-                      + " with service " + srv + ":\n" + e.getMessage());
+              jalview.bin.Console.errPrintln("Jws2 Discoverer: Problem on "
+                      + jwsserver + " with service " + srv + ":\n"
+                      + e.getMessage());
               if (!(e instanceof javax.xml.ws.WebServiceException))
               {
                 e.printStackTrace();
@@ -212,16 +215,16 @@ public class JabaWsServerQuery implements Runnable
       else
       {
         jws2Discoverer.addInvalidServiceUrl(jwsserver);
-        Cache.log.warn("Ignoring invalid Jws2 service url " + jwsserver);
+        Console.warn("Ignoring invalid Jws2 service url " + jwsserver);
       }
     } catch (Exception e)
     {
       e.printStackTrace();
-      Cache.log.warn("Exception when discovering Jws2 services.", e);
+      Console.warn("Exception when discovering Jws2 services.", e);
       jws2Discoverer.addInvalidServiceUrl(jwsserver);
     } catch (Error e)
     {
-      Cache.log.error("Exception when discovering Jws2 services.", e);
+      Console.error("Exception when discovering Jws2 services.", e);
       jws2Discoverer.addInvalidServiceUrl(jwsserver);
     }
     running = false;
@@ -245,12 +248,12 @@ public class JabaWsServerQuery implements Runnable
         result = true;
       } catch (MalformedURLException e)
       {
-        System.err.println("Invalid server URL: " + server);
+        jalview.bin.Console.errPrintln("Invalid server URL: " + server);
         result = false;
       } catch (IOException e)
       {
-        System.err.println("Error connecting to server: " + server + ": "
-                + e.toString());
+        jalview.bin.Console.errPrintln("Error connecting to server: "
+                + server + ": " + e.toString());
         result = false;
       }
     }