Applet handles multiple sequence links

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

diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java
index cf854b0..858770a 100755 (executable)
--- a/src/jalview/appletgui/APopupMenu.java
+++ b/src/jalview/appletgui/APopupMenu.java
@@ -21,6 +21,7 @@ package jalview.appletgui;
 \r
 import java.awt.*;\r
 import java.awt.event.*;\r
+import java.util.Vector;\r
 \r
 import jalview.analysis.*;\r
 import jalview.datamodel.*;\r
@@ -46,9 +47,6 @@ public class APopupMenu
   protected CheckboxMenuItem conservationMenuItem = new CheckboxMenuItem();\r
 \r
   AlignmentPanel ap;\r
-  Menu sequenceMenu = new Menu();\r
-  MenuItem sequenceName = new MenuItem();\r
-  Sequence sequence;\r
   MenuItem unGroupMenuItem = new MenuItem();\r
   MenuItem nucleotideMenuItem = new MenuItem();\r
   Menu colourMenu = new Menu();\r
@@ -56,7 +54,7 @@ public class APopupMenu
   CheckboxMenuItem showText = new CheckboxMenuItem();\r
   CheckboxMenuItem showColourText = new CheckboxMenuItem();\r
 \r
-  public APopupMenu(AlignmentPanel ap, Sequence seq)\r
+  public APopupMenu(AlignmentPanel ap, Sequence seq, Vector links)\r
   {\r
     ///////////////////////////////////////////////////////////\r
     // If this is activated from the sequence panel, the user may want to\r
@@ -66,7 +64,6 @@ public class APopupMenu
     //////////////////////////////////////////////////////////\r
 \r
     this.ap = ap;\r
-    sequence = seq;\r
 \r
     try\r
     {\r
@@ -90,11 +87,31 @@ public class APopupMenu
       groupMenu.remove(unGroupMenuItem);\r
     }\r
 \r
-    if (seq == null)\r
+    if (seq != null && links!=null)\r
     {\r
-      remove(sequenceMenu);\r
+      Menu linkMenu = new Menu("Link");\r
+      MenuItem item;\r
+      String link;\r
+      for(int i=0; i<links.size(); i++)\r
+      {\r
+        link = links.elementAt(i).toString();\r
+        final String target = link.substring(0, link.indexOf("|"));\r
+        item = new MenuItem(target);\r
+        final String url = link.substring(link.indexOf("|")+1, link.indexOf("$SEQUENCE_ID$"))\r
+               + seq.getName() +\r
+               link.substring(link.indexOf("$SEQUENCE_ID$") + 13);\r
+\r
+           item.addActionListener(new java.awt.event.ActionListener()\r
+           {\r
+               public void actionPerformed(ActionEvent e)\r
+               {\r
+                  jalview.bin.JalviewLite.showURL(url, target);\r
+               }\r
+           });\r
+          linkMenu.add(item);\r
+      }\r
+      add(linkMenu);\r
     }\r
-\r
   }\r
 \r
   private void jbInit()\r
@@ -103,8 +120,6 @@ public class APopupMenu
     groupMenu.setLabel("Group");\r
     groupMenu.setLabel("Define");\r
 \r
-    sequenceMenu.setLabel("Sequence");\r
-    sequenceName.setLabel("Edit name");\r
     unGroupMenuItem.setLabel("Remove Group");\r
     unGroupMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
@@ -165,14 +180,12 @@ public class APopupMenu
     });\r
 \r
     add(groupMenu);\r
-    this.add(sequenceMenu);\r
     groupMenu.add(unGroupMenuItem);\r
     groupMenu.add(colourMenu);\r
     groupMenu.addSeparator();\r
     groupMenu.add(showBoxes);\r
     groupMenu.add(showText);\r
     groupMenu.add(showColourText);\r
-    sequenceMenu.add(sequenceName);\r
     colourMenu.add(noColourmenuItem);\r
     colourMenu.add(clustalColour);\r
     colourMenu.add(BLOSUM62Colour);\r