Factored URL Link constants out into UrlConstants file.

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

diff --git a/src/jalview/util/UrlLink.java b/src/jalview/util/UrlLink.java
index 6d80338..e196c8c 100644 (file)
--- a/src/jalview/util/UrlLink.java
+++ b/src/jalview/util/UrlLink.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,6 +20,8 @@
  */
 package jalview.util;
 
+import static jalview.util.UrlConstants.SEQUENCE_ID;
+
 import java.util.Vector;
 
 public class UrlLink
@@ -48,7 +50,7 @@ public class UrlLink
    */
   public UrlLink(String link)
   {
-    int sep = link.indexOf("|"), psqid = link.indexOf("$SEQUENCE_ID");
+    int sep = link.indexOf("|"), psqid = link.indexOf("$" + SEQUENCE_ID);
     if (psqid > -1)
     {
       dynamic = true;
@@ -77,7 +79,7 @@ public class UrlLink
       }
       // Parse URL : Whole URL string first
       url_prefix = link.substring(sep + 1, psqid);
-      if (link.indexOf("$SEQUENCE_ID=/") == psqid
+      if (link.indexOf("$" + SEQUENCE_ID + "=/") == psqid
               && (p = link.indexOf("/=$", psqid + 14)) > psqid + 14)
       {
         // Extract Regex and suffix
@@ -102,7 +104,7 @@ public class UrlLink
       {
         regexReplace = null;
         // verify format is really correct.
-        if (link.indexOf("$SEQUENCE_ID$") == psqid)
+        if (link.indexOf("$" + SEQUENCE_ID + "$") == psqid)
         {
           url_suffix = link.substring(psqid + 13);
           regexReplace = null;
@@ -208,8 +210,7 @@ public class UrlLink
           if (ns == 0)
           {
             // take whole regex
-            return new String[]
-            { rg.stringMatched(),
+            return new String[] { rg.stringMatched(),
                 url_prefix + rg.stringMatched() + url_suffix };
           } /*
              * else if (ns==1) { // take only subgroup match return new String[]
@@ -288,22 +289,21 @@ public class UrlLink
       }
 
       // just return simple url substitution.
-      return new String[]
-      { idstring, url_prefix + idstring + url_suffix };
+      return new String[] { idstring, url_prefix + idstring + url_suffix };
     }
     else
     {
-      return new String[]
-      { "", url_prefix };
+      return new String[] { "", url_prefix };
     }
   }
 
+  @Override
   public String toString()
   {
     return label
             + "|"
             + url_prefix
-            + (dynamic ? ("$SEQUENCE_ID" + ((regexReplace != null) ? "="
+            + (dynamic ? ("$" + SEQUENCE_ID + ((regexReplace != null) ? "="
                     + regexReplace + "=$" : "$")) : "")
             + ((url_suffix == null) ? "" : url_suffix);
 
@@ -329,8 +329,7 @@ public class UrlLink
 
   public static void main(String argv[])
   {
-    String[] links = new String[]
-    {
+    String[] links = new String[] {
     /*
      * "AlinkT|Target|http://foo.foo.soo/",
      * "myUrl1|http://$SEQUENCE_ID=/[0-9]+/=$.someserver.org/foo",
@@ -345,9 +344,9 @@ public class UrlLink
      * "PF3|http://us.expasy.org/cgi-bin/niceprot.pl?$SEQUENCE_ID=/PFAM:(.+)/=$"
      * , "NOTFER|http://notfer.org/$SEQUENCE_ID=/(?<!\\s)(.+)/=$",
      */
-    "NESTED|http://nested/$SEQUENCE_ID=/^(?:Label:)?(?:(?:gi\\|(\\d+))|([^:]+))/=$/nested" };
-    String[] idstrings = new String[]
-    {
+    "NESTED|http://nested/$" + SEQUENCE_ID
+            + "=/^(?:Label:)?(?:(?:gi\\|(\\d+))|([^:]+))/=$/nested" };
+    String[] idstrings = new String[] {
     /*
      * //"LGUL_human", //"QWIQW_123123", "uniprot|why_do+_12313_foo",
      * //"123123312", "123123 ABCDE foo", "PFAM:PF23943",