report any problematic web service URLs ( JAL-343 )

[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 5ca5065..2799e98 100644 (file)
--- a/src/jalview/ws/jws2/JabaWsServerQuery.java
+++ b/src/jalview/ws/jws2/JabaWsServerQuery.java
@@ -53,6 +53,7 @@ public class JabaWsServerQuery implements Runnable
     {
       if (Jws2Client.validURL(jwsservers))
       {
+        boolean noservices=true;
         // look for services
         for (Services srv : Services.values())
         {
@@ -74,26 +75,35 @@ public class JabaWsServerQuery implements Runnable
             {
               e.printStackTrace();
             }
+            // For moment, report service as a problem.
+            jws2Discoverer.addInvalidServiceUrl(jwsservers);
           }
           ;
           if (service != null)
           {
+            noservices=false;
             jws2Discoverer.addService(jwsservers, srv, service);
           }
         }
-
+        if (noservices)
+        {
+          jws2Discoverer.addUrlwithnoservices(jwsservers);
+        }
       }
       else
       {
+        jws2Discoverer.addInvalidServiceUrl(jwsservers);
         Cache.log.info("Ignoring invalid Jws2 service url " + jwsservers);
       }
     } catch (Exception e)
     {
       e.printStackTrace();
       Cache.log.warn("Exception when discovering Jws2 services.", e);
+      jws2Discoverer.addInvalidServiceUrl(jwsservers);
     } catch (Error e)
     {
       Cache.log.error("Exception when discovering Jws2 services.", e);
+      jws2Discoverer.addInvalidServiceUrl(jwsservers);
     }
     running=false;
   }