X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPopupMenu.java;h=f9e0d19d262ed88f4e7bfdfba5c8f19c079c5aa4;hb=32ccffc95209f230faacf6f27394669c0dc8b271;hp=ed1e759d9619c6a562e4cad0cd10efbe486cb572;hpb=32ce9ddb7ce1a68add53dd81785ae428ca136a83;p=jalview.git

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