JAL-1486 fix: pass selected region to jalview.io via alignment view and align viewpor...
[jalview.git] / src / jalview / gui / PopupMenu.java
index 9c5a222..25cad0a 100644 (file)
@@ -1,19 +1,22 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
  *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.gui;
 
@@ -31,6 +34,7 @@ import jalview.io.*;
 import jalview.schemes.*;
 import jalview.util.GroupUrlLink;
 import jalview.util.GroupUrlLink.UrlStringTooLongException;
+import jalview.util.MessageManager;
 import jalview.util.UrlLink;
 
 /**
@@ -70,6 +74,7 @@ public class PopupMenu extends JPopupMenu
   protected JRadioButtonMenuItem BLOSUM62Colour = new JRadioButtonMenuItem();
 
   protected JRadioButtonMenuItem purinePyrimidineColour = new JRadioButtonMenuItem();
+
   protected JRadioButtonMenuItem RNAInteractionColour = new JRadioButtonMenuItem();
 
   // protected JRadioButtonMenuItem covariationColour = new
@@ -91,6 +96,8 @@ public class PopupMenu extends JPopupMenu
 
   SequenceI sequence;
 
+  JMenuItem createGroupMenuItem = new JMenuItem();
+
   JMenuItem unGroupMenuItem = new JMenuItem();
 
   JMenuItem outline = new JMenuItem();
@@ -122,11 +129,13 @@ public class PopupMenu extends JPopupMenu
   JMenu pdbMenu = new JMenu();
 
   JMenuItem pdbFromFile = new JMenuItem();
-    // JBPNote: Commented these out - Should add these services via the web services menu system.
-    // JMenuItem ContraFold = new JMenuItem();
-  
-    // JMenuItem RNAFold = new JMenuItem();
-  
+
+  // JBPNote: Commented these out - Should add these services via the web
+  // services menu system.
+  // JMenuItem ContraFold = new JMenuItem();
+
+  // JMenuItem RNAFold = new JMenuItem();
+
   JMenuItem enterPDB = new JMenuItem();
 
   JMenuItem discoverPDB = new JMenuItem();
@@ -247,9 +256,12 @@ public class PopupMenu extends JPopupMenu
             {
               // TODO re JAL-860: optionally open dialog or provide a menu entry
               // allowing user to open just one structure per sequence
-              new AppJmol(pdb, ap.av.collateForPDB(new PDBEntry[]
-              { pdb })[0], null, ap);
-              // new PDBViewer(pdb, seqs2, null, ap, AppletFormatAdapter.FILE);
+              //new AppJmol(pdb, ap.av.collateForPDB(new PDBEntry[]
+              //{ pdb })[0], null, ap);
+              new StructureViewer(ap.getStructureSelectionManager())
+                      .viewStructures(pdb,
+                              ap.av.collateForPDB(new PDBEntry[]
+                              { pdb })[0], null, ap);
             }
 
           });
@@ -284,25 +296,28 @@ public class PopupMenu extends JPopupMenu
             final String rnastruc = aa[i].getRNAStruc();
             final String structureLine = aa[i].label;
             menuItem = new JMenuItem();
-            menuItem.setText("2D RNA " + structureLine);
+            menuItem.setText(MessageManager.formatMessage(
+                    "label.2d_rna_structure_line", new String[]
+                    { structureLine }));
             menuItem.addActionListener(new java.awt.event.ActionListener()
-            
+
             {
               public void actionPerformed(ActionEvent e)
               {
-                       //System.out.println("1:"+structureLine);
-                       System.out.println("1:sname"+seq.getName());
-                       System.out.println("2:seq"+seq);
-                
-                       //System.out.println("3:"+seq.getSequenceAsString());
-                       System.out.println("3:strucseq"+rnastruc);
-                       //System.out.println("4:struc"+seq.getRNA());
-                       System.out.println("5:name"+seq.getName());
-                       System.out.println("6:ap"+ap);
-                       new AppVarna(structureLine, seq, seq.getSequenceAsString(), rnastruc, seq
-                            .getName(), ap);
-                       //new AppVarna(seq.getName(),seq,rnastruc,seq.getRNA(), seq.getName(), ap);
-                       System.out.println("end");
+                // System.out.println("1:"+structureLine);
+                System.out.println("1:sname" + seq.getName());
+                System.out.println("2:seq" + seq);
+
+                // System.out.println("3:"+seq.getSequenceAsString());
+                System.out.println("3:strucseq" + rnastruc);
+                // System.out.println("4:struc"+seq.getRNA());
+                System.out.println("5:name" + seq.getName());
+                System.out.println("6:ap" + ap);
+                new AppVarna(structureLine, seq, seq.getSequenceAsString(),
+                        rnastruc, seq.getName(), ap);
+                // new AppVarna(seq.getName(),seq,rnastruc,seq.getRNA(),
+                // seq.getName(), ap);
+                System.out.println("end");
               }
             });
             viewStructureMenu.add(menuItem);
@@ -322,13 +337,15 @@ public class PopupMenu extends JPopupMenu
 
               // TODO: make rnastrucF a bit more nice
               menuItem = new JMenuItem();
-              menuItem.setText("2D RNA - " + seq.getName());
+              menuItem.setText(MessageManager.formatMessage(
+                      "label.2d_rna_sequence_name", new String[]
+                      { seq.getName() }));
               menuItem.addActionListener(new java.awt.event.ActionListener()
               {
                 public void actionPerformed(ActionEvent e)
                 {
                   // TODO: VARNA does'nt print gaps in the sequence
-                
+
                   new AppVarna(seq.getName() + " structure", seq, seq
                           .getSequenceAsString(), rnastruc, seq.getName(),
                           ap);
@@ -341,7 +358,8 @@ public class PopupMenu extends JPopupMenu
 
       }
 
-      menuItem = new JMenuItem("Hide Sequences");
+      menuItem = new JMenuItem(
+              MessageManager.getString("action.hide_sequences"));
       menuItem.addActionListener(new java.awt.event.ActionListener()
       {
         public void actionPerformed(ActionEvent e)
@@ -354,7 +372,9 @@ public class PopupMenu extends JPopupMenu
       if (ap.av.getSelectionGroup() != null
               && ap.av.getSelectionGroup().getSize() > 1)
       {
-        menuItem = new JMenuItem("Represent Group with " + seq.getName());
+        menuItem = new JMenuItem(MessageManager.formatMessage(
+                "label.represent_group_with", new String[]
+                { seq.getName() }));
         menuItem.addActionListener(new java.awt.event.ActionListener()
         {
           public void actionPerformed(ActionEvent e)
@@ -372,7 +392,8 @@ public class PopupMenu extends JPopupMenu
         if (ap.av.adjustForHiddenSeqs(index)
                 - ap.av.adjustForHiddenSeqs(index - 1) > 1)
         {
-          menuItem = new JMenuItem("Reveal Sequences");
+          menuItem = new JMenuItem(
+                  MessageManager.getString("action.reveal_sequences"));
           menuItem.addActionListener(new ActionListener()
           {
             public void actionPerformed(ActionEvent e)
@@ -392,7 +413,8 @@ public class PopupMenu extends JPopupMenu
     if (ap.av.hasHiddenRows())
     {
       {
-        menuItem = new JMenuItem("Reveal All");
+        menuItem = new JMenuItem(
+                MessageManager.getString("action.reveal_all"));
         menuItem.addActionListener(new ActionListener()
         {
           public void actionPerformed(ActionEvent e)
@@ -411,11 +433,16 @@ public class PopupMenu extends JPopupMenu
     }
 
     SequenceGroup sg = ap.av.getSelectionGroup();
+    boolean isDefinedGroup = (sg != null) ? ap.av.getAlignment()
+            .getGroups().contains(sg) : false;
 
     if (sg != null && sg.getSize() > 0)
     {
-      groupName.setText("Name: " + sg.getName());
-      groupName.setText("Edit name and description of current group.");
+      groupName.setText(MessageManager.formatMessage("label.name_param",
+              new String[]
+              { sg.getName() }));
+      groupName.setText(MessageManager
+              .getString("label.edit_name_and_description_current_group"));
 
       if (sg.cs instanceof ZappoColourScheme)
       {
@@ -465,8 +492,7 @@ public class PopupMenu extends JPopupMenu
       {
         purinePyrimidineColour.setSelected(true);
       }
-      
-   
+
       /*
        * else if (sg.cs instanceof CovariationColourScheme) {
        * covariationColour.setSelected(true); }
@@ -490,14 +516,15 @@ public class PopupMenu extends JPopupMenu
         buildGroupURLMenu(sg, groupLinks);
       }
       // Add a 'show all structures' for the current selection
-      Hashtable<String, PDBEntry> pdbe = new Hashtable<String, PDBEntry>();
+      Hashtable<String, PDBEntry> pdbe = new Hashtable<String, PDBEntry>(), reppdb = new Hashtable<String, PDBEntry>();
       SequenceI sqass = null;
       for (SequenceI sq : ap.av.getSequenceSelection())
       {
         Vector<PDBEntry> pes = (Vector<PDBEntry>) sq.getDatasetSequence()
                 .getPDBId();
-        if (pes != null)
+        if (pes != null && pes.size()>0)
         {
+          reppdb.put(pes.get(0).getId(), pes.get(0));
           for (PDBEntry pe : pes)
           {
             pdbe.put(pe.getId(), pe);
@@ -511,28 +538,51 @@ public class PopupMenu extends JPopupMenu
       if (pdbe.size() > 0)
       {
         final PDBEntry[] pe = pdbe.values().toArray(
-                new PDBEntry[pdbe.size()]);
-        final JMenuItem gpdbview;
+                new PDBEntry[pdbe.size()]), pr = reppdb.values().toArray(
+                new PDBEntry[reppdb.size()]);
+        final JMenuItem gpdbview, rpdbview;
         if (pdbe.size() == 1)
         {
-          structureMenu.add(gpdbview = new JMenuItem("View structure for "
-                  + sqass.getDisplayId(false)));
+          structureMenu.add(gpdbview = new JMenuItem(MessageManager
+                  .formatMessage("label.view_structure_for", new String[]
+                  { sqass.getDisplayId(false) })));
         }
         else
         {
-          structureMenu.add(gpdbview = new JMenuItem("View all "
-                  + pdbe.size() + " structures."));
+          structureMenu.add(gpdbview = new JMenuItem(MessageManager
+                  .formatMessage("label.view_all_structures", new String[]
+                  { new Integer(pdbe.size()).toString() })));
         }
-        gpdbview.setToolTipText("Open a new Jmol view with all structures associated with the current selection and superimpose them using the alignment.");
+        gpdbview.setToolTipText(MessageManager
+                .getString("label.open_new_jmol_view_with_all_structures_associated_current_selection_superimpose_using_alignment"));
         gpdbview.addActionListener(new ActionListener()
         {
 
           @Override
           public void actionPerformed(ActionEvent e)
           {
-            new AppJmol(ap, pe, ap.av.collateForPDB(pe));
+            new StructureViewer(ap.getStructureSelectionManager()).viewStructures(ap, pe, ap.av.collateForPDB(pe));
           }
         });
+        if (reppdb.size() > 1 && reppdb.size() < pdbe.size())
+        {
+          structureMenu.add(rpdbview = new JMenuItem(MessageManager
+                  .formatMessage(
+                          "label.view_all_representative_structures",
+                          new String[]
+                          { new Integer(reppdb.size()).toString() })));
+          rpdbview.setToolTipText(MessageManager
+                  .getString("label.open_new_jmol_view_with_all_representative_structures_associated_current_selection_superimpose_using_alignment"));
+          rpdbview.addActionListener(new ActionListener()
+          {
+
+            @Override
+            public void actionPerformed(ActionEvent e)
+            {
+              new StructureViewer(ap.getStructureSelectionManager()).viewStructures(ap, pr, ap.av.collateForPDB(pr));
+            }
+          });
+        }
       }
     }
     else
@@ -541,9 +591,17 @@ public class PopupMenu extends JPopupMenu
       editMenu.setVisible(false);
     }
 
-    if (!ap.av.getAlignment().getGroups().contains(sg))
+    if (!isDefinedGroup)
     {
+      createGroupMenuItem.setVisible(true);
       unGroupMenuItem.setVisible(false);
+      jMenu1.setText(MessageManager.getString("action.edit_new_group"));
+    }
+    else
+    {
+      createGroupMenuItem.setVisible(false);
+      unGroupMenuItem.setVisible(true);
+      jMenu1.setText(MessageManager.getString("action.edit_group"));
     }
 
     if (seq == null)
@@ -555,7 +613,7 @@ public class PopupMenu extends JPopupMenu
     if (links != null && links.size() > 0)
     {
 
-      JMenu linkMenu = new JMenu("Link");
+      JMenu linkMenu = new JMenu(MessageManager.getString("action.link"));
       Vector linkset = new Vector();
       for (int i = 0; i < links.size(); i++)
       {
@@ -682,11 +740,18 @@ public class PopupMenu extends JPopupMenu
     // menu appears asap
     // sequence only URLs
     // ID/regex match URLs
-    groupLinksMenu = new JMenu("Group Link");
+    groupLinksMenu = new JMenu(
+            MessageManager.getString("action.group_link"));
     JMenu[] linkMenus = new JMenu[]
-    { null, new JMenu("IDS"), new JMenu("Sequences"),
-        new JMenu("IDS and Sequences") }; // three types of url that might be
-                                          // created.
+    { null, new JMenu(MessageManager.getString("action.ids")),
+        new JMenu(MessageManager.getString("action.sequences")),
+        new JMenu(MessageManager.getString("action.ids_sequences")) }; // three
+                                                                       // types
+                                                                       // of url
+                                                                       // that
+                                                                       // might
+                                                                       // be
+    // created.
     SequenceI[] seqs = ap.av.getSelectionAsNewSequence();
     String[][] idandseqs = GroupUrlLink.formStrings(seqs);
     Hashtable commonDbrefs = new Hashtable();
@@ -808,7 +873,8 @@ public class PopupMenu extends JPopupMenu
     }
     if (addMenu)
     {
-      groupLinksMenu = new JMenu("Group Links");
+      groupLinksMenu = new JMenu(
+              MessageManager.getString("action.group_link"));
       for (int m = 0; m < linkMenus.length; m++)
       {
         if (linkMenus[m] != null
@@ -834,7 +900,9 @@ public class PopupMenu extends JPopupMenu
   private void addshowLink(JMenu linkMenu, String label, final String url)
   {
     JMenuItem item = new JMenuItem(label);
-    item.setToolTipText("open URL: " + url);
+    item.setToolTipText(MessageManager.formatMessage(
+            "label.open_url_param", new String[]
+            { url }));
     item.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -869,16 +937,12 @@ public class PopupMenu extends JPopupMenu
           final GroupUrlLink urlgenerator, final Object[] urlstub)
   {
     JMenuItem item = new JMenuItem(label);
-    item.setToolTipText("open URL (" + urlgenerator.getUrl_prefix()
-            + "..) (" + urlgenerator.getNumberInvolved(urlstub) + " seqs)"); // TODO:
-                                                                             // put
-                                                                             // in
-                                                                             // info
-                                                                             // about
-                                                                             // what
-                                                                             // is
-                                                                             // being
-                                                                             // sent.
+    item.setToolTipText(MessageManager.formatMessage(
+            "label.open_url_seqs_param",
+            new Object[]
+            { urlgenerator.getUrl_prefix(),
+                urlgenerator.getNumberInvolved(urlstub) }));
+    // TODO: put in info about what is being sent.
     item.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -911,9 +975,9 @@ public class PopupMenu extends JPopupMenu
    */
   private void jbInit() throws Exception
   {
-    groupMenu.setText("Group");
-    groupMenu.setText("Selection");
-    groupName.setText("Name");
+    groupMenu.setText(MessageManager.getString("label.group"));
+    groupMenu.setText(MessageManager.getString("label.selection"));
+    groupName.setText(MessageManager.getString("label.name"));
     groupName.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -921,8 +985,9 @@ public class PopupMenu extends JPopupMenu
         groupName_actionPerformed();
       }
     });
-    sequenceMenu.setText("Sequence");
-    sequenceName.setText("Edit Name/Description");
+    sequenceMenu.setText(MessageManager.getString("label.sequence"));
+    sequenceName.setText(MessageManager
+            .getString("label.edit_name_description"));
     sequenceName.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -930,7 +995,8 @@ public class PopupMenu extends JPopupMenu
         sequenceName_actionPerformed();
       }
     });
-    sequenceDetails.setText("Sequence Details ...");
+    sequenceDetails.setText(MessageManager
+            .getString("label.sequence_details") + "...");
     sequenceDetails.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -938,7 +1004,8 @@ public class PopupMenu extends JPopupMenu
         sequenceDetails_actionPerformed();
       }
     });
-    sequenceSelDetails.setText("Sequence Details ...");
+    sequenceSelDetails.setText(MessageManager
+            .getString("label.sequence_details") + "...");
     sequenceSelDetails
             .addActionListener(new java.awt.event.ActionListener()
             {
@@ -948,7 +1015,8 @@ public class PopupMenu extends JPopupMenu
               }
             });
     PIDColour.setFocusPainted(false);
-    unGroupMenuItem.setText("Remove Group");
+    unGroupMenuItem
+            .setText(MessageManager.getString("action.remove_group"));
     unGroupMenuItem.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -956,8 +1024,18 @@ public class PopupMenu extends JPopupMenu
         unGroupMenuItem_actionPerformed();
       }
     });
+    createGroupMenuItem.setText(MessageManager
+            .getString("action.create_group"));
+    createGroupMenuItem
+            .addActionListener(new java.awt.event.ActionListener()
+            {
+              public void actionPerformed(ActionEvent e)
+              {
+                createGroupMenuItem_actionPerformed();
+              }
+            });
 
-    outline.setText("Border colour");
+    outline.setText(MessageManager.getString("action.border_colour"));
     outline.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -965,7 +1043,8 @@ public class PopupMenu extends JPopupMenu
         outline_actionPerformed();
       }
     });
-    nucleotideMenuItem.setText("Nucleotide");
+    nucleotideMenuItem
+            .setText(MessageManager.getString("label.nucleotide"));
     nucleotideMenuItem.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -973,8 +1052,8 @@ public class PopupMenu extends JPopupMenu
         nucleotideMenuItem_actionPerformed();
       }
     });
-    colourMenu.setText("Group Colour");
-    showBoxes.setText("Boxes");
+    colourMenu.setText(MessageManager.getString("label.group_colour"));
+    showBoxes.setText(MessageManager.getString("action.boxes"));
     showBoxes.setState(true);
     showBoxes.addActionListener(new ActionListener()
     {
@@ -983,7 +1062,7 @@ public class PopupMenu extends JPopupMenu
         showBoxes_actionPerformed();
       }
     });
-    showText.setText("Text");
+    showText.setText(MessageManager.getString("action.text"));
     showText.setState(true);
     showText.addActionListener(new ActionListener()
     {
@@ -992,7 +1071,7 @@ public class PopupMenu extends JPopupMenu
         showText_actionPerformed();
       }
     });
-    showColourText.setText("Colour Text");
+    showColourText.setText(MessageManager.getString("label.colour_text"));
     showColourText.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1000,7 +1079,8 @@ public class PopupMenu extends JPopupMenu
         showColourText_actionPerformed();
       }
     });
-    displayNonconserved.setText("Show Nonconserved");
+    displayNonconserved.setText(MessageManager
+            .getString("label.show_non_conversed"));
     displayNonconserved.setState(true);
     displayNonconserved.addActionListener(new ActionListener()
     {
@@ -1009,8 +1089,8 @@ public class PopupMenu extends JPopupMenu
         showNonconserved_actionPerformed();
       }
     });
-    editMenu.setText("Edit");
-    cut.setText("Cut");
+    editMenu.setText(MessageManager.getString("action.edit"));
+    cut.setText(MessageManager.getString("action.cut"));
     cut.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1018,7 +1098,7 @@ public class PopupMenu extends JPopupMenu
         cut_actionPerformed();
       }
     });
-    upperCase.setText("To Upper Case");
+    upperCase.setText(MessageManager.getString("label.to_upper_case"));
     upperCase.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1026,7 +1106,7 @@ public class PopupMenu extends JPopupMenu
         changeCase(e);
       }
     });
-    copy.setText("Copy");
+    copy.setText(MessageManager.getString("action.copy"));
     copy.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1034,7 +1114,7 @@ public class PopupMenu extends JPopupMenu
         copy_actionPerformed();
       }
     });
-    lowerCase.setText("To Lower Case");
+    lowerCase.setText(MessageManager.getString("label.to_lower_case"));
     lowerCase.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1042,7 +1122,7 @@ public class PopupMenu extends JPopupMenu
         changeCase(e);
       }
     });
-    toggle.setText("Toggle Case");
+    toggle.setText(MessageManager.getString("label.toggle_case"));
     toggle.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1050,8 +1130,9 @@ public class PopupMenu extends JPopupMenu
         changeCase(e);
       }
     });
-    pdbMenu.setText("Associate Structure with Sequence");
-    pdbFromFile.setText("From File");
+    pdbMenu.setText(MessageManager
+            .getString("label.associate_structure_with_sequence"));
+    pdbFromFile.setText(MessageManager.getString("label.from_file"));
     pdbFromFile.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1059,33 +1140,33 @@ public class PopupMenu extends JPopupMenu
         pdbFromFile_actionPerformed();
       }
     });
-//    RNAFold.setText("From RNA Fold with predict2D");
-//    RNAFold.addActionListener(new ActionListener()
-//    {
-//      public void actionPerformed(ActionEvent e)
-//      {
-//       try {
-//                     RNAFold_actionPerformed();
-//             } catch (Exception e1) {
-//                     // TODO Auto-generated catch block
-//                     e1.printStackTrace();
-//             }
-//      }   
-//    });
-//    ContraFold.setText("From Contra Fold with predict2D");
-//    ContraFold.addActionListener(new ActionListener()
-//    {
-//      public void actionPerformed(ActionEvent e)
-//      {
-//       try {
-//                     ContraFold_actionPerformed();
-//             } catch (Exception e1) {
-//                     // TODO Auto-generated catch block
-//                     e1.printStackTrace();
-//             }
-//      }   
-//    });
-    enterPDB.setText("Enter PDB Id");
+    // RNAFold.setText("From RNA Fold with predict2D");
+    // RNAFold.addActionListener(new ActionListener()
+    // {
+    // public void actionPerformed(ActionEvent e)
+    // {
+    // try {
+    // RNAFold_actionPerformed();
+    // } catch (Exception e1) {
+    // // TODO Auto-generated catch block
+    // e1.printStackTrace();
+    // }
+    // }
+    // });
+    // ContraFold.setText("From Contra Fold with predict2D");
+    // ContraFold.addActionListener(new ActionListener()
+    // {
+    // public void actionPerformed(ActionEvent e)
+    // {
+    // try {
+    // ContraFold_actionPerformed();
+    // } catch (Exception e1) {
+    // // TODO Auto-generated catch block
+    // e1.printStackTrace();
+    // }
+    // }
+    // });
+    enterPDB.setText(MessageManager.getString("label.enter_pdb_id"));
     enterPDB.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1093,7 +1174,7 @@ public class PopupMenu extends JPopupMenu
         enterPDB_actionPerformed();
       }
     });
-    discoverPDB.setText("Discover PDB ids");
+    discoverPDB.setText(MessageManager.getString("label.discover_pdb_ids"));
     discoverPDB.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1101,8 +1182,10 @@ public class PopupMenu extends JPopupMenu
         discoverPDB_actionPerformed();
       }
     });
-    outputMenu.setText("Output to Textbox...");
-    sequenceFeature.setText("Create Sequence Feature");
+    outputMenu.setText(MessageManager.getString("label.out_to_textbox")
+            + "...");
+    sequenceFeature.setText(MessageManager
+            .getString("label.create_sequence_feature"));
     sequenceFeature.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1110,7 +1193,7 @@ public class PopupMenu extends JPopupMenu
         sequenceFeature_actionPerformed();
       }
     });
-    textColour.setText("Text Colour");
+    textColour.setText(MessageManager.getString("label.text_colour"));
     textColour.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1118,11 +1201,13 @@ public class PopupMenu extends JPopupMenu
         textColour_actionPerformed();
       }
     });
-    jMenu1.setText("Group");
-    structureMenu.setText("Structure");
-    viewStructureMenu.setText("View Structure");
+    jMenu1.setText(MessageManager.getString("label.group"));
+    structureMenu.setText(MessageManager.getString("label.structure"));
+    viewStructureMenu.setText(MessageManager
+            .getString("label.view_structure"));
     // colStructureMenu.setText("Colour By Structure");
-    editSequence.setText("Edit Sequence...");
+    editSequence.setText(MessageManager.getString("label.edit_sequence")
+            + "...");
     editSequence.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent actionEvent)
@@ -1144,6 +1229,8 @@ public class PopupMenu extends JPopupMenu
     groupMenu.add(editMenu);
     groupMenu.add(outputMenu);
     groupMenu.add(sequenceFeature);
+    groupMenu.add(createGroupMenuItem);
+    groupMenu.add(unGroupMenuItem);
     groupMenu.add(jMenu1);
     sequenceMenu.add(sequenceName);
     sequenceMenu.add(sequenceDetails);
@@ -1160,10 +1247,11 @@ public class PopupMenu extends JPopupMenu
     colourMenu.add(turnColour);
     colourMenu.add(buriedColour);
     colourMenu.add(nucleotideMenuItem);
-    if (ap.getAlignment().isNucleotide()) {
-       // JBPNote - commented since the colourscheme isn't functional
-       //  colourMenu.add(RNAInteractionColour);
-       colourMenu.add(purinePyrimidineColour);
+    if (ap.getAlignment().isNucleotide())
+    {
+      // JBPNote - commented since the colourscheme isn't functional
+      // colourMenu.add(RNAInteractionColour);
+      colourMenu.add(purinePyrimidineColour);
     }
     // colourMenu.add(covariationColour);
     colourMenu.add(userDefinedColour);
@@ -1198,13 +1286,13 @@ public class PopupMenu extends JPopupMenu
     editMenu.add(lowerCase);
     editMenu.add(toggle);
     pdbMenu.add(pdbFromFile);
-    // JBPNote: These shouldn't be added here - should appear in a generic 'apply web service to this sequence menu'
-    //    pdbMenu.add(RNAFold);
-    //    pdbMenu.add(ContraFold);
+    // JBPNote: These shouldn't be added here - should appear in a generic
+    // 'apply web service to this sequence menu'
+    // pdbMenu.add(RNAFold);
+    // pdbMenu.add(ContraFold);
     pdbMenu.add(enterPDB);
     pdbMenu.add(discoverPDB);
     jMenu1.add(groupName);
-    jMenu1.add(unGroupMenuItem);
     jMenu1.add(colourMenu);
     jMenu1.add(showBoxes);
     jMenu1.add(showText);
@@ -1214,7 +1302,7 @@ public class PopupMenu extends JPopupMenu
     structureMenu.add(pdbMenu);
     structureMenu.add(viewStructureMenu);
     // structureMenu.add(colStructureMenu);
-    noColourmenuItem.setText("None");
+    noColourmenuItem.setText(MessageManager.getString("label.none"));
     noColourmenuItem.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1223,7 +1311,8 @@ public class PopupMenu extends JPopupMenu
       }
     });
 
-    clustalColour.setText("Clustalx colours");
+    clustalColour.setText(MessageManager
+            .getString("label.clustalx_colours"));
     clustalColour.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1231,7 +1320,7 @@ public class PopupMenu extends JPopupMenu
         clustalColour_actionPerformed();
       }
     });
-    zappoColour.setText("Zappo");
+    zappoColour.setText(MessageManager.getString("label.zappo"));
     zappoColour.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1239,7 +1328,7 @@ public class PopupMenu extends JPopupMenu
         zappoColour_actionPerformed();
       }
     });
-    taylorColour.setText("Taylor");
+    taylorColour.setText(MessageManager.getString("label.taylor"));
     taylorColour.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1247,7 +1336,8 @@ public class PopupMenu extends JPopupMenu
         taylorColour_actionPerformed();
       }
     });
-    hydrophobicityColour.setText("Hydrophobicity");
+    hydrophobicityColour.setText(MessageManager
+            .getString("label.hydrophobicity"));
     hydrophobicityColour
             .addActionListener(new java.awt.event.ActionListener()
             {
@@ -1256,7 +1346,7 @@ public class PopupMenu extends JPopupMenu
                 hydrophobicityColour_actionPerformed();
               }
             });
-    helixColour.setText("Helix propensity");
+    helixColour.setText(MessageManager.getString("label.helix_propensity"));
     helixColour.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1264,7 +1354,8 @@ public class PopupMenu extends JPopupMenu
         helixColour_actionPerformed();
       }
     });
-    strandColour.setText("Strand propensity");
+    strandColour.setText(MessageManager
+            .getString("label.strand_propensity"));
     strandColour.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1272,7 +1363,7 @@ public class PopupMenu extends JPopupMenu
         strandColour_actionPerformed();
       }
     });
-    turnColour.setText("Turn propensity");
+    turnColour.setText(MessageManager.getString("label.turn_propensity"));
     turnColour.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1280,7 +1371,7 @@ public class PopupMenu extends JPopupMenu
         turnColour_actionPerformed();
       }
     });
-    buriedColour.setText("Buried Index");
+    buriedColour.setText(MessageManager.getString("label.buried_index"));
     buriedColour.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1288,7 +1379,8 @@ public class PopupMenu extends JPopupMenu
         buriedColour_actionPerformed();
       }
     });
-    abovePIDColour.setText("Above % Identity");
+    abovePIDColour.setText(MessageManager
+            .getString("label.above_identity_percentage"));
     abovePIDColour.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1296,7 +1388,8 @@ public class PopupMenu extends JPopupMenu
         abovePIDColour_actionPerformed();
       }
     });
-    userDefinedColour.setText("User Defined...");
+    userDefinedColour.setText(MessageManager
+            .getString("action.user_defined"));
     userDefinedColour.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1304,7 +1397,8 @@ public class PopupMenu extends JPopupMenu
         userDefinedColour_actionPerformed(e);
       }
     });
-    PIDColour.setText("Percentage Identity");
+    PIDColour
+            .setText(MessageManager.getString("label.percentage_identity"));
     PIDColour.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1312,7 +1406,7 @@ public class PopupMenu extends JPopupMenu
         PIDColour_actionPerformed();
       }
     });
-    BLOSUM62Colour.setText("BLOSUM62");
+    BLOSUM62Colour.setText(MessageManager.getString("label.blosum62"));
     BLOSUM62Colour.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1320,7 +1414,8 @@ public class PopupMenu extends JPopupMenu
         BLOSUM62Colour_actionPerformed();
       }
     });
-    purinePyrimidineColour.setText("Purine/Pyrimidine");
+    purinePyrimidineColour.setText(MessageManager
+            .getString("label.purine_pyrimidine"));
     purinePyrimidineColour
             .addActionListener(new java.awt.event.ActionListener()
             {
@@ -1329,15 +1424,15 @@ public class PopupMenu extends JPopupMenu
                 purinePyrimidineColour_actionPerformed();
               }
             });
-    
-   
+
     /*
      * covariationColour.addActionListener(new java.awt.event.ActionListener() {
      * public void actionPerformed(ActionEvent e) {
      * covariationColour_actionPerformed(); } });
      */
 
-    conservationMenuItem.setText("Conservation");
+    conservationMenuItem.setText(MessageManager
+            .getString("label.conservation"));
     conservationMenuItem
             .addActionListener(new java.awt.event.ActionListener()
             {
@@ -1365,8 +1460,12 @@ public class PopupMenu extends JPopupMenu
     StringBuffer contents = new StringBuffer();
     for (SequenceI seq : sequences)
     {
-      contents.append("<p><h2>Annotation for " + seq.getDisplayId(true)
-              + "</h2></p><p>");
+      contents.append("<p><h2>"
+              + MessageManager
+                      .formatMessage(
+                              "label.create_sequence_details_report_annotation_for",
+                              new String[]
+                              { seq.getDisplayId(true) }) + "</h2></p><p>");
       new SequenceAnnotationReport(null)
               .createSequenceAnnotationReport(
                       contents,
@@ -1380,9 +1479,11 @@ public class PopupMenu extends JPopupMenu
     }
     cap.setText("<html>" + contents.toString() + "</html>");
 
-    Desktop.instance.addInternalFrame(cap, "Sequence Details for "
-            + (sequences.length == 1 ? sequences[0].getDisplayId(true)
-                    : "Selection"), 500, 400);
+    Desktop.instance.addInternalFrame(cap, MessageManager.formatMessage(
+            "label.sequece_details_for",
+            (sequences.length == 1 ? new String[]
+            { sequences[0].getDisplayId(true) } : new String[]
+            { MessageManager.getString("label.selection") })), 500, 400);
 
   }
 
@@ -1518,7 +1619,6 @@ public class PopupMenu extends JPopupMenu
     refresh();
   }
 
-
   /*
    * protected void covariationColour_actionPerformed() { getGroup().cs = new
    * CovariationColourScheme(sequence.getAnnotation()[0]); refresh(); }
@@ -1569,7 +1669,7 @@ public class PopupMenu extends JPopupMenu
   {
     SequenceGroup sg = getGroup();
 
-    if (e.getActionCommand().equals("User Defined..."))
+    if (e.getSource().equals(userDefinedColour))
     {
       new UserDefinedColours(ap, sg);
     }
@@ -1646,6 +1746,7 @@ public class PopupMenu extends JPopupMenu
 
     if (conservationMenuItem.isSelected())
     {
+      // JBPNote: Conservation name shouldn't be i18n translated
       Conservation c = new Conservation("Group",
               ResidueProperties.propHash, 3, sg.getSequences(ap.av
                       .getHiddenRepSequences()), sg.getStartRes(),
@@ -1680,7 +1781,7 @@ public class PopupMenu extends JPopupMenu
             sequence.getAnnotation()[0], null,
             AnnotationColourGradient.NO_THRESHOLD);
 
-    acg.predefinedColours = true;
+    acg.setPredefinedColours(true);
     sg.cs = acg;
 
     refresh();
@@ -1697,8 +1798,10 @@ public class PopupMenu extends JPopupMenu
 
     SequenceGroup sg = getGroup();
     EditNameDialog dialog = new EditNameDialog(sg.getName(),
-            sg.getDescription(), "       Group Name ",
-            "Group Description ", "Edit Group Name/Description",
+            sg.getDescription(), "       "
+                    + MessageManager.getString("label.group_name") + " ",
+            MessageManager.getString("label.group_description") + " ",
+            MessageManager.getString("label.edit_group_name_description"),
             ap.alignFrame);
 
     if (!dialog.accept)
@@ -1737,8 +1840,12 @@ public class PopupMenu extends JPopupMenu
   void sequenceName_actionPerformed()
   {
     EditNameDialog dialog = new EditNameDialog(sequence.getName(),
-            sequence.getDescription(), "       Sequence Name ",
-            "Sequence Description ", "Edit Sequence Name/Description",
+            sequence.getDescription(),
+            "       " + MessageManager.getString("label.sequence_name")
+                    + " ",
+            MessageManager.getString("label.sequence_description") + " ",
+            MessageManager
+                    .getString("label.edit_sequence_name_description"),
             ap.alignFrame);
 
     if (!dialog.accept)
@@ -1750,10 +1857,14 @@ public class PopupMenu extends JPopupMenu
     {
       if (dialog.getName().indexOf(" ") > -1)
       {
-        JOptionPane.showMessageDialog(ap,
-                "Spaces have been converted to \"_\"",
-                "No spaces allowed in Sequence Name",
-                JOptionPane.WARNING_MESSAGE);
+        JOptionPane
+                .showMessageDialog(
+                        ap,
+                        MessageManager
+                                .getString("label.spaces_converted_to_backslashes"),
+                        MessageManager
+                                .getString("label.no_spaces_allowed_sequence_name"),
+                        JOptionPane.WARNING_MESSAGE);
       }
 
       sequence.setName(dialog.getName().replace(' ', '_'));
@@ -1781,6 +1892,13 @@ public class PopupMenu extends JPopupMenu
     refresh();
   }
 
+  void createGroupMenuItem_actionPerformed()
+  {
+    getGroup(); // implicitly creates group - note - should apply defaults / use
+                // standard alignment window logic for this
+    refresh();
+  }
+
   /**
    * DOCUMENT ME!
    * 
@@ -1790,7 +1908,8 @@ public class PopupMenu extends JPopupMenu
   protected void outline_actionPerformed()
   {
     SequenceGroup sg = getGroup();
-    Color col = JColorChooser.showDialog(this, "Select Outline Colour",
+    Color col = JColorChooser.showDialog(this,
+            MessageManager.getString("label.select_outline_colour"),
             Color.BLUE);
 
     if (col != null)
@@ -1844,12 +1963,10 @@ public class PopupMenu extends JPopupMenu
       jalview.util.BrowserLauncher.openURL(url);
     } catch (Exception ex)
     {
-      JOptionPane
-              .showInternalMessageDialog(
-                      Desktop.desktop,
-                      "Unixers: Couldn't find default web browser."
-                              + "\nAdd the full path to your browser in Preferences.",
-                      "Web browser not found", JOptionPane.WARNING_MESSAGE);
+      JOptionPane.showInternalMessageDialog(Desktop.desktop,
+              MessageManager.getString("label.web_browser_not_found_unix"),
+              MessageManager.getString("label.web_browser_not_found"),
+              JOptionPane.WARNING_MESSAGE);
 
       ex.printStackTrace();
     }
@@ -1915,17 +2032,17 @@ public class PopupMenu extends JPopupMenu
 
       if (source == toggle)
       {
-        description = "Toggle Case";
+        description = MessageManager.getString("label.toggle_case");
         caseChange = ChangeCaseCommand.TOGGLE_CASE;
       }
       else if (source == upperCase)
       {
-        description = "To Upper Case";
+        description = MessageManager.getString("label.to_upper_case");
         caseChange = ChangeCaseCommand.TO_UPPER;
       }
       else
       {
-        description = "To Lower Case";
+        description = MessageManager.getString("label.to_lower_case");
         caseChange = ChangeCaseCommand.TO_LOWER;
       }
 
@@ -1945,31 +2062,30 @@ public class PopupMenu extends JPopupMenu
   {
     CutAndPasteTransfer cap = new CutAndPasteTransfer();
     cap.setForInput(null);
-    Desktop.addInternalFrame(cap,
-            "Alignment output - " + e.getActionCommand(), 600, 500);
+    Desktop.addInternalFrame(cap, MessageManager.formatMessage(
+            "label.alignment_output_command", new String[]
+            { e.getActionCommand() }), 600, 500);
 
     String[] omitHidden = null;
 
     System.out.println("PROMPT USER HERE"); // TODO: decide if a prompt happens
     // or we simply trust the user wants
     // wysiwig behaviour
-    SequenceGroup sg = ap.av.getSelectionGroup();
-    ColumnSelection csel = new ColumnSelection(ap.av.getColumnSelection());
-    omitHidden = ap.av.getViewAsString(true);
-    Alignment oal = new Alignment(ap.av.getSequenceSelection());
-    AlignmentAnnotation[] nala = ap.av.getAlignment()
-            .getAlignmentAnnotation();
-    if (nala != null)
+
+    AlignmentView selvew = ap.av.getAlignmentView(true, false);
+    AlignmentI aselview = selvew.getVisibleAlignment(ap.av
+            .getGapCharacter());
+    List<AlignmentAnnotation> ala = (ap.av
+            .getVisibleAlignmentAnnotation(true));
+    if (ala != null)
     {
-      for (int i = 0; i < nala.length; i++)
+      for (AlignmentAnnotation aa : ala)
       {
-        AlignmentAnnotation na = nala[i];
-        oal.addAnnotation(na);
+        aselview.addAnnotation(aa);
       }
     }
     cap.setText(new FormatAdapter().formatSequences(e.getActionCommand(),
-            oal, omitHidden, csel, sg));
-    oal = null;
+            aselview, null, null, null));
   }
 
   public void pdbFromFile_actionPerformed()
@@ -1977,10 +2093,12 @@ public class PopupMenu extends JPopupMenu
     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 for "
-            + sequence.getDisplayId(false));
-    chooser.setToolTipText("Load a PDB file and associate it with sequence '"
-            + sequence.getDisplayId(false) + "'");
+    chooser.setDialogTitle(MessageManager.formatMessage(
+            "label.select_pdb_file_for", new String[]
+            { sequence.getDisplayId(false) }));
+    chooser.setToolTipText(MessageManager.formatMessage(
+            "label.load_pdb_file_associate_with_sequence", new String[]
+            { sequence.getDisplayId(false) }));
 
     int value = chooser.showOpenDialog(null);
 
@@ -1993,22 +2111,25 @@ public class PopupMenu extends JPopupMenu
     }
 
   }
-    // JBNote: commented out - these won't be instantiated here...!  
-//  public void RNAFold_actionPerformed() throws Exception
-//  {
-//       Predict2D P2D = new Predict2D();
-//       P2D.getStructure2DFromRNAFold("toto");
-//  }
-//  
-//  public void ContraFold_actionPerformed() throws Exception
-//  {
-//       Predict2D P2D = new Predict2D();
-//       P2D.getStructure2DFromContraFold("toto");
-//  }
+
+  // JBNote: commented out - these won't be instantiated here...!
+  // public void RNAFold_actionPerformed() throws Exception
+  // {
+  // Predict2D P2D = new Predict2D();
+  // P2D.getStructure2DFromRNAFold("toto");
+  // }
+  //
+  // public void ContraFold_actionPerformed() throws Exception
+  // {
+  // Predict2D P2D = new Predict2D();
+  // P2D.getStructure2DFromContraFold("toto");
+  // }
   public void enterPDB_actionPerformed()
   {
     String id = JOptionPane.showInternalInputDialog(Desktop.desktop,
-            "Enter PDB Id", "Enter PDB Id", JOptionPane.QUESTION_MESSAGE);
+            MessageManager.getString("label.enter_pdb_id"),
+            MessageManager.getString("label.enter_pdb_id"),
+            JOptionPane.QUESTION_MESSAGE);
 
     if (id != null && id.length() > 0)
     {
@@ -2114,12 +2235,15 @@ public class PopupMenu extends JPopupMenu
 
       EditNameDialog dialog = new EditNameDialog(
               sequence.getSequenceAsString(sg.getStartRes(),
-                      sg.getEndRes() + 1), null, "Edit Sequence ", null,
-              "Edit Sequence", ap.alignFrame);
+                      sg.getEndRes() + 1), null,
+              MessageManager.getString("label.edit_sequence"), null,
+              MessageManager.getString("label.edit_sequence"),
+              ap.alignFrame);
 
       if (dialog.accept)
       {
-        EditCommand editCommand = new EditCommand("Edit Sequences",
+        EditCommand editCommand = new EditCommand(
+                MessageManager.getString("label.edit_sequences"),
                 EditCommand.REPLACE, dialog.getName().replace(' ',
                         ap.av.getGapCharacter()),
                 sg.getSequencesAsArray(ap.av.getHiddenRepSequences()),