after merge

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

diff --git a/src/jalview/appletgui/IdPanel.java b/src/jalview/appletgui/IdPanel.java
index f3db9be..d159a4c 100755 (executable)
--- a/src/jalview/appletgui/IdPanel.java
+++ b/src/jalview/appletgui/IdPanel.java
@@ -50,14 +50,17 @@ public class IdPanel
     idCanvas.addMouseMotionListener(this);\r
 \r
     String label, url;\r
-    for(int i=1; i<10; i++)\r
+    if(parent.alignFrame.applet!=null)\r
     {\r
-      label = parent.alignFrame.applet.getParameter("linkLabel_"+i);\r
-      url = parent.alignFrame.applet.getParameter("linkURL_"+i);\r
+      for (int i = 1; i < 10; i++)\r
+      {\r
+        label = parent.alignFrame.applet.getParameter("linkLabel_" + i);\r
+        url = parent.alignFrame.applet.getParameter("linkURL_" + i);\r
 \r
-      if(label!=null && url!=null)\r
-        links.addElement(label+"|"+url);\r
+        if (label != null && url != null)\r
+          links.addElement(label + "|" + url);\r
 \r
+      }\r
     }\r
     if (links.size() < 1)\r
     {\r
@@ -113,6 +116,8 @@ public class IdPanel
     //DEFAULT LINK IS FIRST IN THE LINK LIST\r
     int seq = av.getIndex(y);\r
     String id = av.getAlignment().getSequenceAt(seq).getName();\r
+    if (id.indexOf("|") > -1)\r
+        id = id.substring(id.lastIndexOf("|") + 1);\r
 \r
     String target = links.elementAt(0).toString();\r
     target = target.substring(0, target.indexOf("|"));\r
@@ -124,7 +129,8 @@ public class IdPanel
 \r
     try\r
     {\r
-      jalview.bin.JalviewLite.showURL(url, target);\r
+\r
+      alignPanel.alignFrame.showURL(url, target);\r
     }\r
     catch (Exception ex)\r
     {\r