JAL-2282 Refactor SequenceAnnotationReport to use refactored UrlLink

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

diff --git a/src/jalview/util/UrlLink.java b/src/jalview/util/UrlLink.java
index 0968d36..e14ff63 100644 (file)
--- a/src/jalview/util/UrlLink.java
+++ b/src/jalview/util/UrlLink.java
@@ -26,6 +26,8 @@ import static jalview.util.UrlConstants.SEQUENCE_NAME;
 import jalview.datamodel.DBRefEntry;
 import jalview.datamodel.SequenceI;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 import java.util.Vector;
 
@@ -388,7 +390,7 @@ public class UrlLink
    * @param linkset
    */
   public void createLinksFromSeq(final SequenceI seq,
-          Map<String, String[]> linkset)
+          Map<String, List<String>> linkset)
   {
     if (seq != null && dynamic)
     {
@@ -405,13 +407,13 @@ public class UrlLink
    * 
    * @param linkset
    */
-  public void createStaticLink(Map<String, String[]> linkset)
+  public void createStaticLink(Map<String, List<String>> linkset)
   {
     if (!linkset.containsKey(label + "|" + getUrl_prefix()))
     {
       // Add a non-dynamic link
-      linkset.put(label + "|" + getUrl_prefix(), new String[] { "", label,
-          "", getUrl_prefix() });
+      linkset.put(label + "|" + getUrl_prefix(),
+              Arrays.asList(target, label, null, getUrl_prefix()));
     }
   }
 
@@ -422,7 +424,7 @@ public class UrlLink
    * @param linkset
    */
   public void createDynamicLinks(final SequenceI seq,
-          Map<String, String[]> linkset)
+          Map<String, List<String>> linkset)
   {
     // collect id string too
     String id = seq.getName();
@@ -467,7 +469,7 @@ public class UrlLink
    * Create a bare URL Link
    */
   protected void createBareURLLink(String id,
-          Map<String, String[]> linkset, Boolean combineLabel)
+          Map<String, List<String>> linkset, Boolean combineLabel)
   {
     String[] urls = makeUrls(id, true);
     if (urls != null)
@@ -482,8 +484,8 @@ public class UrlLink
             thisLabel = label + "|" + urls[u];
           }
 
-          linkset.put(urls[u] + "|" + urls[u + 1], new String[] { target,
-              thisLabel, urls[u], urls[u + 1] });
+          linkset.put(urls[u] + "|" + urls[u + 1],
+                  Arrays.asList(target, thisLabel, urls[u], urls[u + 1]));
         }
       }
     }