X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FJabaWsServerQuery.java;h=5831df860f1ae584ecbfacbc1291e5c6a51ec8a0;hb=cb8e52fbbc5f725e3f7f48c672cdddb0690bd978;hp=74dce4d6304b6b078e4c9526396f2595fed3cb79;hpb=9d139ca8d1af8f0f2d78193d418ae9e9168a3e8a;p=jalview.git

diff --git a/src/jalview/ws/jws2/JabaWsServerQuery.java b/src/jalview/ws/jws2/JabaWsServerQuery.java
index 74dce4d..5831df8 100644
--- a/src/jalview/ws/jws2/JabaWsServerQuery.java
+++ b/src/jalview/ws/jws2/JabaWsServerQuery.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -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();
@@ -180,7 +179,8 @@ public class JabaWsServerQuery implements Runnable
               jws2Discoverer.addInvalidServiceUrl(jwsserver);
             }
             ;
-            if (service != null)
+            if (service != null
+                    && !Jws2InstanceFactory.ignoreService(srv.toString()))
             {
               noservices = false;
               Jws2Instance svc = null;
@@ -212,16 +212,16 @@ public class JabaWsServerQuery implements Runnable
       else
       {
         jws2Discoverer.addInvalidServiceUrl(jwsserver);
-        Cache.log.info("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;
@@ -236,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;