JAL-2316 Adjusted unit tests. Tidied UrlLinkProviderI interface.

[jalview.git] / src / jalview / appletgui / IdPanel.java

diff --git a/src/jalview/appletgui/IdPanel.java b/src/jalview/appletgui/IdPanel.java
index d2947e4..feca846 100755 (executable)
--- a/src/jalview/appletgui/IdPanel.java
+++ b/src/jalview/appletgui/IdPanel.java
@@ -209,7 +209,7 @@ public class IdPanel extends Panel implements MouseListener,
       return;
     }
 
-    // DEFAULT LINK IS FIRST IN THE LINK LIST
+    // get the sequence details
     int seq = alignPanel.seqPanel.findSeq(e);
     SequenceI sq = av.getAlignment().getSequenceAt(seq);
     if (sq == null)
@@ -217,53 +217,10 @@ public class IdPanel extends Panel implements MouseListener,
       return;
     }
     String id = sq.getName();
+
+    // get the default url with the sequence details filled in
     String url = urlProvider.getDefaultUrl(id);
     String target = urlProvider.getDefaultTarget(id);
-
-    /*    String target = null;
-        String url = null;
-        int i = 0;
-        while (url == null && i < links.size())
-        {
-          // DEFAULT LINK IS FIRST IN THE LINK LIST
-          // BUT IF ITS A REGEX AND DOES NOT MATCH THE NEXT ONE WILL BE TRIED
-          url = links.elementAt(i++).toString();
-          jalview.util.UrlLink urlLink = null;
-          try
-          {
-            urlLink = new UrlLink(url);
-            target = urlLink.getTarget();
-          } catch (Exception foo)
-          {
-            System.err.println("Exception for URLLink '" + url + "'");
-            foo.printStackTrace();
-            url = null;
-            continue;
-          }
-
-          if (urlLink.usesDBAccession())
-          {
-            // this URL requires an accession id, not the name of a sequence
-            url = null;
-            continue;
-          }
-
-          if (!urlLink.isValid())
-          {
-            System.err.println(urlLink.getInvalidMessage());
-            url = null;
-            continue;
-          }
-
-          String urls[] = urlLink.makeUrls(id, true);
-          if (urls == null || urls[0] == null || urls[0].length() < 1)
-          {
-            url = null;
-            continue;
-          }
-          // just take first URL made from regex
-          url = urls[1];
-        }*/
     try
     {
       alignPanel.alignFrame.showURL(url, target);
@@ -324,7 +281,7 @@ public class IdPanel extends Panel implements MouseListener,
 
       // build a new links menu based on the current links + any non-positional
       // features
-      Vector<String> nlinks = urlProvider.getLinksForDisplay();
+      Vector<String> nlinks = urlProvider.getLinksForMenu();
 
       SequenceFeature sf[] = sq == null ? null : sq.getSequenceFeatures();
       for (int sl = 0; sf != null && sl < sf.length; sl++)