X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FJabaWsServerQuery.java;h=b956246443609293599f7f9884c50db7b2e2664a;hb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;hp=5ca506538c3f15723265022b942cc79e6b7ad282;hpb=43e280af80c060ad0bca76e5025ebabc38a52a21;p=jalview.git

diff --git a/src/jalview/ws/jws2/JabaWsServerQuery.java b/src/jalview/ws/jws2/JabaWsServerQuery.java
index 5ca5065..b956246 100644
--- a/src/jalview/ws/jws2/JabaWsServerQuery.java
+++ b/src/jalview/ws/jws2/JabaWsServerQuery.java
@@ -1,3 +1,20 @@
+/*******************************************************************************
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ *******************************************************************************/
 /**
  * 
  */
@@ -53,6 +70,7 @@ public class JabaWsServerQuery implements Runnable
     {
       if (Jws2Client.validURL(jwsservers))
       {
+        boolean noservices=true;
         // look for services
         for (Services srv : Services.values())
         {
@@ -74,26 +92,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;
   }