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

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

diff --git a/src/jalview/urls/UrlProviderImpl.java b/src/jalview/urls/UrlProviderImpl.java
index b846976..2356f1d 100644 (file)
--- a/src/jalview/urls/UrlProviderImpl.java
+++ b/src/jalview/urls/UrlProviderImpl.java
@@ -26,7 +26,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map.Entry;
-import java.util.Vector;
 import java.util.regex.Pattern;
 
 /**
@@ -36,36 +35,15 @@ import java.util.regex.Pattern;
  * @version $Revision$
  */
 
-public class UrlProviderImpl implements UrlProviderI
+public abstract class UrlProviderImpl implements UrlProviderI
 {
-  private static final Pattern MIRIAM_PATTERN = Pattern
-          .compile("^MIR:\\d{8}$");
-
   // minimum length of substitution in url link string
   protected static final int MIN_SUBST_LENGTH = 4;
 
-  protected String defaultUrl;
-
-  @Override
-  public Vector<String> getLinksForMenu()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  @Override
-  public String getDefaultUrl(String seqid)
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
+  private static final Pattern MIRIAM_PATTERN = Pattern
+          .compile("^MIR:\\d{8}$");
 
-  @Override
-  public String getDefaultTarget(String seqid)
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
+  protected String defaultUrl;
 
   protected String getDefaultUrl(String seqid, HashMap<String, UrlLink> urls)
   {
@@ -77,6 +55,10 @@ public class UrlProviderImpl implements UrlProviderI
     {
       return null;
     }
+    else if (!urls.containsKey(defaultUrl))
+    {
+      return null;
+    }
     else
     {
       String url = null;
@@ -97,27 +79,6 @@ public class UrlProviderImpl implements UrlProviderI
   }
 
   @Override
-  public boolean setDefaultUrl(String id)
-  {
-    // TODO Auto-generated method stub
-    return false;
-  }
-
-  @Override
-  public String writeUrlsAsString(boolean selected)
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  @Override
-  public String chooseDefaultUrl()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  @Override
   public List<UrlLinkDisplay> getLinksForTable()
   {
     return null;
@@ -148,12 +109,6 @@ public class UrlProviderImpl implements UrlProviderI
     return displayLinks;
   }
 
-  @Override
-  public void setUrlData(List<UrlLinkDisplay> links)
-  {
-    // deliberately left empty
-  }
-
   protected boolean isMiriamId(String id)
   {
     return MIRIAM_PATTERN.matcher(id).matches();
@@ -164,12 +119,5 @@ public class UrlProviderImpl implements UrlProviderI
   {
     return !isMiriamId(id);
   }
-
-  @Override
-  public String getDefaultUrlId()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
 }
+