JAL-2316 Unit testing, relax constraint that default url is in menu

[jalview.git] / src / jalview / urls / IdentifiersUrlProvider.java

diff --git a/src/jalview/urls/IdentifiersUrlProvider.java b/src/jalview/urls/IdentifiersUrlProvider.java
index 45d3863..98a5ee4 100644 (file)
--- a/src/jalview/urls/IdentifiersUrlProvider.java
+++ b/src/jalview/urls/IdentifiersUrlProvider.java
@@ -134,15 +134,16 @@ public class IdentifiersUrlProvider extends UrlProviderImpl
   @Override
   public boolean setDefaultUrl(String id)
   {
-    if (selectedUrls.contains(id))
+    if (id == null)
     {
-      defaultUrl = id;
+      defaultUrl = null;
     }
-    else
+    if (urls.containsKey(id))
     {
-      defaultUrl = null;
+      defaultUrl = id;
     }
-    return selectedUrls.contains(id);
+
+    return urls.containsKey(id);
   }
 
   @Override
@@ -198,10 +199,9 @@ public class IdentifiersUrlProvider extends UrlProviderImpl
       if (isMiriamId(link.getId()))
       {
         // select/deselect links accordingly and set default url
-
-        if (link.getIsSelected())
+        if (urls.containsKey(link.getId()))
         {
-          if (urls.containsKey(link.getId()))
+          if (link.getIsSelected())
           {
             selectedUrls.add(link.getId());
           }
@@ -209,10 +209,8 @@ public class IdentifiersUrlProvider extends UrlProviderImpl
           {
             setDefaultUrl(link.getId());
           }
-
         }
       }
-
     }
   }
 
@@ -231,15 +229,12 @@ public class IdentifiersUrlProvider extends UrlProviderImpl
   @Override
   public String getDefaultTarget(String seqid)
   {
-    // TODO Auto-generated method stub
     return null;
   }
 
   @Override
   public String chooseDefaultUrl()
   {
-    // TODO Auto-generated method stub
     return null;
   }
-
 }