JAL-2316 Restructure identifiers.org download

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

diff --git a/src/jalview/urls/UrlProviderI.java b/src/jalview/urls/UrlProviderI.java
index 3841a50..595f98d 100644 (file)
--- a/src/jalview/urls/UrlProviderI.java
+++ b/src/jalview/urls/UrlProviderI.java
@@ -20,7 +20,6 @@
  */
 package jalview.urls;
 
-import java.io.File;
 import java.util.List;
 import java.util.Vector;
 
@@ -33,28 +32,11 @@ import java.util.Vector;
 public interface UrlProviderI
 {
 
-  /*
-   * Default sequence URL link label for EMBL-EBI search
-   */
-  public static final String DEFAULT_LABEL = "EMBL-EBI Search";
-
-  /*
-   * Default sequence URL link string for EMBL-EBI search
-   */
-  public static final String DEFAULT_STRING = DEFAULT_LABEL
-          + "|http://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$SEQUENCE_ID$";
-
-  /*
-   * Location of file for identifiers.org download
-   */
-  public static final String ID_ORG_FILE = System.getProperty("user.home")
-          + File.separatorChar + ".jalview_identifiers";
-
   /**
    * Get names and urls in as strings for display
    * 
    */
-  Vector<String> getLinksForDisplay();
+  Vector<String> getLinksForMenu();
 
   /**
    * Get names and urls as strings for display
@@ -68,13 +50,6 @@ public interface UrlProviderI
   void setUrlData(List<UrlLinkDisplay> links);
 
   /**
-   * Get the id of the default URL
-   * 
-   * @return id of the default URL
-   */
-  String getDefaultUrl();
-
-  /**
    * Get the link for the default URL
    * 
    * @seqid sequence id for which to build link
@@ -83,6 +58,13 @@ public interface UrlProviderI
   String getDefaultUrl(String seqid);
 
   /**
+   * Get the default URL id
+   * 
+   * @return id for default URL
+   */
+  String getDefaultUrlId();
+
+  /**
    * Get the target of thelink for the default URL
    * 
    * @seqid sequence id for which to build link
@@ -104,16 +86,7 @@ public interface UrlProviderI
    * 
    * @return string representation of available URLs
    */
-  String writeUrlsAsString();
-
-  /**
-   * Set URL links from pair of collections
-   * 
-   * @param names
-   * @param urls
-   */
-  void setUrlLinks(Vector<String> names, Vector<String> urls)
-          throws IllegalArgumentException;
+  String writeUrlsAsString(boolean selected);
 
   /**
    * Choose the default URL in the event of the selected default being