protected JCheckBoxMenuItem applyAutoAnnotationSettings = new JCheckBoxMenuItem();
- private SequenceAnnotationOrder annotationSortOrder;
-
- private boolean showAutoCalculatedAbove = false;
-
private Map<KeyStroke, JMenuItem> accelerators = new HashMap<>();
private SplitContainerI splitFrame;
+ protected JMenuItem sortAnnBySequence;
+
+ protected JMenuItem sortAnnByLabel;
+
+ protected JMenu annotationsMenu;
+
public GAlignFrame()
{
try
JMenu editMenu = new JMenu(MessageManager.getString("action.edit"));
JMenu viewMenu = new JMenu(MessageManager.getString("action.view"));
- JMenu annotationsMenu = new JMenu(
+ annotationsMenu = new JMenu(
MessageManager.getString("action.annotations"));
JMenu showMenu = new JMenu(MessageManager.getString("action.show"));
colourMenu.setText(MessageManager.getString("action.colour"));
SequenceAnnotationOrder sortAnnotationsBy = SequenceAnnotationOrder
.valueOf(Cache.getDefault(Preferences.SORT_ANNOTATIONS,
SequenceAnnotationOrder.NONE.name()));
- final JCheckBoxMenuItem sortAnnBySequence = new JCheckBoxMenuItem(
+ sortAnnBySequence = new JCheckBoxMenuItem(
MessageManager.getString("label.sort_annotations_by_sequence"));
- final JCheckBoxMenuItem sortAnnByLabel = new JCheckBoxMenuItem(
+ sortAnnByLabel = new JCheckBoxMenuItem(
MessageManager.getString("label.sort_annotations_by_label"));
- sortAnnBySequence.setSelected(
- sortAnnotationsBy == SequenceAnnotationOrder.SEQUENCE_AND_LABEL);
sortAnnBySequence.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{
- boolean newState = sortAnnBySequence.getState();
- sortAnnByLabel.setSelected(false);
- setAnnotationSortOrder(
- newState ? SequenceAnnotationOrder.SEQUENCE_AND_LABEL
- : SequenceAnnotationOrder.NONE);
- sortAnnotations_actionPerformed();
+ setAnnotationSortOrder(SequenceAnnotationOrder.SEQUENCE_AND_LABEL);
+ sortAnnotations();
}
});
- sortAnnByLabel.setSelected(
- sortAnnotationsBy == SequenceAnnotationOrder.LABEL_AND_SEQUENCE);
sortAnnByLabel.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{
- boolean newState = sortAnnByLabel.getState();
- sortAnnBySequence.setSelected(false);
- setAnnotationSortOrder(
- newState ? SequenceAnnotationOrder.LABEL_AND_SEQUENCE
- : SequenceAnnotationOrder.NONE);
- sortAnnotations_actionPerformed();
+ setAnnotationSortOrder(SequenceAnnotationOrder.LABEL_AND_SEQUENCE);
+ sortAnnotations();
}
});
colourTextMenuItem = new JCheckBoxMenuItem(
final boolean autoFirst = Cache
.getDefault(Preferences.SHOW_AUTOCALC_ABOVE, false);
showAutoFirst.setSelected(autoFirst);
- setShowAutoCalculatedAbove(autoFirst);
showAutoFirst.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{
- setShowAutoCalculatedAbove(showAutoFirst.isSelected());
- sortAnnotations_actionPerformed();
+ if (setShowAutoCalculatedAbove(showAutoFirst.isSelected()))
+ {
+ sortAnnotations();
+ }
}
});
showAutoLast.setSelected(!showAutoFirst.isSelected());
@Override
public void actionPerformed(ActionEvent e)
{
- setShowAutoCalculatedAbove(!showAutoLast.isSelected());
- sortAnnotations_actionPerformed();
+ if (setShowAutoCalculatedAbove(!showAutoLast.isSelected()))
+ {
+ sortAnnotations();
+ }
}
});
*
* @param sortOrder
*/
- protected void sortAnnotations_actionPerformed()
+ protected void sortAnnotations()
{
}
}
- protected boolean isShowAutoCalculatedAbove()
- {
- return showAutoCalculatedAbove;
- }
-
- protected void setShowAutoCalculatedAbove(boolean showAutoCalculatedAbove)
- {
- this.showAutoCalculatedAbove = showAutoCalculatedAbove;
- }
-
- protected SequenceAnnotationOrder getAnnotationSortOrder()
+ /**
+ * Sets the value of the flag for 'show autocalculated annotations above other
+ * annotations'. Answers true if the value changed, else false.
+ *
+ * @param showAutoCalculatedAbove
+ * @return
+ */
+ protected boolean setShowAutoCalculatedAbove(
+ boolean showAutoCalculatedAbove)
{
- return annotationSortOrder;
+ return false;
}
- protected void setAnnotationSortOrder(
+ public void setAnnotationSortOrder(
SequenceAnnotationOrder annotationSortOrder)
{
- this.annotationSortOrder = annotationSortOrder;
}
public Map<KeyStroke, JMenuItem> getAccelerators()