Parse id before url completion

[jalview.git] / src / jalview / gui / PopupMenu.java

diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index ed1e759..f9e0d19 100755 (executable)
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -111,17 +111,14 @@ public class PopupMenu extends JPopupMenu
         }\r
 \r
 \r
-        if ((seq != null))\r
-          //  && seq.getDatasetSequence().getPDBId() != null)\r
+        if ((seq != null)\r
+            && seq.getDatasetSequence().getPDBId() != null)\r
         {\r
-          //java.util.Enumeration e = seq.getDatasetSequence().getPDBId().elements();\r
-        //  while(e.hasMoreElements())\r
+          java.util.Enumeration e = seq.getDatasetSequence().getPDBId().elements();\r
+          while(e.hasMoreElements())\r
           {\r
-            final PDBEntry pdb = new PDBEntry();\r
-            pdb.setId("pdb");\r
+            final PDBEntry pdb = (PDBEntry)e.nextElement();\r
 \r
-\r
-              //  (PDBEntry)e.nextElement();\r
             JMenuItem pdbMenuItem = new JMenuItem();\r
             pdbMenuItem.setText("View PDB entry: "+pdb.getId());\r
             pdbMenuItem.addActionListener(new java.awt.event.ActionListener()\r
@@ -225,9 +222,12 @@ public class PopupMenu extends JPopupMenu
             String link = links.elementAt(i).toString();\r
 \r
             item = new JMenuItem(link.substring(0, link.indexOf("|")));\r
+            String id = sequence.getName();\r
+            if(id.indexOf("|")>-1)\r
+              id = id.substring(id.lastIndexOf("|")+1);\r
 \r
             final String url = link.substring(link.indexOf("|")+1, link.indexOf("$SEQUENCE_ID$"))\r
-                + sequence.getName() +\r
+                + id +\r
                 link.substring(link.indexOf("$SEQUENCE_ID$") + 13);\r
 \r
 \r