JAL-2316 Adjusted unit tests. Tidied UrlLinkProviderI interface.

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

diff --git a/src/jalview/urls/IdentifiersUrlProvider.java b/src/jalview/urls/IdentifiersUrlProvider.java
index a74ad07..3501169 100644 (file)
--- a/src/jalview/urls/IdentifiersUrlProvider.java
+++ b/src/jalview/urls/IdentifiersUrlProvider.java
@@ -62,6 +62,12 @@ public class IdentifiersUrlProvider extends UrlProviderImpl
   // list of selected urls
   private ArrayList<String> selectedUrls;
 
+  /*
+   * Location of file for identifiers.org download
+   */
+  public static final String ID_ORG_FILE = System.getProperty("user.home")
+          + File.separatorChar + ".jalview_identifiers";
+
   public IdentifiersUrlProvider(String cachedUrlList, String idFileName)
   {
     try
@@ -165,12 +171,6 @@ public class IdentifiersUrlProvider extends UrlProviderImpl
   }
 
   @Override
-  public String getDefaultUrl()
-  {
-    return defaultUrl;
-  }
-
-  @Override
   public boolean setDefaultUrl(String id)
   {
     if (selectedUrls.contains(id))
@@ -203,7 +203,7 @@ public class IdentifiersUrlProvider extends UrlProviderImpl
   }
 
   @Override
-  public Vector<String> getLinksForDisplay()
+  public Vector<String> getLinksForMenu()
   {
     Vector<String> links = new Vector<String>();
     for (String key : selectedUrls)
@@ -267,7 +267,18 @@ public class IdentifiersUrlProvider extends UrlProviderImpl
   @Override
   public String getDefaultUrl(String seqid)
   {
-    return urls.get(defaultUrl).get("url") + "/" + seqid;
+    if (seqid.length() < MIN_SUBST_LENGTH)
+    {
+      return null;
+    }
+    else if (defaultUrl == null)
+    {
+      return null;
+    }
+    else
+    {
+      return urls.get(defaultUrl).get("url") + "/" + seqid;
+    }
   }
 
   @Override
@@ -278,13 +289,6 @@ public class IdentifiersUrlProvider extends UrlProviderImpl
   }
 
   @Override
-  public void setUrlLinks(Vector<String> names, Vector<String> urls)
-  {
-    // ignores urls, only uses names (as ids)
-    checkSelectionMatchesUrls(names);
-  }
-
-  @Override
   public String chooseDefaultUrl()
   {
     // TODO Auto-generated method stub