Merge branch 'develop' into features/JAL-2446NCList
[jalview.git] / src / jalview / appletgui / APopupMenu.java
index 80b2d73..9d44479 100644 (file)
@@ -76,8 +76,8 @@ import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.Vector;
 
-public class APopupMenu extends java.awt.PopupMenu implements
-        ActionListener, ItemListener
+public class APopupMenu extends java.awt.PopupMenu
+        implements ActionListener, ItemListener
 {
   Menu groupMenu = new Menu();
 
@@ -262,8 +262,9 @@ public class APopupMenu extends java.awt.PopupMenu implements
         purinePyrimidineColour.setEnabled(false);
         nucleotideColour.setEnabled(false);
       }
-      editGroupName.setLabel(MessageManager.formatMessage(
-              "label.name_param", new Object[] { sg.getName() }));
+      editGroupName.setLabel(
+              MessageManager.formatMessage("label.name_param", new Object[]
+              { sg.getName() }));
       showText.setState(sg.getDisplayText());
       showColourText.setState(sg.getColourText());
       showBoxes.setState(sg.getDisplayBoxes());
@@ -304,17 +305,18 @@ public class APopupMenu extends java.awt.PopupMenu implements
       seqMenu.setLabel(seq.getName());
       if (seq == ap.av.getAlignment().getSeqrep())
       {
-        makeReferenceSeq.setLabel(MessageManager
-                .getString("action.unmark_as_reference"));// Unmark
-                                                          // representative");
+        makeReferenceSeq.setLabel(
+                MessageManager.getString("action.unmark_as_reference"));// Unmark
+                                                                        // representative");
       }
       else
       {
-        makeReferenceSeq.setLabel(MessageManager
-                .getString("action.set_as_reference")); // );
+        makeReferenceSeq.setLabel(
+                MessageManager.getString("action.set_as_reference")); // );
       }
-      repGroup.setLabel(MessageManager.formatMessage(
-              "label.represent_group_with", new Object[] { seq.getName() }));
+      repGroup.setLabel(MessageManager
+              .formatMessage("label.represent_group_with", new Object[]
+              { seq.getName() }));
     }
     else
     {
@@ -446,8 +448,9 @@ public class APopupMenu extends java.awt.PopupMenu implements
     /*
      * First for the currently selected sequence (if there is one):
      */
-    final List<SequenceI> selectedSequence = (seq == null ? Collections
-            .<SequenceI> emptyList() : Arrays.asList(seq));
+    final List<SequenceI> selectedSequence = (seq == null
+            ? Collections.<SequenceI> emptyList()
+            : Arrays.asList(seq));
     buildAnnotationTypesMenus(seqShowAnnotationsMenu,
             seqHideAnnotationsMenu, selectedSequence);
     configureReferenceAnnotationsMenu(seqAddReferenceAnnotations,
@@ -456,9 +459,9 @@ public class APopupMenu extends java.awt.PopupMenu implements
     /*
      * and repeat for the current selection group (if there is one):
      */
-    final List<SequenceI> selectedGroup = (ap.av.getSelectionGroup() == null ? Collections
-            .<SequenceI> emptyList() : ap.av.getSelectionGroup()
-            .getSequences());
+    final List<SequenceI> selectedGroup = (ap.av.getSelectionGroup() == null
+            ? Collections.<SequenceI> emptyList()
+            : ap.av.getSelectionGroup().getSequences());
     buildAnnotationTypesMenus(groupShowAnnotationsMenu,
             groupHideAnnotationsMenu, selectedGroup);
     configureReferenceAnnotationsMenu(groupAddReferenceAnnotations,
@@ -485,8 +488,8 @@ public class APopupMenu extends java.awt.PopupMenu implements
     SortedMap<String, String> tipEntries = new TreeMap<String, String>();
     final Map<SequenceI, List<AlignmentAnnotation>> candidates = new LinkedHashMap<SequenceI, List<AlignmentAnnotation>>();
     AlignmentI al = this.ap.av.getAlignment();
-    AlignmentUtils.findAddableReferenceAnnotations(forSequences,
-            tipEntries, candidates, al);
+    AlignmentUtils.findAddableReferenceAnnotations(forSequences, tipEntries,
+            candidates, al);
     if (!candidates.isEmpty())
     {
       StringBuilder tooltip = new StringBuilder(64);
@@ -751,9 +754,10 @@ public class APopupMenu extends java.awt.PopupMenu implements
           seq = sg.getSequenceAt(0);
         }
 
-        EditNameDialog dialog = new EditNameDialog(seq.getSequenceAsString(
-                sg.getStartRes(), sg.getEndRes() + 1), null,
-                "Edit Sequence ", null,
+        EditNameDialog dialog = new EditNameDialog(
+                seq.getSequenceAsString(sg.getStartRes(),
+                        sg.getEndRes() + 1),
+                null, "Edit Sequence ", null,
 
                 ap.alignFrame, "Edit Sequence", 500, 100, true);
 
@@ -761,16 +765,16 @@ public class APopupMenu extends java.awt.PopupMenu implements
         {
           EditCommand editCommand = new EditCommand(
                   MessageManager.getString("label.edit_sequences"),
-                  Action.REPLACE, dialog.getName().replace(' ',
-                          ap.av.getGapCharacter()),
+                  Action.REPLACE,
+                  dialog.getName().replace(' ', ap.av.getGapCharacter()),
                   sg.getSequencesAsArray(ap.av.getHiddenRepSequences()),
                   sg.getStartRes(), sg.getEndRes() + 1,
                   ap.av.getAlignment());
 
           ap.alignFrame.addHistoryItem(editCommand);
 
-          ap.av.firePropertyChange("alignment", null, ap.av.getAlignment()
-                  .getSequences());
+          ap.av.firePropertyChange("alignment", null,
+                  ap.av.getAlignment().getSequences());
         }
       }
     }
@@ -807,8 +811,8 @@ public class APopupMenu extends java.awt.PopupMenu implements
 
         ap.alignFrame.addHistoryItem(caseCommand);
 
-        ap.av.firePropertyChange("alignment", null, ap.av.getAlignment()
-                .getSequences());
+        ap.av.firePropertyChange("alignment", null,
+                ap.av.getAlignment().getSequences());
 
       }
     }
@@ -861,15 +865,15 @@ public class APopupMenu extends java.awt.PopupMenu implements
 
     Frame frame = new Frame();
     frame.add(cap);
-    JalviewLite.addFrame(frame, MessageManager.formatMessage(
-            "label.selection_output_command",
-            new Object[] { e.getActionCommand() }), 600, 500);
+    JalviewLite.addFrame(frame, MessageManager
+            .formatMessage("label.selection_output_command", new Object[]
+            { e.getActionCommand() }), 600, 500);
     // JBPNote: getSelectionAsNewSequence behaviour has changed - this method
     // now returns a full copy of sequence data
     // TODO consider using getSequenceSelection instead here
 
-    FileFormatI fileFormat = FileFormats.getInstance().forName(
-            e.getActionCommand());
+    FileFormatI fileFormat = FileFormats.getInstance()
+            .forName(e.getActionCommand());
     cap.setText(new AppletFormatAdapter().formatSequences(fileFormat,
             ap.av.getShowJVSuffix(), ap, true));
 
@@ -893,25 +897,26 @@ public class APopupMenu extends java.awt.PopupMenu implements
     StringBuilder contents = new StringBuilder(128);
     for (SequenceI seq : sequences)
     {
-      contents.append(MessageManager.formatMessage(
-              "label.annotation_for_displayid",
-              new Object[] { seq.getDisplayId(true) }));
+      contents.append(MessageManager
+              .formatMessage("label.annotation_for_displayid", new Object[]
+              { seq.getDisplayId(true) }));
       new SequenceAnnotationReport(null).createSequenceAnnotationReport(
-              contents,
-              seq,
-              true,
-              true,
-              (ap.seqPanel.seqCanvas.fr != null) ? ap.seqPanel.seqCanvas.fr
-                      .getMinMax() : null);
+              contents, seq, true, true,
+              (ap.seqPanel.seqCanvas.fr != null)
+                      ? ap.seqPanel.seqCanvas.fr.getMinMax()
+                      : null);
       contents.append("</p>");
     }
     Frame frame = new Frame();
     frame.add(cap);
-    jalview.bin.JalviewLite.addFrame(frame, "Sequence Details for "
-            + (sequences.length == 1 ? sequences[0].getDisplayId(true)
-                    : "Selection"), 600, 500);
-    cap.setText(MessageManager.formatMessage("label.html_content",
-            new Object[] { contents.toString() }));
+    jalview.bin.JalviewLite.addFrame(frame,
+            "Sequence Details for " + (sequences.length == 1
+                    ? sequences[0].getDisplayId(true)
+                    : "Selection"),
+            600, 500);
+    cap.setText(
+            MessageManager.formatMessage("label.html_content", new Object[]
+            { contents.toString() }));
   }
 
   void editName()
@@ -943,21 +948,22 @@ public class APopupMenu extends java.awt.PopupMenu implements
       }
       else
       {
-        new MCview.AppletPDBViewer(entry, new SequenceI[] { seq }, null,
-                ap, DataSourceType.URL);
+        new MCview.AppletPDBViewer(entry, new SequenceI[] { seq }, null, ap,
+                DataSourceType.URL);
       }
 
     }
     else
     {
-      CutAndPasteTransfer cap = new CutAndPasteTransfer(true, ap.alignFrame);
+      CutAndPasteTransfer cap = new CutAndPasteTransfer(true,
+              ap.alignFrame);
       cap.setText(MessageManager.getString("label.paste_pdb_file"));
       cap.setPDBImport(seq);
       Frame frame = new Frame();
       frame.add(cap);
       JalviewLite.addFrame(frame, MessageManager.formatMessage(
-              "label.paste_pdb_file_for_sequence",
-              new Object[] { seq.getName() }), 400, 300);
+              "label.paste_pdb_file_for_sequence", new Object[]
+              { seq.getName() }), 400, 300);
     }
   }
 
@@ -967,12 +973,12 @@ public class APopupMenu extends java.awt.PopupMenu implements
     sequenceFeature.addActionListener(this);
 
     editGroupName.addActionListener(this);
-    unGroupMenuItem.setLabel(MessageManager
-            .getString("action.remove_group"));
+    unGroupMenuItem
+            .setLabel(MessageManager.getString("action.remove_group"));
     unGroupMenuItem.addActionListener(this);
 
-    createGroupMenuItem.setLabel(MessageManager
-            .getString("action.create_group"));
+    createGroupMenuItem
+            .setLabel(MessageManager.getString("action.create_group"));
     createGroupMenuItem.addActionListener(this);
 
     modifyPID.setEnabled(abovePIDColour.getState());
@@ -984,8 +990,8 @@ public class APopupMenu extends java.awt.PopupMenu implements
     sequenceName.addActionListener(this);
     sequenceDetails.addActionListener(this);
     selSeqDetails.addActionListener(this);
-    displayNonconserved.setLabel(MessageManager
-            .getString("label.show_non_conserved"));
+    displayNonconserved
+            .setLabel(MessageManager.getString("label.show_non_conserved"));
     displayNonconserved.setState(false);
     displayNonconserved.addItemListener(this);
     showText.setLabel(MessageManager.getString("action.text"));
@@ -996,8 +1002,9 @@ public class APopupMenu extends java.awt.PopupMenu implements
     seqMenu.setLabel(MessageManager.getString("label.sequence"));
     pdb.setLabel(MessageManager.getString("label.view_pdb_structure"));
     hideSeqs.setLabel(MessageManager.getString("action.hide_sequences"));
-    repGroup.setLabel(MessageManager.formatMessage(
-            "label.represent_group_with", new Object[] { "" }));
+    repGroup.setLabel(MessageManager
+            .formatMessage("label.represent_group_with", new Object[]
+            { "" }));
     revealAll.setLabel(MessageManager.getString("action.reveal_all"));
     revealSeq.setLabel(MessageManager.getString("action.reveal_sequences"));
     menu1.setLabel(MessageManager.getString("label.group:"));
@@ -1043,28 +1050,28 @@ public class APopupMenu extends java.awt.PopupMenu implements
     /*
      * setName allows setSelectedColour to do its thing
      */
-    clustalColour.setLabel(MessageManager
-            .getString("label.colourScheme_clustal"));
+    clustalColour.setLabel(
+            MessageManager.getString("label.colourScheme_clustal"));
     clustalColour.setName(JalviewColourScheme.Clustal.toString());
     clustalColour.addItemListener(this);
-    BLOSUM62Colour.setLabel(MessageManager
-            .getString("label.colourScheme_blosum62"));
+    BLOSUM62Colour.setLabel(
+            MessageManager.getString("label.colourScheme_blosum62"));
     BLOSUM62Colour.setName(JalviewColourScheme.Blosum62.toString());
     BLOSUM62Colour.addItemListener(this);
-    PIDColour.setLabel(MessageManager
-            .getString("label.colourScheme_%_identity"));
+    PIDColour.setLabel(
+            MessageManager.getString("label.colourScheme_%_identity"));
     PIDColour.setName(JalviewColourScheme.PID.toString());
     PIDColour.addItemListener(this);
-    zappoColour.setLabel(MessageManager
-            .getString("label.colourScheme_zappo"));
+    zappoColour
+            .setLabel(MessageManager.getString("label.colourScheme_zappo"));
     zappoColour.setName(JalviewColourScheme.Zappo.toString());
     zappoColour.addItemListener(this);
-    taylorColour.setLabel(MessageManager
-            .getString("label.colourScheme_taylor"));
+    taylorColour.setLabel(
+            MessageManager.getString("label.colourScheme_taylor"));
     taylorColour.setName(JalviewColourScheme.Taylor.toString());
     taylorColour.addItemListener(this);
-    hydrophobicityColour.setLabel(MessageManager
-            .getString("label.colourScheme_hydrophobic"));
+    hydrophobicityColour.setLabel(
+            MessageManager.getString("label.colourScheme_hydrophobic"));
     hydrophobicityColour
             .setName(JalviewColourScheme.Hydrophobic.toString());
     hydrophobicityColour.addItemListener(this);
@@ -1076,36 +1083,36 @@ public class APopupMenu extends java.awt.PopupMenu implements
             .getString("label.colourScheme_strand_propensity"));
     strandColour.setName(JalviewColourScheme.Strand.toString());
     strandColour.addItemListener(this);
-    turnColour.setLabel(MessageManager
-            .getString("label.colourScheme_turn_propensity"));
+    turnColour.setLabel(
+            MessageManager.getString("label.colourScheme_turn_propensity"));
     turnColour.setName(JalviewColourScheme.Turn.toString());
     turnColour.addItemListener(this);
-    buriedColour.setLabel(MessageManager
-            .getString("label.colourScheme_buried_index"));
+    buriedColour.setLabel(
+            MessageManager.getString("label.colourScheme_buried_index"));
     buriedColour.setName(JalviewColourScheme.Buried.toString());
     buriedColour.addItemListener(this);
-    nucleotideColour.setLabel(MessageManager
-            .getString("label.colourScheme_nucleotide"));
+    nucleotideColour.setLabel(
+            MessageManager.getString("label.colourScheme_nucleotide"));
     nucleotideColour.setName(JalviewColourScheme.Nucleotide.toString());
     nucleotideColour.addItemListener(this);
     purinePyrimidineColour.setLabel(MessageManager
             .getString("label.colourScheme_purine/pyrimidine"));
-    purinePyrimidineColour.setName(JalviewColourScheme.PurinePyrimidine
-            .toString());
+    purinePyrimidineColour
+            .setName(JalviewColourScheme.PurinePyrimidine.toString());
     purinePyrimidineColour.addItemListener(this);
 
-    userDefinedColour.setLabel(MessageManager
-            .getString("action.user_defined"));
+    userDefinedColour
+            .setLabel(MessageManager.getString("action.user_defined"));
     userDefinedColour.addActionListener(this);
 
-    abovePIDColour.setLabel(MessageManager
-            .getString("label.above_identity_threshold"));
+    abovePIDColour.setLabel(
+            MessageManager.getString("label.above_identity_threshold"));
     abovePIDColour.addItemListener(this);
-    modifyPID.setLabel(MessageManager
-            .getString("label.modify_identity_threshold"));
+    modifyPID.setLabel(
+            MessageManager.getString("label.modify_identity_threshold"));
     modifyPID.addActionListener(this);
-    conservationColour.setLabel(MessageManager
-            .getString("action.by_conservation"));
+    conservationColour
+            .setLabel(MessageManager.getString("action.by_conservation"));
     conservationColour.addItemListener(this);
     modifyConservation.setLabel(MessageManager
             .getString("label.modify_conservation_threshold"));
@@ -1162,8 +1169,8 @@ public class APopupMenu extends java.awt.PopupMenu implements
   protected void clustalColour_actionPerformed()
   {
     SequenceGroup sg = getGroup();
-    sg.cs = new ResidueShader(new ClustalxColourScheme(sg,
-            ap.av.getHiddenRepSequences()));
+    sg.cs = new ResidueShader(
+            new ClustalxColourScheme(sg, ap.av.getHiddenRepSequences()));
     refresh();
   }
 
@@ -1217,8 +1224,7 @@ public class APopupMenu extends java.awt.PopupMenu implements
 
   public void purinePyrimidineColour_actionPerformed()
   {
-    getGroup().cs = new ResidueShader(
-            new PurinePyrimidineColourScheme());
+    getGroup().cs = new ResidueShader(new PurinePyrimidineColourScheme());
     refresh();
   }
 
@@ -1232,10 +1238,11 @@ public class APopupMenu extends java.awt.PopupMenu implements
 
     if (abovePIDColour.getState())
     {
-      sg.cs.setConsensus(AAFrequency.calculate(sg.getSequences(ap.av
-              .getHiddenRepSequences()), 0, ap.av.getAlignment().getWidth()));
-      int threshold = SliderPanel.setPIDSliderSource(ap, sg.cs, getGroup()
-              .getName());
+      sg.cs.setConsensus(AAFrequency.calculate(
+              sg.getSequences(ap.av.getHiddenRepSequences()), 0,
+              ap.av.getAlignment().getWidth()));
+      int threshold = SliderPanel.setPIDSliderSource(ap, sg.cs,
+              getGroup().getName());
 
       sg.cs.setThreshold(threshold, ap.av.isIgnoreGapsConsensus());
 
@@ -1261,8 +1268,9 @@ public class APopupMenu extends java.awt.PopupMenu implements
   {
     SequenceGroup sg = getGroup();
     sg.cs = new ResidueShader(new PIDColourScheme());
-    sg.cs.setConsensus(AAFrequency.calculate(sg.getSequences(ap.av
-            .getHiddenRepSequences()), 0, ap.av.getAlignment().getWidth()));
+    sg.cs.setConsensus(AAFrequency.calculate(
+            sg.getSequences(ap.av.getHiddenRepSequences()), 0,
+            ap.av.getAlignment().getWidth()));
     refresh();
   }
 
@@ -1272,8 +1280,9 @@ public class APopupMenu extends java.awt.PopupMenu implements
 
     sg.cs = new ResidueShader(new Blosum62ColourScheme());
 
-    sg.cs.setConsensus(AAFrequency.calculate(sg.getSequences(ap.av
-            .getHiddenRepSequences()), 0, ap.av.getAlignment().getWidth()));
+    sg.cs.setConsensus(AAFrequency.calculate(
+            sg.getSequences(ap.av.getHiddenRepSequences()), 0,
+            ap.av.getAlignment().getWidth()));
 
     refresh();
   }
@@ -1295,10 +1304,9 @@ public class APopupMenu extends java.awt.PopupMenu implements
     if (conservationColour.getState())
     {
       Conservation conservation = Conservation.calculateConservation(
-              "Group", sg
-              .getSequences(ap.av.getHiddenRepSequences()), 0, ap.av
-              .getAlignment().getWidth(), false, ap.av.getConsPercGaps(),
-              false);
+              "Group", sg.getSequences(ap.av.getHiddenRepSequences()), 0,
+              ap.av.getAlignment().getWidth(), false,
+              ap.av.getConsPercGaps(), false);
       sg.getGroupColourScheme().setConservation(conservation);
       SliderPanel.setConservationSlider(ap, sg.cs, sg.getName());
       SliderPanel.showConservationSlider();
@@ -1413,9 +1421,11 @@ public class APopupMenu extends java.awt.PopupMenu implements
     showMenu.removeAll();
     hideMenu.removeAll();
 
-    final List<String> all = Arrays.asList(new String[] { MessageManager
-            .getString("label.all") });
-    addAnnotationTypeToShowHide(showMenu, forSequences, "", all, true, true);
+    final List<String> all = Arrays
+            .asList(new String[]
+            { MessageManager.getString("label.all") });
+    addAnnotationTypeToShowHide(showMenu, forSequences, "", all, true,
+            true);
     addAnnotationTypeToShowHide(hideMenu, forSequences, "", all, true,
             false);
     showMenu.addSeparator();