X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPopupMenu.java;h=3481a3103dd6cecc052a2a7198940f8e55ffe637;hb=174230b4233d9ce80f94527768d2cd2f76da11ab;hp=137ca1462889764105d36885e9b7eef5659900dc;hpb=95a46891288f4fc63d690cab4f56879678f54fb6;p=jalview.git

diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index 137ca14..3481a31 100755
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,7 +24,6 @@ import jalview.analysis.*;
 
 import jalview.datamodel.*;
 
-import jalview.io.*;
 
 import jalview.schemes.*;
 
@@ -33,6 +32,9 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
+import java.util.Vector;
+import jalview.io.FormatAdapter;
+
 
 /**
  * DOCUMENT ME!
@@ -63,21 +65,31 @@ public class PopupMenu extends JPopupMenu
     JMenuItem sequenceName = new JMenuItem();
     Sequence sequence;
     JMenuItem unGroupMenuItem = new JMenuItem();
-    JMenuItem pdbMenuItem = new JMenuItem();
     JMenuItem outline = new JMenuItem();
     JRadioButtonMenuItem nucleotideMenuItem = new JRadioButtonMenuItem();
     JMenu colourMenu = new JMenu();
     JCheckBoxMenuItem showBoxes = new JCheckBoxMenuItem();
     JCheckBoxMenuItem showText = new JCheckBoxMenuItem();
     JCheckBoxMenuItem showColourText = new JCheckBoxMenuItem();
-
-    /**
+  JMenu editMenu = new JMenu();
+  JMenuItem cut = new JMenuItem();
+  JMenuItem copy = new JMenuItem();
+  JMenuItem upperCase = new JMenuItem();
+  JMenuItem lowerCase = new JMenuItem();
+  JMenuItem toggle = new JMenuItem();
+  JMenu pdbMenu = new JMenu();
+  JMenuItem pdbFromFile = new JMenuItem();
+  JMenuItem enterPDB = new JMenuItem();
+  JMenuItem discoverPDB = new JMenuItem();
+  JMenu outputMenu = new JMenu();
+
+  /**
      * Creates a new PopupMenu object.
      *
      * @param ap DOCUMENT ME!
      * @param seq DOCUMENT ME!
      */
-    public PopupMenu(AlignmentPanel ap, Sequence seq)
+    public PopupMenu(final AlignmentPanel ap, Sequence seq, Vector links)
     {
         ///////////////////////////////////////////////////////////
         // If this is activated from the sequence panel, the user may want to
@@ -103,6 +115,22 @@ public class PopupMenu extends JPopupMenu
         colours.add(PIDColour);
         colours.add(BLOSUM62Colour);
 
+        for (int i = 0; i < jalview.io.FormatAdapter.WRITEABLE_FORMATS.length; i++)
+        {
+          JMenuItem item = new JMenuItem( jalview.io.FormatAdapter.WRITEABLE_FORMATS[i] );
+
+          item.addActionListener(new java.awt.event.ActionListener()
+          {
+            public void actionPerformed(ActionEvent e)
+            {
+              outputText_actionPerformed(e);
+            }
+          });
+
+          outputMenu.add(item);
+        }
+
+
         try
         {
             jbInit();
@@ -112,11 +140,98 @@ public class PopupMenu extends JPopupMenu
             e.printStackTrace();
         }
 
-        if ((seq == null) || (seq.getPDBId() == null))
+
+        if (seq != null)
         {
-            pdbMenuItem.setVisible(false);
+          int start = Math.max(sequence.getName().length()-15, 0);
+          sequenceMenu.setText(sequence.getName().substring(start));
+
+          JMenuItem menuItem;
+          if( seq.getDatasetSequence().getPDBId() != null)
+          {
+            java.util.Enumeration e = seq.getDatasetSequence().getPDBId().
+                elements();
+
+            while (e.hasMoreElements())
+            {
+              final PDBEntry pdb = (PDBEntry) e.nextElement();
+
+              menuItem = new JMenuItem();
+              menuItem.setText("View PDB entry: " + pdb.getId());
+              menuItem.addActionListener(new java.awt.event.ActionListener()
+              {
+                public void actionPerformed(ActionEvent e)
+                {
+                  new PDBViewer(pdb, sequence, ap.seqPanel.seqCanvas);
+                }
+              });
+              sequenceMenu.add(menuItem);
+            }
+          }
+
+          menuItem = new JMenuItem("Hide Sequences");
+          menuItem.addActionListener(new java.awt.event.ActionListener()
+              {
+                public void actionPerformed(ActionEvent e)
+                {
+                  hideSequences(false);
+                }
+              });
+          add(menuItem);
+
+          if(ap.av.getSelectionGroup() !=null
+             && ap.av.getSelectionGroup().getSize(false)>1)
+          {
+            menuItem = new JMenuItem("Represent Group with " + seq.getName());
+            menuItem.addActionListener(new java.awt.event.ActionListener()
+            {
+              public void actionPerformed(ActionEvent e)
+              {
+                hideSequences(true);
+              }
+            });
+            sequenceMenu.add(menuItem);
+          }
+
+          if (ap.av.hasHiddenRows)
+          {
+            final int index = ap.av.alignment.findIndex(seq);
+
+            if (ap.av.adjustForHiddenSeqs(index) -
+                ap.av.adjustForHiddenSeqs(index - 1) > 1)
+            {
+              menuItem = new JMenuItem("Reveal Sequences");
+              menuItem.addActionListener(new ActionListener()
+              {
+                public void actionPerformed(ActionEvent e)
+                {
+                  ap.av.showSequence(index);
+                  if (ap.overviewPanel != null)
+                    ap.overviewPanel.updateOverviewImage();
+                }
+              });
+              add(menuItem);
+            }
+
+            menuItem = new JMenuItem("Reveal All");
+            menuItem.addActionListener(new ActionListener()
+                {
+                  public void actionPerformed(ActionEvent e)
+                  {
+                    ap.av.showAllHiddenSeqs();
+                    if (ap.overviewPanel != null)
+                      ap.overviewPanel.updateOverviewImage();
+                    }
+                });
+
+            add(menuItem);
+          }
+
+
         }
 
+
+
         SequenceGroup sg = ap.av.getSelectionGroup();
 
         if (sg != null)
@@ -181,35 +296,48 @@ public class PopupMenu extends JPopupMenu
             showColourText.setSelected(sg.getColourText());
             showBoxes.setSelected(sg.getDisplayBoxes());
         }
+        else
+        {
+          groupMenu.setVisible(false);
+          editMenu.setVisible(false);
+        }
 
         if (!ap.av.alignment.getGroups().contains(sg))
         {
             unGroupMenuItem.setVisible(false);
         }
-        else
-        {
-            groupMenu.insertSeparator(3);
-        }
+
 
         if (seq == null)
         {
             sequenceMenu.setVisible(false);
+            pdbMenu.setVisible(false);
         }
-        else
-        {
-          java.util.Vector links = Preferences.sequenceURLLinks;
 
+        if(links != null && links.size()>0)
+        {
           JMenu linkMenu = new JMenu("Link");
           JMenuItem item;
           for(int i=0; i<links.size(); i++)
           {
             String link = links.elementAt(i).toString();
+            final String label = link.substring(0, link.indexOf("|"));
+            item = new JMenuItem(label);
+            final String url;
 
-            item = new JMenuItem(link.substring(0, link.indexOf("|")));
-
-            final String url = link.substring(link.indexOf("|")+1, link.indexOf("$SEQUENCE_ID$"))
-                + sequence.getName() +
-                link.substring(link.indexOf("$SEQUENCE_ID$") + 13);
+            if (link.indexOf("$SEQUENCE_ID$") > -1)
+            {
+              String id = seq.getName();
+              if (id.indexOf("|") > -1)
+                id = id.substring(id.lastIndexOf("|") + 1);
+
+              url = link.substring(link.indexOf("|") + 1,
+                                   link.indexOf("$SEQUENCE_ID$"))
+                  + id +
+                  link.substring(link.indexOf("$SEQUENCE_ID$") + 13);
+            }
+            else
+              url = link.substring(link.lastIndexOf("|")+1);
 
 
             item.addActionListener(new java.awt.event.ActionListener()
@@ -222,10 +350,14 @@ public class PopupMenu extends JPopupMenu
 
             linkMenu.add(item);
           }
-          add(linkMenu);
+          if(sequence!=null)
+            sequenceMenu.add(linkMenu);
+          else
+            add(linkMenu);
         }
     }
 
+
     /**
      * DOCUMENT ME!
      *
@@ -234,7 +366,7 @@ public class PopupMenu extends JPopupMenu
     private void jbInit() throws Exception
     {
         groupMenu.setText("Group");
-        groupMenu.setText("Define");
+        groupMenu.setText("Selection");
         groupName.setText("Name");
         groupName.addActionListener(new java.awt.event.ActionListener()
             {
@@ -244,7 +376,7 @@ public class PopupMenu extends JPopupMenu
                 }
             });
         sequenceMenu.setText("Sequence");
-        sequenceName.setText("Edit name");
+        sequenceName.setText("Edit Name/Description");
         sequenceName.addActionListener(new java.awt.event.ActionListener()
             {
                 public void actionPerformed(ActionEvent e)
@@ -261,14 +393,7 @@ public class PopupMenu extends JPopupMenu
                     unGroupMenuItem_actionPerformed(e);
                 }
             });
-        pdbMenuItem.setText("View PDB structure");
-        pdbMenuItem.addActionListener(new java.awt.event.ActionListener()
-            {
-                public void actionPerformed(ActionEvent e)
-                {
-                    pdbMenuItem_actionPerformed(e);
-                }
-            });
+
         outline.setText("Border colour");
         outline.addActionListener(new java.awt.event.ActionListener()
             {
@@ -312,21 +437,89 @@ public class PopupMenu extends JPopupMenu
                     showColourText_actionPerformed(e);
                 }
             });
-        add(groupMenu);
-        add(sequenceMenu);
-        groupMenu.add(groupName);
-        groupMenu.addSeparator();
-        groupMenu.add(unGroupMenuItem);
+    editMenu.setText("Edit");
+    cut.setText("Cut");
+    cut.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        cut_actionPerformed(e);
+      }
+    });
+    upperCase.setText("To Upper Case");
+    upperCase.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        upperCase_actionPerformed(e);
+      }
+    });
+    copy.setText("Copy");
+    copy.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        copy_actionPerformed(e);
+      }
+    });
+    lowerCase.setText("To Lower Case");
+    lowerCase.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        lowerCase_actionPerformed(e);
+      }
+    });
+    toggle.setText("Toggle Case");
+    toggle.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        toggle_actionPerformed(e);
+      }
+    });
+    pdbMenu.setText("Associate Structure with Sequence");
+    pdbFromFile.setText("From File");
+    pdbFromFile.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        pdbFromFile_actionPerformed(e);
+      }
+    });
+    enterPDB.setText("Enter PDB Id");
+    enterPDB.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        enterPDB_actionPerformed(e);
+      }
+    });
+    discoverPDB.setText("Discover PDB ids");
+    discoverPDB.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        discoverPDB_actionPerformed(e);
+      }
+    });
+    outputMenu.setText("Output to Textbox...");
+    add(groupMenu);
+
+    add(sequenceMenu);
+    groupMenu.add(editMenu);
+    groupMenu.add(outputMenu);
+    groupMenu.addSeparator();
+    groupMenu.add(groupName);
+    groupMenu.add(unGroupMenuItem);
         groupMenu.add(colourMenu);
-        groupMenu.addSeparator();
-        groupMenu.add(showBoxes);
+    groupMenu.add(showBoxes);
         groupMenu.add(showText);
         groupMenu.add(showColourText);
-        groupMenu.addSeparator();
-        groupMenu.add(outline);
+    groupMenu.add(outline);
         sequenceMenu.add(sequenceName);
-        sequenceMenu.add(pdbMenuItem);
-        colourMenu.add(noColourmenuItem);
+    sequenceMenu.add(pdbMenu);
+    colourMenu.add(noColourmenuItem);
         colourMenu.add(clustalColour);
         colourMenu.add(BLOSUM62Colour);
         colourMenu.add(PIDColour);
@@ -364,7 +557,15 @@ public class PopupMenu extends JPopupMenu
         colourMenu.addSeparator();
         colourMenu.add(abovePIDColour);
         colourMenu.add(conservationMenuItem);
-        noColourmenuItem.setText("None");
+    editMenu.add(copy);
+    editMenu.add(cut);
+    editMenu.add(upperCase);
+    editMenu.add(lowerCase);
+    editMenu.add(toggle);
+    pdbMenu.add(pdbFromFile);
+    pdbMenu.add(enterPDB);
+    pdbMenu.add(discoverPDB);
+    noColourmenuItem.setText("None");
         noColourmenuItem.addActionListener(new java.awt.event.ActionListener()
             {
                 public void actionPerformed(ActionEvent e)
@@ -484,16 +685,9 @@ public class PopupMenu extends JPopupMenu
      */
     void refresh()
     {
-        SequenceGroup sg = getGroup();
-        if(sg!=null)
-        {
-          SuperGroup superG = ap.av.alignment.getSuperGroup(sg);
+        if (ap.overviewPanel != null)
+          ap.overviewPanel.updateOverviewImage();
 
-          if (superG != null)
-          {
-            superG.setSuperGroupProperties(sg);
-          }
-        }
         ap.seqPanel.repaint();
     }
 
@@ -505,7 +699,7 @@ public class PopupMenu extends JPopupMenu
     protected void clustalColour_actionPerformed(ActionEvent e)
     {
         SequenceGroup sg = getGroup();
-        sg.cs = new ClustalxColourScheme(sg.sequences,
+        sg.cs = new ClustalxColourScheme(sg.getSequences(true),
                 ap.av.alignment.getWidth());
         refresh();
     }
@@ -606,10 +800,13 @@ public class PopupMenu extends JPopupMenu
     protected void abovePIDColour_actionPerformed(ActionEvent e)
     {
         SequenceGroup sg = getGroup();
+        if(sg.cs==null)
+          return;
 
         if (abovePIDColour.isSelected())
         {
-            sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0,
+            sg.cs.setConsensus(AAFrequency.calculate(
+                    sg.getSequences(true), 0,
                     ap.av.alignment.getWidth()));
 
             int threshold = SliderPanel.setPIDSliderSource(ap, sg.cs,
@@ -655,7 +852,7 @@ public class PopupMenu extends JPopupMenu
     {
         SequenceGroup sg = getGroup();
         sg.cs = new PIDColourScheme();
-        sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0,
+        sg.cs.setConsensus(AAFrequency.calculate(sg.getSequences(true), 0,
                 ap.av.alignment.getWidth()));
         refresh();
     }
@@ -671,7 +868,7 @@ public class PopupMenu extends JPopupMenu
 
         sg.cs = new Blosum62ColourScheme();
 
-        sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0,
+        sg.cs.setConsensus(AAFrequency.calculate(sg.getSequences(true), 0,
                 ap.av.alignment.getWidth()));
 
         refresh();
@@ -696,11 +893,14 @@ public class PopupMenu extends JPopupMenu
     protected void conservationMenuItem_actionPerformed(ActionEvent e)
     {
         SequenceGroup sg = getGroup();
+        if(sg.cs==null)
+          return;
 
         if (conservationMenuItem.isSelected())
         {
             Conservation c = new Conservation("Group",
-                    ResidueProperties.propHash, 3, sg.sequences, 0,
+                    ResidueProperties.propHash, 3,
+                    sg.getSequences(true), 0,
                     ap.av.alignment.getWidth());
 
             c.calculate();
@@ -755,9 +955,9 @@ public class PopupMenu extends JPopupMenu
         SequenceGroup sg = getGroup();
         StringBuffer sb = new StringBuffer();
 
-        for (int i = 0; i < sg.sequences.size(); i++)
+        for (int i = 0; i < sg.getSize(false); i++)
         {
-            Sequence tmp = (Sequence) sg.sequences.get(i);
+            Sequence tmp = (Sequence) sg.getSequences(false).elementAt(i);
             sb.append(tmp.getSequence(sg.getStartRes(), sg.getEndRes() + 1));
             sb.append("\n");
         }
@@ -788,11 +988,34 @@ public class PopupMenu extends JPopupMenu
      */
     void sequenceName_actionPerformed(ActionEvent e)
     {
-        String id = sequence.getName();
-        String s = (String) JOptionPane.showInternalInputDialog(ap,
-                "Edit sequence name",
-                "Edit sequence name (" + sequence.getName() + ")",
-                JOptionPane.PLAIN_MESSAGE, null, null, id);
+      JLabel idlabel = new JLabel(  "       Sequence Name ");
+      JLabel desclabel = new JLabel("Sequence Description ");
+      idlabel.setFont(new Font("Courier", Font.PLAIN, 12));
+      desclabel.setFont(new Font("Courier", Font.PLAIN, 12));
+      JTextField id = new JTextField(sequence.getName(), 40);
+      JTextField description = new JTextField(sequence.getDescription(), 40);
+      JPanel panel = new JPanel(new BorderLayout());
+      JPanel panel2 = new JPanel(new BorderLayout());
+      panel2.add(idlabel, BorderLayout.WEST);
+      panel2.add(id, BorderLayout.CENTER);
+      panel.add(panel2, BorderLayout.NORTH);
+      panel2 = new JPanel(new BorderLayout());
+      panel2.add(desclabel, BorderLayout.WEST);
+      panel2.add(description, BorderLayout.CENTER);
+      panel.add(panel2, BorderLayout.SOUTH);
+
+
+       int reply = JOptionPane.showInternalConfirmDialog(Desktop.desktop,
+          panel, "Edit Sequence Name/Description",
+          JOptionPane.OK_CANCEL_OPTION );
+
+
+        if (reply != JOptionPane.OK_OPTION )
+        {
+            return;
+        }
+
+        String s = id.getText();
 
         if (s != null)
         {
@@ -805,9 +1028,13 @@ public class PopupMenu extends JPopupMenu
             }
 
             s = s.replace(' ', '_');
+            sequence.getDatasetSequence().setName(s);
             sequence.setName(s);
             ap.repaint();
         }
+
+        sequence.getDatasetSequence().setDescription(description.getText());
+        sequence.setDescription(description.getText());
     }
 
     /**
@@ -823,37 +1050,6 @@ public class PopupMenu extends JPopupMenu
         refresh();
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param e DOCUMENT ME!
-     */
-    void pdbMenuItem_actionPerformed(ActionEvent e)
-    {
-        if (sequence.getPDBId() == null)
-        {
-            return;
-        }
-
-        try
-        {
-            EBIFetchClient ebi = new EBIFetchClient();
-            String[] result = ebi.fetchData("pdb:" + sequence.getPDBId(), null,
-                    null);
-
-            PDBfile pdb = new PDBfile(result);
-
-            rotCanvas rc = new rotCanvas(pdb, sequence, ap.av);
-            JInternalFrame frame = new JInternalFrame();
-            frame.setContentPane(rc);
-            Desktop.addInternalFrame(frame,
-                sequence.getName() + " " + sequence.getPDBId(), 400, 400);
-        }
-        catch (Exception ex)
-        {
-            ex.printStackTrace();
-        }
-    }
 
     /**
      * DOCUMENT ME!
@@ -924,4 +1120,174 @@ public class PopupMenu extends JPopupMenu
         ex.printStackTrace();
       }
     }
+
+    void hideSequences(boolean representGroup)
+    {
+      SequenceGroup sg = ap.av.getSelectionGroup();
+      if(sg==null || sg.getSize(false)<1)
+      {
+        ap.av.hideSequence(sequence);
+        return;
+      }
+
+        int index = 0;
+        while(index < sg.getSize(false))
+        {
+          if(representGroup && sg.getSequenceAt(index)!=sequence)
+          {
+            sequence.addHiddenSequence(sg.getSequenceAt(index));
+            ap.av.hideSequence(sg.getSequenceAt(index));
+          }
+          else if(!representGroup)
+          {
+            ap.av.hideSequence(sg.getSequenceAt(index));
+          }
+          index ++;
+        }
+
+        ap.av.setSelectionGroup(null);
+    }
+
+  public void copy_actionPerformed(ActionEvent e)
+  {
+    ap.alignFrame.copy_actionPerformed(null);
+  }
+
+  public void cut_actionPerformed(ActionEvent e)
+  {
+    ap.alignFrame.cut_actionPerformed(null);
+  }
+
+  public void upperCase_actionPerformed(ActionEvent e)
+  {
+    SequenceGroup sg = ap.av.getSelectionGroup();
+    if(sg==null)
+      return;
+
+    for(int g=0; g<sg.getSize(true); g++)
+    {
+    ( (SequenceI)sg.getSequences(true).elementAt(g))
+        .changeCase(true, sg.getStartRes(), sg.getEndRes()+1);
+    }
+    ap.repaint();
+  }
+
+  public void lowerCase_actionPerformed(ActionEvent e)
+  {
+    SequenceGroup sg = ap.av.getSelectionGroup();
+    if(sg==null)
+      return;
+
+    for(int g=0; g<sg.getSize(true); g++)
+    {
+       ( (SequenceI)sg.getSequences(true).elementAt(g))
+           .changeCase(false, sg.getStartRes(), sg.getEndRes()+1);
+    }
+    ap.repaint();
+  }
+
+  public void toggle_actionPerformed(ActionEvent e)
+  {
+    SequenceGroup sg = ap.av.getSelectionGroup();
+    if (sg == null)
+      return;
+
+    for (int g = 0; g < sg.getSize(true); g++)
+    {
+      ( (SequenceI)sg.getSequences(true).elementAt(g))
+          .toggleCase(sg.getStartRes(), sg.getEndRes() + 1);
+    }
+
+    ap.repaint();
+  }
+
+  public void outputText_actionPerformed(ActionEvent e)
+  {
+    CutAndPasteTransfer cap = new CutAndPasteTransfer();
+    Desktop.addInternalFrame(cap,
+                             "Alignment output - " + e.getActionCommand(), 600,
+                             500);
+
+    String [] omitHidden = null;
+
+    if(ap.av.hasHiddenColumns)
+    {
+      System.out.println("PROMPT USER HERE");
+      omitHidden = ap.av.getViewAsString(true);
+    }
+
+    cap.setText(new FormatAdapter().formatSequences(
+        e.getActionCommand(),
+        ap.av.getSelectionAsNewSequence(),
+        omitHidden));
+  }
+
+
+  public void pdbFromFile_actionPerformed(ActionEvent e)
+  {
+     jalview.io.JalviewFileChooser chooser
+         = new jalview.io.JalviewFileChooser(jalview.bin.Cache.
+         getProperty(
+             "LAST_DIRECTORY"));
+     chooser.setFileView(new jalview.io.JalviewFileView());
+     chooser.setDialogTitle("Select a PDB file");
+     chooser.setToolTipText("Load a PDB file");
+
+     int value = chooser.showOpenDialog(null);
+
+     if (value == jalview.io.JalviewFileChooser.APPROVE_OPTION)
+     {
+       PDBEntry entry = new PDBEntry();
+       String choice = chooser.getSelectedFile().getPath();
+       jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);
+       try
+       {
+         MCview.PDBfile pdbfile = new MCview.PDBfile(choice,
+                                       jalview.io.AppletFormatAdapter.FILE);
+
+         if (pdbfile.id == null)
+         {
+           String reply = JOptionPane.showInternalInputDialog(
+               Desktop.desktop,
+               "Couldn't find a PDB id in the file supplied."
+               + "Please enter an Id to identify this structure.",
+               "No PDB Id in File", JOptionPane.QUESTION_MESSAGE);
+           if (reply == null)
+             return;
+
+           entry.setId(reply);
+         }
+         else
+           entry.setId(pdbfile.id);
+       }
+       catch (java.io.IOException ex)
+       {
+         ex.printStackTrace();
+       }
+
+       entry.setFile(choice);
+       sequence.getDatasetSequence().addPDBId(entry);
+     }
+
+  }
+
+  public void enterPDB_actionPerformed(ActionEvent e)
+  {
+    String id = JOptionPane.showInternalInputDialog(Desktop.desktop,
+        "Enter PDB Id", "Enter PDB Id", JOptionPane.QUESTION_MESSAGE);
+
+    if (id != null && id.length() > 0)
+    {
+      PDBEntry entry = new PDBEntry();
+      entry.setId(id);
+      sequence.getDatasetSequence()
+          .addPDBId(entry);
+    }
+  }
+
+  public void discoverPDB_actionPerformed(ActionEvent e)
+  {
+    new jalview.io.DBRefFetcher(
+             ap.av.getAlignment(), ap.alignFrame).fetchDBRefs(false);
+  }
 }