JAL-1544 sequece now sequence

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index b12d163..a797929 100644 (file)
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@ -676,7 +676,7 @@ label.view_structure = View Structure
 label.clustalx_colours = Clustalx colours
 label.above_identity_percentage = Above % Identity
 label.create_sequence_details_report_annotation_for = Annotation for {0}
-label.sequece_details_for = Sequece Details for {0}
+label.sequence_details_for = Sequence Details for {0}
 label.sequence_name = Sequence Name
 label.sequence_description = Sequence Description
 label.edit_sequence_name_description = Edit Sequence Name/Description

diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index 2ac0856..64e8d67 100644 (file)
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -392,7 +392,7 @@ public class PopupMenu extends JPopupMenu
             final String structureLine = aa[i].label + " (alignment)";
             menuItem = new JMenuItem();
             menuItem.setText(MessageManager.formatMessage(
-                    "label.2d_rna_structure_line", new String[]
+                    "label.2d_rna_structure_line", new Object[]
                     { structureLine }));
             menuItem.addActionListener(new java.awt.event.ActionListener()
             {
@@ -433,7 +433,7 @@ public class PopupMenu extends JPopupMenu
               // TODO: make rnastrucF a bit more nice
               menuItem = new JMenuItem();
               menuItem.setText(MessageManager.formatMessage(
-                      "label.2d_rna_sequence_name", new String[]
+                      "label.2d_rna_sequence_name", new Object[]
                       { seq.getName() }));
               menuItem.addActionListener(new java.awt.event.ActionListener()
               {
@@ -469,7 +469,7 @@ public class PopupMenu extends JPopupMenu
               && ap.av.getSelectionGroup().getSize() > 1)
       {
         menuItem = new JMenuItem(MessageManager.formatMessage(
-                "label.represent_group_with", new String[]
+                "label.represent_group_with", new Object[]
                 { seq.getName() }));
         menuItem.addActionListener(new java.awt.event.ActionListener()
         {
@@ -538,7 +538,7 @@ public class PopupMenu extends JPopupMenu
     if (sg != null && sg.getSize() > 0)
     {
       groupName.setText(MessageManager.formatMessage("label.name_param",
-              new String[]
+              new Object[]
               { sg.getName() }));
       groupName.setText(MessageManager
               .getString("label.edit_name_and_description_current_group"));
@@ -642,13 +642,13 @@ public class PopupMenu extends JPopupMenu
         if (pdbe.size() == 1)
         {
           structureMenu.add(gpdbview = new JMenuItem(MessageManager
-                  .formatMessage("label.view_structure_for", new String[]
+                  .formatMessage("label.view_structure_for", new Object[]
                   { sqass.getDisplayId(false) })));
         }
         else
         {
           structureMenu.add(gpdbview = new JMenuItem(MessageManager
-                  .formatMessage("label.view_all_structures", new String[]
+                  .formatMessage("label.view_all_structures", new Object[]
                   { new Integer(pdbe.size()).toString() })));
         }
         gpdbview.setToolTipText(MessageManager
@@ -668,7 +668,7 @@ public class PopupMenu extends JPopupMenu
           structureMenu.add(rpdbview = new JMenuItem(MessageManager
                   .formatMessage(
                           "label.view_all_representative_structures",
-                          new String[]
+                          new Object[]
                           { new Integer(reppdb.size()).toString() })));
           rpdbview.setToolTipText(MessageManager
                   .getString("label.open_new_jmol_view_with_all_representative_structures_associated_current_selection_superimpose_using_alignment"));
@@ -1157,7 +1157,7 @@ public class PopupMenu extends JPopupMenu
   {
     JMenuItem item = new JMenuItem(label);
     item.setToolTipText(MessageManager.formatMessage(
-            "label.open_url_param", new String[]
+            "label.open_url_param", new Object[]
             { url }));
     item.addActionListener(new java.awt.event.ActionListener()
     {
@@ -2006,7 +2006,7 @@ public class PopupMenu extends JPopupMenu
               + MessageManager
                       .formatMessage(
                               "label.create_sequence_details_report_annotation_for",
-                              new String[]
+                              new Object[]
                               { seq.getDisplayId(true) }) + "</h2></p><p>");
       new SequenceAnnotationReport(null)
               .createSequenceAnnotationReport(
@@ -2024,9 +2024,9 @@ public class PopupMenu extends JPopupMenu
     cap.setText("<html>" + contents.toString() + "</html>");
 
     Desktop.instance.addInternalFrame(cap, MessageManager.formatMessage(
-            "label.sequece_details_for",
-            (sequences.length == 1 ? new String[]
-            { sequences[0].getDisplayId(true) } : new String[]
+            "label.sequence_details_for",
+            (sequences.length == 1 ? new Object[]
+            { sequences[0].getDisplayId(true) } : new Object[]
             { MessageManager.getString("label.selection") })), 500, 400);
 
   }
@@ -2612,7 +2612,7 @@ public class PopupMenu extends JPopupMenu
     CutAndPasteTransfer cap = new CutAndPasteTransfer();
     cap.setForInput(null);
     Desktop.addInternalFrame(cap, MessageManager.formatMessage(
-            "label.alignment_output_command", new String[]
+            "label.alignment_output_command", new Object[]
             { e.getActionCommand() }), 600, 500);
 
     String[] omitHidden = null;
@@ -2631,10 +2631,10 @@ public class PopupMenu extends JPopupMenu
             jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
     chooser.setFileView(new jalview.io.JalviewFileView());
     chooser.setDialogTitle(MessageManager.formatMessage(
-            "label.select_pdb_file_for", new String[]
+            "label.select_pdb_file_for", new Object[]
             { sequence.getDisplayId(false) }));
     chooser.setToolTipText(MessageManager.formatMessage(
-            "label.load_pdb_file_associate_with_sequence", new String[]
+            "label.load_pdb_file_associate_with_sequence", new Object[]
             { sequence.getDisplayId(false) }));
 
     int value = chooser.showOpenDialog(null);