From: jprocter <Jim Procter>
Date: Thu, 4 Nov 2010 14:52:35 +0000 (+0000)
Subject: prevented URLs appearing in both the 'bad ' and the 'no services from' URL list.
X-Git-Tag: Release_2_6_1~12
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=405648535e06b318a9c66726c329946979aa3c84;p=jalview.git

prevented URLs appearing in both the 'bad ' and the 'no services from' URL list.
---

diff --git a/src/jalview/ws/jws2/Jws2Discoverer.java b/src/jalview/ws/jws2/Jws2Discoverer.java
index f4c8896..198f01d 100644
--- a/src/jalview/ws/jws2/Jws2Discoverer.java
+++ b/src/jalview/ws/jws2/Jws2Discoverer.java
@@ -700,7 +700,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
   }
 
   /**
-   * add an 'empty' JABA server to the list
+   * add an 'empty' JABA server to the list. Only servers not already in the 'bad URL' list will be added to this list.
    * 
    * @param jwsservers
    */
@@ -710,7 +710,10 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
     {
       urlsWithoutServices = new Vector<String>();
     }
-    if (!urlsWithoutServices.contains(jwsservers))
+
+    if ((invalidServiceUrls == null || !invalidServiceUrls
+            .contains(jwsservers))
+            && !urlsWithoutServices.contains(jwsservers))
     {
       urlsWithoutServices.add(jwsservers);
     }
@@ -747,7 +750,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
       if (getInvalidServiceUrls() != null
               && getInvalidServiceUrls().size() > 0)
       {
-        ermsg.append("Invalid Service URLS: \n");
+        ermsg.append("URLs that could not be contacted: \n");
         for (String svcurl : getInvalidServiceUrls())
         {
           if (list)