X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPopupMenu.java;h=35ca39b3b15c95dc15c067670dbf4683a0eda67f;hb=b512e41cb378d9b7fb470db08bbb4d8ddbadce6f;hp=5a98d55dafc0813b395c79c3798339ec22c32d4e;hpb=821c04574cbf7c2d5ba5e80b9319ca7304317d58;p=jalview.git

diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index 5a98d55..35ca39b 100755
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -81,7 +81,7 @@ public class PopupMenu extends JPopupMenu
   JMenuItem pdbFromFile = new JMenuItem();
   JMenuItem enterPDB = new JMenuItem();
   JMenuItem discoverPDB = new JMenuItem();
-  JMenuItem jMenuItem1 = new JMenuItem();
+  JMenu outputMenu = new JMenu();
 
   /**
      * Creates a new PopupMenu object.
@@ -115,7 +115,7 @@ public class PopupMenu extends JPopupMenu
         colours.add(PIDColour);
         colours.add(BLOSUM62Colour);
 
-        for (int i = 0; i < jalview.io.FormatAdapter.formats.size(); i++)
+        for (int i = 0; i < jalview.io.FormatAdapter.formats.size()-1; i++)
         {
           JMenuItem item = new JMenuItem( (String) jalview.io.FormatAdapter.formats.
                                          elementAt(
@@ -128,7 +128,8 @@ public class PopupMenu extends JPopupMenu
             }
           });
 
-    }
+          outputMenu.add(item);
+        }
 
 
         try
@@ -352,7 +353,10 @@ public class PopupMenu extends JPopupMenu
 
             linkMenu.add(item);
           }
-          sequenceMenu.add(linkMenu);
+          if(sequence!=null)
+            sequenceMenu.add(linkMenu);
+          else
+            add(linkMenu);
         }
     }
 
@@ -502,12 +506,12 @@ public class PopupMenu extends JPopupMenu
         discoverPDB_actionPerformed(e);
       }
     });
-    jMenuItem1.setText("Output to Textbox...");
+    outputMenu.setText("Output to Textbox...");
     add(groupMenu);
 
     add(sequenceMenu);
     groupMenu.add(editMenu);
-    groupMenu.add(jMenuItem1);
+    groupMenu.add(outputMenu);
     groupMenu.addSeparator();
     groupMenu.add(groupName);
     groupMenu.add(unGroupMenuItem);
@@ -1274,18 +1278,6 @@ public class PopupMenu extends JPopupMenu
 
   public void enterPDB_actionPerformed(ActionEvent e)
   {
-    int size = (ap.av.getSelectionGroup() == null ? 0 :
-                ap.av.getSelectionGroup().getSize(false));
-
-    if (size == 0 || size > 1)
-    {
-      JOptionPane.showInternalMessageDialog(
-          Desktop.desktop,
-          "Select a single sequence to specify a PDB id for first",
-          "Select Single Selected", JOptionPane.WARNING_MESSAGE);
-      return;
-    }
-
     String id = JOptionPane.showInternalInputDialog(Desktop.desktop,
         "Enter PDB Id", "Enter PDB Id", JOptionPane.QUESTION_MESSAGE);
 
@@ -1293,7 +1285,7 @@ public class PopupMenu extends JPopupMenu
     {
       PDBEntry entry = new PDBEntry();
       entry.setId(id);
-      ap.av.getSelectionGroup().getSequenceAt(0).getDatasetSequence()
+      sequence.getDatasetSequence()
           .addPDBId(entry);
     }
   }