JAL-3949 - refactor logging from jalview.bin.Cache to jalview.bin.Console

[jalview.git] / src / jalview / ws / jws2 / JabaWsServerQuery.java

diff --git a/src/jalview/ws/jws2/JabaWsServerQuery.java b/src/jalview/ws/jws2/JabaWsServerQuery.java
index 5b83e11..5831df8 100644 (file)
--- 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;
 
@@ -74,15 +74,15 @@ public class JabaWsServerQuery implements Runnable
     this.jwsserver = server;
   }
 
-  Services[] JABAWS1SERVERS = new Services[]
-  { Services.ClustalWS, Services.MuscleWS, Services.MafftWS,
-      Services.ProbconsWS, Services.TcoffeeWS };
+  Services[] JABAWS1SERVERS = new Services[] { Services.ClustalWS,
+      Services.MuscleWS, Services.MafftWS, Services.ProbconsWS,
+      Services.TcoffeeWS };
 
-  Services[] JABAWS2SERVERS = new Services[]
-  { Services.ClustalWS, Services.MuscleWS, Services.MafftWS,
-      Services.ProbconsWS, Services.TcoffeeWS, Services.AAConWS,
-      Services.DisemblWS, Services.GlobPlotWS, Services.IUPredWS,
-      Services.JronnWS, Services.RNAalifoldWS };
+  Services[] JABAWS2SERVERS = new Services[] { Services.ClustalWS,
+      Services.MuscleWS, Services.MafftWS, Services.ProbconsWS,
+      Services.TcoffeeWS, Services.AAConWS, Services.DisemblWS,
+      Services.GlobPlotWS, Services.IUPredWS, Services.JronnWS,
+      Services.RNAalifoldWS };
 
   /*
    * (non-Javadoc)
@@ -126,8 +126,8 @@ public class JabaWsServerQuery implements Runnable
             srv_set = registry.getSupportedServices();
 
             // dan test
-            System.out.println("registry.getSupportedServices: "
-                    + srv_set.toString());
+            System.out.println(
+                    "registry.getSupportedServices: " + srv_set.toString());
 
             svccategories = registry.getServiceCategories();
 
@@ -169,9 +169,8 @@ 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());
+              System.err.println("Jws2 Discoverer: Problem on " + jwsserver
+                      + " with service " + srv + ":\n" + e.getMessage());
               if (!(e instanceof javax.xml.ws.WebServiceException))
               {
                 e.printStackTrace();
@@ -213,16 +212,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;
@@ -237,8 +236,10 @@ public class JabaWsServerQuery implements Runnable
   {
     // return Jws2Client.validURL(jwsserver); // checks syntax only
     boolean result = false;
-    if (server != null) {
-      try {
+    if (server != null)
+    {
+      try
+      {
         URL url = new URL(server);
         url.openStream().close();
         result = true;