JAL-2069 update spike branch with latest

[jalview.git] / src / jalview / util / UrlConstants.java

diff --git a/src/jalview/util/UrlConstants.java b/src/jalview/util/UrlConstants.java
index b70edf5..e5cfaee 100644 (file)
--- a/src/jalview/util/UrlConstants.java
+++ b/src/jalview/util/UrlConstants.java
@@ -29,22 +29,35 @@ public class UrlConstants
   /*
    * Sequence ID string
    */
-  public static final String SEQUENCE_ID = "DB_ACCESSION";
+  public static final String DB_ACCESSION = "DB_ACCESSION";
 
   /*
    * Sequence Name string
    */
-  public static final String SEQUENCE_NAME = "SEQUENCE_ID";
+  public static final String SEQUENCE_ID = "SEQUENCE_ID";
 
   /*
-   * Default sequence URL link string for EMBL-EBI search
+   * Separator character used in Url links
+   */
+  public static final String SEP = "|";
+
+  /*
+   * Delimiter character used in Url links
+   */
+  public static final String DELIM = "$";
+
+  /*
+   * Default sequence URL link label for EMBL-EBI search
    */
-  public static final String EMBLEBI_STRING = "EMBL-EBI Search|http://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$SEQUENCE_ID$";
+  public static final String DEFAULT_LABEL = "EMBL-EBI Search";
 
   /*
-   * Default sequence URL link string for SRS 
+   * Default sequence URL link string for EMBL-EBI search
    */
-  public static final String SRS_STRING = "SRS|http://srs.ebi.ac.uk/srsbin/cgi-bin/wgetz?-newId+(([uniprot-all:$SEQUENCE_ID$]))+-view+SwissEntry";
+  public static final String DEFAULT_STRING = DEFAULT_LABEL
+          + "|https://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$SEQUENCE_ID$";
+
+  private static final String COLON = ":";
 
   /*
    * not instantiable
@@ -52,4 +65,12 @@ public class UrlConstants
   private UrlConstants()
   {
   }
+
+  public static boolean isDefaultString(String link)
+  {
+    String sublink = link.substring(link.indexOf(COLON) + 1);
+    String subdefault = DEFAULT_STRING
+            .substring(DEFAULT_STRING.indexOf(COLON) + 1);
+    return sublink.equalsIgnoreCase(subdefault);
+  }
 }