JAL-2316 Unit test updates and associated minor changes and fixes.

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

diff --git a/src/jalview/util/UrlLink.java b/src/jalview/util/UrlLink.java
index c889287..186b682 100644 (file)
--- a/src/jalview/util/UrlLink.java
+++ b/src/jalview/util/UrlLink.java
@@ -104,6 +104,17 @@ public class UrlLink
   }
 
   /**
+   * Alternative constructor for separate name and link
+   * 
+   * @param name
+   * @param url
+   */
+  public UrlLink(String name, String url)
+  {
+    this(name + SEP + url);
+  }
+
+  /**
    * @return the url_suffix
    */
   public String getUrl_suffix()
@@ -135,6 +146,16 @@ public class UrlLink
     return label;
   }
 
+  public String getUrlWithToken()
+  {
+    String var = (usesDBaccession ? DB_ACCESSION : SEQUENCE_ID);
+
+    return urlPrefix
+            + (dynamic ? (DELIM + var + ((regexReplace != null) ? "="
+                    + regexReplace + "=" + DELIM : DELIM)) : "")
+            + ((urlSuffix == null) ? "" : urlSuffix);
+  }
+
   /**
    * @return the regexReplace
    */
@@ -304,14 +325,7 @@ public class UrlLink
   @Override
   public String toString()
   {
-    String var = (usesDBaccession ? DB_ACCESSION : SEQUENCE_ID);
-
-    return label
-            + SEP
-            + urlPrefix
-            + (dynamic ? (DELIM + var + ((regexReplace != null) ? "="
-                    + regexReplace + "=" + DELIM : DELIM)) : "")
-            + ((urlSuffix == null) ? "" : urlSuffix);
+    return label + SEP + getUrlWithToken();
   }
 
   /**