package jalview.jbgui;
import jalview.analysis.AnnotationSorter.SequenceAnnotationOrder;
+import jalview.analysis.GeneticCodeI;
+import jalview.analysis.GeneticCodes;
import jalview.api.SplitContainerI;
import jalview.bin.Cache;
import jalview.gui.JvSwingUtils;
import jalview.gui.Preferences;
-import jalview.io.FileFormat;
+import jalview.io.FileFormats;
+import jalview.schemes.ResidueColourScheme;
import jalview.util.MessageManager;
import jalview.util.Platform;
import java.awt.BorderLayout;
import java.awt.Color;
-import java.awt.Component;
import java.awt.GridLayout;
-import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.FocusAdapter;
import javax.swing.event.MenuEvent;
import javax.swing.event.MenuListener;
+@SuppressWarnings("serial")
public class GAlignFrame extends JInternalFrame
{
protected JMenuBar alignFrameMenuBar = new JMenuBar();
protected JMenuItem closeMenuItem = new JMenuItem();
- protected JMenu colourMenu = new JMenu();
-
- protected JMenu webService = new JMenu();
+ public JMenu webService = new JMenu();// BH 2019 was protected, but not
+ // sufficient for AlignFrame thread run
- protected JMenuItem webServiceNoServices;
+ public JMenuItem webServiceNoServices;// BH 2019 was protected, but not
+ // sufficient for AlignFrame thread run
protected JCheckBoxMenuItem viewBoxesMenuItem = new JCheckBoxMenuItem();
protected JMenu sortByAnnotScore = new JMenu();
- public JLabel statusBar = new JLabel();
+ public JLabel statusBar = new JLabel(); // BH 2019 was protected, but not
+ // sufficient for
+ // AlignFrame.printWriter
protected JMenu outputTextboxMenu = new JMenu();
- protected JRadioButtonMenuItem textColour;
-
- protected JRadioButtonMenuItem userDefinedColour;
-
protected JCheckBoxMenuItem annotationPanelMenuItem = new JCheckBoxMenuItem();
protected JCheckBoxMenuItem colourTextMenuItem = new JCheckBoxMenuItem();
protected JMenuItem redoMenuItem = new JMenuItem();
- protected JCheckBoxMenuItem conservationMenuItem;
-
- protected JRadioButtonMenuItem noColourmenuItem;
-
protected JCheckBoxMenuItem wrapMenuItem = new JCheckBoxMenuItem();
protected JCheckBoxMenuItem renderGapsMenuItem = new JCheckBoxMenuItem();
- protected JCheckBoxMenuItem abovePIDThreshold;
-
public JCheckBoxMenuItem showSeqFeatures = new JCheckBoxMenuItem();
JMenuItem copy = new JMenuItem();
JMenu pasteMenu = new JMenu();
- protected JCheckBoxMenuItem applyToAllGroups;
-
protected JCheckBoxMenuItem seqLimits = new JCheckBoxMenuItem();
protected JCheckBoxMenuItem scaleAbove = new JCheckBoxMenuItem();
protected JCheckBoxMenuItem scaleRight = new JCheckBoxMenuItem();
- protected JMenuItem modifyPID;
+ protected JCheckBoxMenuItem applyToAllGroups;
+
+ protected JMenu colourMenu = new JMenu();
+
+ protected JMenuItem textColour;
+
+ protected JCheckBoxMenuItem conservationMenuItem;
protected JMenuItem modifyConservation;
- protected JMenuItem annotationColour;
+ protected JCheckBoxMenuItem abovePIDThreshold;
+
+ protected JMenuItem modifyPID;
+
+ protected JRadioButtonMenuItem annotationColour;
protected JMenu sortByTreeMenu = new JMenu();
protected JMenu sort = new JMenu();
- protected JMenu calculateTree = new JMenu();
+ protected JMenuItem calculateTree = new JMenuItem();
protected JCheckBoxMenuItem padGapsMenuitem = new JCheckBoxMenuItem();
protected JCheckBoxMenuItem showDbRefsMenuitem = new JCheckBoxMenuItem();
- protected JMenuItem showTranslation = new JMenuItem();
+ protected JMenu showTranslation = new JMenu();
protected JMenuItem showReverse = new JMenuItem();
protected JMenuItem runGroovy = new JMenuItem();
+ protected JMenuItem loadVcf;
+
protected JCheckBoxMenuItem autoCalculate = new JCheckBoxMenuItem();
protected JCheckBoxMenuItem sortByTree = new JCheckBoxMenuItem();
protected JCheckBoxMenuItem applyAutoAnnotationSettings = new JCheckBoxMenuItem();
+ protected JMenuItem openFeatureSettings;
+
private SequenceAnnotationOrder annotationSortOrder;
private boolean showAutoCalculatedAbove = false;
- private Map<KeyStroke, JMenuItem> accelerators = new HashMap<KeyStroke, JMenuItem>();
+ private Map<KeyStroke, JMenuItem> accelerators = new HashMap<>();
private SplitContainerI splitFrame;
{
try
{
+
+ // for Web-page embedding using id=align-frame-div
+ setName("jalview-alignment");
+
jbInit();
setJMenuBar(alignFrameMenuBar);
// dynamically fill save as menu with available formats
- for (String ff : FileFormat.getWritableFormats(true))
+ for (String ff : FileFormats.getInstance().getWritableFormats(true))
{
JMenuItem item = new JMenuItem(ff);
@Override
public void actionPerformed(ActionEvent e)
{
- outputText_actionPerformed(e);
+ outputText_actionPerformed(e.getActionCommand());
}
});
System.err.println(e.toString());
}
- if (!Platform.isAMac())
+ if (Platform.allowMnemonics()) // was "not mac and not JS"
{
closeMenuItem.setMnemonic('C');
outputTextboxMenu.setMnemonic('T');
}
}
- /**
- * Marks as selected the colour menu item matching the given name, or the
- * first item ('None') if no match is found
- *
- * @param colourName
- */
- protected void setColourSelected(String colourName)
- {
- noColourmenuItem.setSelected(true);
- if (colourName == null)
- {
- return;
- }
-
- /*
- * look for a radio button with a name that matches the colour name
- * (note the button text may not as it may be internationalised)
- */
- for (Component menuItem : colourMenu.getMenuComponents())
- {
- if (menuItem instanceof JRadioButtonMenuItem)
- {
- if (colourName.equals(((JRadioButtonMenuItem) menuItem).getName()))
- {
- ((JRadioButtonMenuItem) menuItem).setSelected(true);
- return;
- }
- }
- }
- }
-
private void jbInit() throws Exception
{
initColourMenu();
@Override
public void actionPerformed(ActionEvent e)
{
- saveAs_actionPerformed(e);
+ saveAs_actionPerformed();
}
};
// FIXME getDefaultToolkit throws an exception in Headless mode
- KeyStroke keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_S, Toolkit
- .getDefaultToolkit().getMenuShortcutKeyMask()
- | KeyEvent.SHIFT_MASK, false);
+ KeyStroke keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_S,
+ jalview.util.ShortcutKeyMaskExWrapper.getMenuShortcutKeyMaskEx()
+ | jalview.util.ShortcutKeyMaskExWrapper.SHIFT_DOWN_MASK,
+ false);
addMenuActionAndAccelerator(keyStroke, saveAs, al);
closeMenuItem.setText(MessageManager.getString("action.close"));
- keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_W, Toolkit
- .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+ keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_W,
+ jalview.util.ShortcutKeyMaskExWrapper
+ .getMenuShortcutKeyMaskEx(),
+ false);
al = new ActionListener()
{
@Override
webService.setText(MessageManager.getString("action.web_service"));
JMenuItem selectAllSequenceMenuItem = new JMenuItem(
MessageManager.getString("action.select_all"));
- keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_A, Toolkit
- .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+ keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_A,
+ jalview.util.ShortcutKeyMaskExWrapper
+ .getMenuShortcutKeyMaskEx(),
+ false);
al = new ActionListener()
{
@Override
JMenuItem invertSequenceMenuItem = new JMenuItem(
MessageManager.getString("action.invert_sequence_selection"));
- keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_I, Toolkit
- .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+ keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_I,
+ jalview.util.ShortcutKeyMaskExWrapper
+ .getMenuShortcutKeyMaskEx(),
+ false);
al = new ActionListener()
{
@Override
});
JMenuItem expandAlignment = new JMenuItem(
MessageManager.getString("action.view_flanking_regions"));
- expandAlignment.setToolTipText(MessageManager
- .getString("label.view_flanking_regions"));
+ expandAlignment.setToolTipText(
+ MessageManager.getString("label.view_flanking_regions"));
expandAlignment.addActionListener(new ActionListener()
{
@Override
});
JMenuItem remove2LeftMenuItem = new JMenuItem(
MessageManager.getString("action.remove_left"));
- keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_L, Toolkit
- .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+ keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_L,
+ jalview.util.ShortcutKeyMaskExWrapper
+ .getMenuShortcutKeyMaskEx(),
+ false);
al = new ActionListener()
{
@Override
JMenuItem remove2RightMenuItem = new JMenuItem(
MessageManager.getString("action.remove_right"));
- keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_R, Toolkit
- .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+ keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_R,
+ jalview.util.ShortcutKeyMaskExWrapper
+ .getMenuShortcutKeyMaskEx(),
+ false);
al = new ActionListener()
{
@Override
JMenuItem removeGappedColumnMenuItem = new JMenuItem(
MessageManager.getString("action.remove_empty_columns"));
- keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_E, Toolkit
- .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+ keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_E,
+ jalview.util.ShortcutKeyMaskExWrapper
+ .getMenuShortcutKeyMaskEx(),
+ false);
al = new ActionListener()
{
@Override
JMenuItem removeAllGapsMenuItem = new JMenuItem(
MessageManager.getString("action.remove_all_gaps"));
- keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_E, Toolkit
- .getDefaultToolkit().getMenuShortcutKeyMask()
- | KeyEvent.SHIFT_MASK, false);
+ keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_E,
+ jalview.util.ShortcutKeyMaskExWrapper.getMenuShortcutKeyMaskEx()
+ | jalview.util.ShortcutKeyMaskExWrapper.SHIFT_DOWN_MASK,
+ false);
al = new ActionListener()
{
@Override
viewTextMenuItem_actionPerformed(e);
}
});
- showNonconservedMenuItem.setText(MessageManager
- .getString("label.show_non_conserved"));
+ showNonconservedMenuItem
+ .setText(MessageManager.getString("label.show_non_conserved"));
showNonconservedMenuItem.setState(false);
showNonconservedMenuItem.addActionListener(new ActionListener()
{
JMenuItem removeRedundancyMenuItem = new JMenuItem(
MessageManager.getString("action.remove_redundancy"));
- keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_D, Toolkit
- .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+ keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_D,
+ jalview.util.ShortcutKeyMaskExWrapper
+ .getMenuShortcutKeyMaskEx(),
+ false);
al = new ActionListener()
{
@Override
pairwiseAlignmentMenuItem_actionPerformed(e);
}
});
- JMenuItem PCAMenuItem = new JMenuItem(
- MessageManager.getString("label.principal_component_analysis"));
- PCAMenuItem.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- PCAMenuItem_actionPerformed(e);
- }
- });
- JMenuItem averageDistanceTreeMenuItem = new JMenuItem(
- MessageManager.getString("label.average_distance_identity"));
- averageDistanceTreeMenuItem.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- averageDistanceTreeMenuItem_actionPerformed(e);
- }
- });
- JMenuItem neighbourTreeMenuItem = new JMenuItem(
- MessageManager.getString("label.neighbour_joining_identity"));
- neighbourTreeMenuItem.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- neighbourTreeMenuItem_actionPerformed(e);
- }
- });
this.getContentPane().setLayout(new BorderLayout());
alignFrameMenuBar.setFont(new java.awt.Font("Verdana", 0, 11));
statusBar.setFont(new java.awt.Font("Verdana", 0, 11));
statusBar.setBorder(BorderFactory.createLineBorder(Color.black));
statusBar.setText(MessageManager.getString("label.status_bar"));
- outputTextboxMenu.setText(MessageManager
- .getString("label.out_to_textbox"));
+ outputTextboxMenu
+ .setText(MessageManager.getString("label.out_to_textbox"));
-
- JMenuItem avDistanceTreeBlosumMenuItem = new JMenuItem(
- MessageManager.getString("label.average_distance_blosum62"));
- avDistanceTreeBlosumMenuItem.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- avTreeBlosumMenuItem_actionPerformed(e);
- }
- });
- JMenuItem njTreeBlosumMenuItem = new JMenuItem(
- MessageManager.getString("label.neighbour_blosum62"));
- njTreeBlosumMenuItem.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- njTreeBlosumMenuItem_actionPerformed(e);
- }
- });
annotationPanelMenuItem.setActionCommand("");
- annotationPanelMenuItem.setText(MessageManager
- .getString("label.show_annotations"));
- annotationPanelMenuItem.setState(Cache.getDefault("SHOW_ANNOTATIONS",
- true));
+ annotationPanelMenuItem
+ .setText(MessageManager.getString("label.show_annotations"));
+ annotationPanelMenuItem
+ .setState(Cache.getDefault("SHOW_ANNOTATIONS", true));
annotationPanelMenuItem.addActionListener(new ActionListener()
{
@Override
annotationPanelMenuItem_actionPerformed(e);
}
});
- showAllAlAnnotations.setText(MessageManager
- .getString("label.show_all_al_annotations"));
+ showAllAlAnnotations.setText(
+ MessageManager.getString("label.show_all_al_annotations"));
final boolean isAnnotationPanelShown = annotationPanelMenuItem
.getState();
showAllAlAnnotations.setEnabled(isAnnotationPanelShown);
showAllAnnotations_actionPerformed(false, true);
}
});
- hideAllAlAnnotations.setText(MessageManager
- .getString("label.hide_all_al_annotations"));
+ hideAllAlAnnotations.setText(
+ MessageManager.getString("label.hide_all_al_annotations"));
hideAllAlAnnotations.setEnabled(isAnnotationPanelShown);
hideAllAlAnnotations.addActionListener(new ActionListener()
{
hideAllAnnotations_actionPerformed(false, true);
}
});
- showAllSeqAnnotations.setText(MessageManager
- .getString("label.show_all_seq_annotations"));
+ showAllSeqAnnotations.setText(
+ MessageManager.getString("label.show_all_seq_annotations"));
showAllSeqAnnotations.setEnabled(isAnnotationPanelShown);
showAllSeqAnnotations.addActionListener(new ActionListener()
{
showAllAnnotations_actionPerformed(true, false);
}
});
- hideAllSeqAnnotations.setText(MessageManager
- .getString("label.hide_all_seq_annotations"));
+ hideAllSeqAnnotations.setText(
+ MessageManager.getString("label.hide_all_seq_annotations"));
hideAllSeqAnnotations.setEnabled(isAnnotationPanelShown);
hideAllSeqAnnotations.addActionListener(new ActionListener()
{
final JCheckBoxMenuItem sortAnnByLabel = new JCheckBoxMenuItem(
MessageManager.getString("label.sort_annotations_by_label"));
- sortAnnBySequence
- .setSelected(sortAnnotationsBy == SequenceAnnotationOrder.SEQUENCE_AND_LABEL);
+ sortAnnBySequence.setSelected(
+ sortAnnotationsBy == SequenceAnnotationOrder.SEQUENCE_AND_LABEL);
sortAnnBySequence.addActionListener(new ActionListener()
{
@Override
{
boolean newState = sortAnnBySequence.getState();
sortAnnByLabel.setSelected(false);
- setAnnotationSortOrder(newState ? SequenceAnnotationOrder.SEQUENCE_AND_LABEL
- : SequenceAnnotationOrder.NONE);
+ setAnnotationSortOrder(
+ newState ? SequenceAnnotationOrder.SEQUENCE_AND_LABEL
+ : SequenceAnnotationOrder.NONE);
sortAnnotations_actionPerformed();
}
});
- sortAnnByLabel
- .setSelected(sortAnnotationsBy == SequenceAnnotationOrder.LABEL_AND_SEQUENCE);
+ sortAnnByLabel.setSelected(
+ sortAnnotationsBy == SequenceAnnotationOrder.LABEL_AND_SEQUENCE);
sortAnnByLabel.addActionListener(new ActionListener()
{
@Override
{
boolean newState = sortAnnByLabel.getState();
sortAnnBySequence.setSelected(false);
- setAnnotationSortOrder(newState ? SequenceAnnotationOrder.LABEL_AND_SEQUENCE
- : SequenceAnnotationOrder.NONE);
+ setAnnotationSortOrder(
+ newState ? SequenceAnnotationOrder.LABEL_AND_SEQUENCE
+ : SequenceAnnotationOrder.NONE);
sortAnnotations_actionPerformed();
}
});
colourTextMenuItem = new JCheckBoxMenuItem(
- MessageManager
- .getString("label.colour_text"));
+ MessageManager.getString("label.colour_text"));
colourTextMenuItem.addActionListener(new ActionListener()
{
@Override
undoMenuItem.setEnabled(false);
undoMenuItem.setText(MessageManager.getString("action.undo"));
- keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_Z, Toolkit
- .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+ keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_Z,
+ jalview.util.ShortcutKeyMaskExWrapper
+ .getMenuShortcutKeyMaskEx(),
+ false);
al = new ActionListener()
{
@Override
redoMenuItem.setEnabled(false);
redoMenuItem.setText(MessageManager.getString("action.redo"));
- keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_Y, Toolkit
- .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+ keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_Y,
+ jalview.util.ShortcutKeyMaskExWrapper
+ .getMenuShortcutKeyMaskEx(),
+ false);
al = new ActionListener()
{
@Override
JMenuItem printMenuItem = new JMenuItem(
MessageManager.getString("action.print"));
- keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_P, Toolkit
- .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+ keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_P,
+ jalview.util.ShortcutKeyMaskExWrapper
+ .getMenuShortcutKeyMaskEx(),
+ false);
al = new ActionListener()
{
@Override
JMenuItem findMenuItem = new JMenuItem(
MessageManager.getString("action.find"));
- keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_F, Toolkit
- .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+ keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_F,
+ jalview.util.ShortcutKeyMaskExWrapper
+ .getMenuShortcutKeyMaskEx(),
+ false);
findMenuItem.setToolTipText(JvSwingUtils.wrapTooltip(true,
MessageManager.getString("label.find_tip")));
al = new ActionListener()
};
addMenuActionAndAccelerator(keyStroke, findMenuItem, al);
- showSeqFeatures.setText(MessageManager
- .getString("label.show_sequence_features"));
+ showSeqFeatures.setText(
+ MessageManager.getString("label.show_sequence_features"));
showSeqFeatures.addActionListener(new ActionListener()
{
@Override
* void actionPerformed(ActionEvent actionEvent) {
* showSeqFeaturesHeight_actionPerformed(actionEvent); } });
*/
- showDbRefsMenuitem.setText(MessageManager
- .getString("label.show_database_refs"));
+ showDbRefsMenuitem
+ .setText(MessageManager.getString("label.show_database_refs"));
showDbRefsMenuitem.addActionListener(new ActionListener()
{
}
});
- showNpFeatsMenuitem.setText(MessageManager
- .getString("label.show_non_positional_features"));
+ showNpFeatsMenuitem.setText(
+ MessageManager.getString("label.show_non_positional_features"));
showNpFeatsMenuitem.addActionListener(new ActionListener()
{
}
});
- showGroupConservation.setText(MessageManager
- .getString("label.group_conservation"));
+ showGroupConservation
+ .setText(MessageManager.getString("label.group_conservation"));
showGroupConservation.addActionListener(new ActionListener()
{
});
- showGroupConsensus.setText(MessageManager
- .getString("label.group_consensus"));
+ showGroupConsensus
+ .setText(MessageManager.getString("label.group_consensus"));
showGroupConsensus.addActionListener(new ActionListener()
{
}
});
- showConsensusHistogram.setText(MessageManager
- .getString("label.show_consensus_histogram"));
+ showConsensusHistogram.setText(
+ MessageManager.getString("label.show_consensus_histogram"));
showConsensusHistogram.addActionListener(new ActionListener()
{
}
});
- showSequenceLogo.setText(MessageManager
- .getString("label.show_consensus_logo"));
+ showSequenceLogo
+ .setText(MessageManager.getString("label.show_consensus_logo"));
showSequenceLogo.addActionListener(new ActionListener()
{
}
});
- normaliseSequenceLogo.setText(MessageManager
- .getString("label.norm_consensus_logo"));
+ normaliseSequenceLogo
+ .setText(MessageManager.getString("label.norm_consensus_logo"));
normaliseSequenceLogo.addActionListener(new ActionListener()
{
}
});
- applyAutoAnnotationSettings.setText(MessageManager
- .getString("label.apply_all_groups"));
+ applyAutoAnnotationSettings
+ .setText(MessageManager.getString("label.apply_all_groups"));
applyAutoAnnotationSettings.setState(false);
applyAutoAnnotationSettings.setVisible(true);
applyAutoAnnotationSettings.addActionListener(new ActionListener()
MessageManager.getString("label.show_last"));
buttonGroup.add(showAutoFirst);
buttonGroup.add(showAutoLast);
- final boolean autoFirst = Cache.getDefault(
- Preferences.SHOW_AUTOCALC_ABOVE, false);
+ final boolean autoFirst = Cache
+ .getDefault(Preferences.SHOW_AUTOCALC_ABOVE, false);
showAutoFirst.setSelected(autoFirst);
setShowAutoCalculatedAbove(autoFirst);
showAutoFirst.addActionListener(new ActionListener()
JMenuItem deleteGroups = new JMenuItem(
MessageManager.getString("action.undefine_groups"));
- keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_U, Toolkit
- .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+ keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_U,
+ jalview.util.ShortcutKeyMaskExWrapper
+ .getMenuShortcutKeyMaskEx(),
+ false);
al = new ActionListener()
{
@Override
});
JMenuItem createGroup = new JMenuItem(
- MessageManager.getString("action.create_groups"));
- keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_G, Toolkit
- .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+ MessageManager.getString("action.create_group"));
+ keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_G,
+ jalview.util.ShortcutKeyMaskExWrapper
+ .getMenuShortcutKeyMaskEx(),
+ false);
al = new ActionListener()
{
@Override
JMenuItem unGroup = new JMenuItem(
MessageManager.getString("action.remove_group"));
- keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_G, Toolkit
- .getDefaultToolkit().getMenuShortcutKeyMask()
- | KeyEvent.SHIFT_MASK, false);
+ keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_G,
+ jalview.util.ShortcutKeyMaskExWrapper.getMenuShortcutKeyMaskEx()
+ | jalview.util.ShortcutKeyMaskExWrapper.SHIFT_DOWN_MASK,
+ false);
al = new ActionListener()
{
@Override
addMenuActionAndAccelerator(keyStroke, unGroup, al);
copy.setText(MessageManager.getString("action.copy"));
- keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_C, Toolkit
- .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+ keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_C,
+ jalview.util.ShortcutKeyMaskExWrapper
+ .getMenuShortcutKeyMaskEx(),
+ false);
al = new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{
- copy_actionPerformed(e);
+ copy_actionPerformed();
}
};
addMenuActionAndAccelerator(keyStroke, copy, al);
cut.setText(MessageManager.getString("action.cut"));
- keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_X, Toolkit
- .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+ keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_X,
+ jalview.util.ShortcutKeyMaskExWrapper
+ .getMenuShortcutKeyMaskEx(),
+ false);
al = new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{
- cut_actionPerformed(e);
+ cut_actionPerformed();
}
};
addMenuActionAndAccelerator(keyStroke, cut, al);
@Override
public void actionPerformed(ActionEvent e)
{
- delete_actionPerformed(e);
+ delete_actionPerformed();
}
});
pasteMenu.setText(MessageManager.getString("action.paste"));
JMenuItem pasteNew = new JMenuItem(
MessageManager.getString("label.to_new_alignment"));
- keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_V, Toolkit
- .getDefaultToolkit().getMenuShortcutKeyMask()
- | KeyEvent.SHIFT_MASK, false);
+ keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_V,
+ jalview.util.ShortcutKeyMaskExWrapper.getMenuShortcutKeyMaskEx()
+ | jalview.util.ShortcutKeyMaskExWrapper.SHIFT_DOWN_MASK,
+ false);
al = new ActionListener()
{
@Override
JMenuItem pasteThis = new JMenuItem(
MessageManager.getString("label.to_this_alignment"));
- keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_V, Toolkit
- .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+ keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_V,
+ jalview.util.ShortcutKeyMaskExWrapper
+ .getMenuShortcutKeyMaskEx(),
+ false);
al = new ActionListener()
{
@Override
createPNG(null);
}
});
- createPNG.setActionCommand(MessageManager
- .getString("label.save_png_image"));
+ createPNG.setActionCommand(
+ MessageManager.getString("label.save_png_image"));
JMenuItem font = new JMenuItem(MessageManager.getString("action.font"));
font.addActionListener(new ActionListener()
font_actionPerformed(e);
}
});
- seqLimits.setText(MessageManager
- .getString("label.show_sequence_limits"));
- seqLimits.setState(jalview.bin.Cache.getDefault("SHOW_JVSUFFIX", true));
+ seqLimits.setText(
+ MessageManager.getString("label.show_sequence_limits"));
+ seqLimits.setState(Cache.getDefault("SHOW_JVSUFFIX", true));
seqLimits.addActionListener(new ActionListener()
{
@Override
JMenuItem loadTreeMenuItem = new JMenuItem(
MessageManager.getString("label.load_associated_tree"));
- loadTreeMenuItem.setActionCommand(MessageManager
- .getString("label.load_tree_for_sequence_set"));
+ loadTreeMenuItem.setActionCommand(
+ MessageManager.getString("label.load_tree_for_sequence_set"));
loadTreeMenuItem.addActionListener(new ActionListener()
{
@Override
});
centreColumnLabelsMenuItem.setVisible(true);
centreColumnLabelsMenuItem.setState(false);
- centreColumnLabelsMenuItem.setText(MessageManager
- .getString("label.centre_column_labels"));
+ centreColumnLabelsMenuItem.setText(
+ MessageManager.getString("label.centre_column_labels"));
centreColumnLabelsMenuItem.addActionListener(new ActionListener()
{
@Override
});
followHighlightMenuItem.setVisible(true);
followHighlightMenuItem.setState(true);
- followHighlightMenuItem.setText(MessageManager
- .getString("label.automatic_scrolling"));
+ followHighlightMenuItem
+ .setText(MessageManager.getString("label.automatic_scrolling"));
followHighlightMenuItem.addActionListener(new ActionListener()
{
@Override
public void menuSelected(MenuEvent e)
{
- buildTreeMenu();
+ buildTreeSortMenu();
}
@Override
{
}
});
- sortByAnnotScore.setText(MessageManager
- .getString("label.sort_by_score"));
+ sortByAnnotScore
+ .setText(MessageManager.getString("label.sort_by_score"));
sort.add(sortByAnnotScore);
sort.addMenuListener(new javax.swing.event.MenuListener()
{
sortByAnnotScore.setVisible(false);
calculateTree
- .setText(MessageManager.getString("action.calculate_tree"));
+ .setText(MessageManager.getString("action.calculate_tree_pca"));
padGapsMenuitem.setText(MessageManager.getString("label.pad_gaps"));
- padGapsMenuitem.setState(jalview.bin.Cache
- .getDefault("PAD_GAPS", false));
+ padGapsMenuitem.setState(Cache.getDefault("PAD_GAPS", false));
padGapsMenuitem.addActionListener(new ActionListener()
{
@Override
vamsasStore_actionPerformed(e);
}
});
- showTranslation.setText(MessageManager
- .getString("label.translate_cDNA"));
- showTranslation.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
+
+ /*
+ * Translate as cDNA with sub-menu of translation tables
+ */
+ showTranslation
+ .setText(MessageManager.getString("label.translate_cDNA"));
+ boolean first = true;
+ for (final GeneticCodeI table : GeneticCodes.getInstance()
+ .getCodeTables())
+ {
+ JMenuItem item = new JMenuItem(table.getId() + " " + table.getName());
+ showTranslation.add(item);
+ item.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ showTranslation_actionPerformed(table);
+ }
+ });
+ if (first)
{
- showTranslation_actionPerformed(e);
+ showTranslation.addSeparator();
}
- });
+ first = false;
+ }
+
showReverse.setText(MessageManager.getString("label.reverse"));
showReverse.addActionListener(new ActionListener()
{
showReverse_actionPerformed(false);
}
});
- showReverseComplement.setText(MessageManager
- .getString("label.reverse_complement"));
+ showReverseComplement
+ .setText(MessageManager.getString("label.reverse_complement"));
showReverseComplement.addActionListener(new ActionListener()
{
@Override
showProducts.setText(MessageManager.getString("label.get_cross_refs"));
runGroovy.setText(MessageManager.getString("label.run_groovy"));
- runGroovy.setToolTipText(MessageManager
- .getString("label.run_groovy_tip"));
+ runGroovy.setToolTipText(
+ MessageManager.getString("label.run_groovy_tip"));
runGroovy.addActionListener(new ActionListener()
{
@Override
}
});
- JMenuItem openFeatureSettings = new JMenuItem(
+ openFeatureSettings = new JMenuItem(
MessageManager.getString("action.feature_settings"));
openFeatureSettings.addActionListener(new ActionListener()
{
featureSettings_actionPerformed(e);
}
});
+
+ /*
+ * add sub-menu of database we can fetch from
+ */
JMenuItem fetchSequence = new JMenuItem(
MessageManager.getString("label.fetch_sequences"));
fetchSequence.addActionListener(new ActionListener()
@Override
public void actionPerformed(ActionEvent e)
{
- fetchSequence_actionPerformed(e);
+ fetchSequence_actionPerformed();
}
});
associatedData_actionPerformed(e);
}
});
- autoCalculate.setText(MessageManager
- .getString("label.autocalculate_consensus"));
- autoCalculate.setState(jalview.bin.Cache.getDefault(
- "AUTO_CALC_CONSENSUS", true));
+ loadVcf = new JMenuItem(
+ MessageManager.getString("label.load_vcf_file"));
+ loadVcf.setToolTipText(MessageManager.getString("label.load_vcf"));
+ loadVcf.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ loadVcf_actionPerformed();
+ }
+ });
+ autoCalculate.setText(
+ MessageManager.getString("label.autocalculate_consensus"));
+ autoCalculate.setState(Cache.getDefault("AUTO_CALC_CONSENSUS", true));
autoCalculate.addActionListener(new ActionListener()
{
@Override
autoCalculate_actionPerformed(e);
}
});
- sortByTree.setText(MessageManager
- .getString("label.sort_alignment_new_tree"));
- sortByTree
- .setToolTipText("<html>"
- + MessageManager
- .getString("label.enable_automatically_sort_alignment_when_open_new_tree"));
- sortByTree
- .setState(jalview.bin.Cache.getDefault("SORT_BY_TREE", false));
+ sortByTree.setText(
+ MessageManager.getString("label.sort_alignment_new_tree"));
+ sortByTree.setToolTipText("<html>" + MessageManager.getString(
+ "label.enable_automatically_sort_alignment_when_open_new_tree"));
+ sortByTree.setState(Cache.getDefault("SORT_BY_TREE", false));
sortByTree.addActionListener(new ActionListener()
{
@Override
}
});
- listenToViewSelections.setText(MessageManager
- .getString("label.listen_for_selections"));
+ listenToViewSelections.setText(
+ MessageManager.getString("label.listen_for_selections"));
listenToViewSelections
- .setToolTipText("<html>"
- + MessageManager
- .getString("label.selections_mirror_selections_made_same_sequences_other_views"));
+ .setToolTipText("<html>" + MessageManager.getString(
+ "label.selections_mirror_selections_made_same_sequences_other_views"));
listenToViewSelections.setState(false);
listenToViewSelections.addActionListener(new ActionListener()
{
statusPanel.setLayout(new GridLayout());
JMenuItem showAllSeqs = new JMenuItem(
MessageManager.getString("label.all_sequences"));
- showAllSeqs.setToolTipText(MessageManager
- .getString("label.toggle_sequence_visibility"));
+ showAllSeqs.setToolTipText(
+ MessageManager.getString("label.toggle_sequence_visibility"));
showAllSeqs.addActionListener(new ActionListener()
{
@Override
});
JMenuItem showAllColumns = new JMenuItem(
MessageManager.getString("label.all_columns"));
- showAllColumns.setToolTipText(MessageManager
- .getString("label.toggle_columns_visibility"));
+ showAllColumns.setToolTipText(
+ MessageManager.getString("label.toggle_columns_visibility"));
showAllColumns.addActionListener(new ActionListener()
{
@Override
JMenu hideMenu = new JMenu(MessageManager.getString("action.hide"));
JMenuItem hideSelSequences = new JMenuItem(
MessageManager.getString("label.selected_sequences"));
- hideSelSequences.setToolTipText(MessageManager
- .getString("label.toggle_sequence_visibility"));
+ hideSelSequences.setToolTipText(
+ MessageManager.getString("label.toggle_sequence_visibility"));
hideSelSequences.addActionListener(new ActionListener()
{
@Override
});
JMenuItem hideSelColumns = new JMenuItem(
MessageManager.getString("label.selected_columns"));
- hideSelColumns.setToolTipText(MessageManager
- .getString("label.toggle_columns_visibility"));
+ hideSelColumns.setToolTipText(
+ MessageManager.getString("label.toggle_columns_visibility"));
hideSelColumns.addActionListener(new ActionListener()
{
@Override
showAllhidden_actionPerformed(e);
}
});
- hiddenMarkers.setText(MessageManager
- .getString("action.show_hidden_markers"));
+ hiddenMarkers.setText(
+ MessageManager.getString("action.show_hidden_markers"));
hiddenMarkers.addActionListener(new ActionListener()
{
@Override
JMenuItem invertColSel = new JMenuItem(
MessageManager.getString("action.invert_column_selection"));
- keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_I, Toolkit
- .getDefaultToolkit().getMenuShortcutKeyMask()
- | KeyEvent.ALT_MASK, false);
+ keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_I,
+ jalview.util.ShortcutKeyMaskExWrapper.getMenuShortcutKeyMaskEx()
+ | jalview.util.ShortcutKeyMaskExWrapper.ALT_DOWN_MASK,
+ false);
al = new ActionListener()
{
@Override
});
JMenuItem save = new JMenuItem(MessageManager.getString("action.save"));
- keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_S, Toolkit
- .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+ keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_S,
+ jalview.util.ShortcutKeyMaskExWrapper
+ .getMenuShortcutKeyMaskEx(),
+ false);
al = new ActionListener()
{
@Override
JMenuItem newView = new JMenuItem(
MessageManager.getString("action.new_view"));
- keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_T, Toolkit
- .getDefaultToolkit().getMenuShortcutKeyMask(), false);
+ keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_T,
+ jalview.util.ShortcutKeyMaskExWrapper
+ .getMenuShortcutKeyMaskEx(),
+ false);
al = new ActionListener()
{
@Override
formatMenu.setText(MessageManager.getString("action.format"));
JMenu selectMenu = new JMenu(MessageManager.getString("action.select"));
- idRightAlign.setText(MessageManager
- .getString("label.right_align_sequence_id"));
+
+ idRightAlign.setText(
+ MessageManager.getString("label.right_align_sequence_id"));
idRightAlign.addActionListener(new ActionListener()
{
@Override
});
JMenuItem selectHighlighted = new JMenuItem(
MessageManager.getString("action.select_highlighted_columns"));
- selectHighlighted.setToolTipText(MessageManager
- .getString("tooltip.select_highlighted_columns"));
+ selectHighlighted.setToolTipText(
+ MessageManager.getString("tooltip.select_highlighted_columns"));
al = new ActionListener()
{
@Override
alignFrameMenuBar.add(formatMenu);
alignFrameMenuBar.add(colourMenu);
alignFrameMenuBar.add(calculateMenu);
- alignFrameMenuBar.add(webService);
+ if (!Platform.isJS())
+ {
+ alignFrameMenuBar.add(webService);
+ }
fileMenu.add(fetchSequence);
fileMenu.add(addSequenceMenu);
fileMenu.add(exportAnnotations);
fileMenu.add(loadTreeMenuItem);
fileMenu.add(associatedData);
+ if (!Platform.isJS())
+ {
+ fileMenu.add(loadVcf);
+ }
fileMenu.addSeparator();
fileMenu.add(closeMenuItem);
autoAnnMenu.add(showGroupConsensus);
annotationsMenu.add(autoAnnMenu);
-
sort.add(sortIDMenuItem);
sort.add(sortLengthMenuItem);
sort.add(sortGroupMenuItem);
calculateMenu.add(calculateTree);
calculateMenu.addSeparator();
calculateMenu.add(pairwiseAlignmentMenuItem);
- calculateMenu.add(PCAMenuItem);
calculateMenu.addSeparator();
calculateMenu.add(showTranslation);
calculateMenu.add(showReverse);
calculateMenu.addSeparator();
calculateMenu.add(expandAlignment);
calculateMenu.add(extractScores);
- calculateMenu.addSeparator();
- calculateMenu.add(runGroovy);
+ if (!Platform.isJS())
+ {
+ calculateMenu.addSeparator();
+ calculateMenu.add(runGroovy);
+ }
webServiceNoServices = new JMenuItem(
MessageManager.getString("label.no_services"));
webService.add(webServiceNoServices);
- exportImageMenu.add(htmlMenuItem);
+ if (!Platform.isJS())
+ {
+ exportImageMenu.add(htmlMenuItem);
+ }
exportImageMenu.add(epsFile);
exportImageMenu.add(createPNG);
- exportImageMenu.add(createBioJS);
- exportImageMenu.add(createSVG);
+ if (!Platform.isJS())
+ {
+ exportImageMenu.add(createBioJS);
+ exportImageMenu.add(createSVG);
+ }
addSequenceMenu.add(addFromFile);
addSequenceMenu.add(addFromText);
addSequenceMenu.add(addFromURL);
// selectMenu.add(listenToViewSelections);
}
+ protected void loadVcf_actionPerformed()
+ {
+ }
+
/**
* Constructs the entries on the Colour menu (but does not add them to the
- * menu). The 'name' property of each item is set to the canonical name of the
- * corresponding colour scheme (may not match the display name), to allow
- * selection of items by colour scheme name.
+ * menu).
*/
protected void initColourMenu()
{
@Override
public void actionPerformed(ActionEvent e)
{
- applyToAllGroups_actionPerformed();
+ applyToAllGroups_actionPerformed(applyToAllGroups.isSelected());
}
});
- textColour = new JRadioButtonMenuItem(
- MessageManager.getString("action.set_text_colour"));
+ textColour = new JMenuItem(
+ MessageManager.getString("label.text_colour"));
textColour.addActionListener(new ActionListener()
{
@Override
}
});
- userDefinedColour = new JRadioButtonMenuItem(
- MessageManager
- .getString("action.user_defined"));
- userDefinedColour.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- userDefinedColour_actionPerformed(e);
- }
- });
-
conservationMenuItem = new JCheckBoxMenuItem(
MessageManager.getString("action.by_conservation"));
conservationMenuItem.addActionListener(new ActionListener()
@Override
public void actionPerformed(ActionEvent e)
{
- conservationMenuItem_actionPerformed();
- }
- });
- noColourmenuItem = new JRadioButtonMenuItem(
- MessageManager.getString("label.none"));
- noColourmenuItem.setName("None");
- noColourmenuItem.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- noColourmenuItem_actionPerformed();
+ conservationMenuItem_actionPerformed(
+ conservationMenuItem.isSelected());
}
});
@Override
public void actionPerformed(ActionEvent e)
{
- abovePIDThreshold_actionPerformed();
+ abovePIDThreshold_actionPerformed(abovePIDThreshold.isSelected());
}
});
modifyPID = new JMenuItem(
modifyPID_actionPerformed();
}
});
- modifyConservation = new JMenuItem(
- MessageManager
+ modifyConservation = new JMenuItem(MessageManager
.getString("label.modify_conservation_threshold"));
modifyConservation.addActionListener(new ActionListener()
{
}
});
- annotationColour = new JMenuItem(
+ annotationColour = new JRadioButtonMenuItem(
MessageManager.getString("action.by_annotation"));
+ annotationColour.setName(ResidueColourScheme.ANNOTATION_COLOUR);
annotationColour.addActionListener(new ActionListener()
{
@Override
{
}
- protected void outputText_actionPerformed(ActionEvent e)
+ protected void outputText_actionPerformed(String formatName)
{
}
{
}
- protected void PCAMenuItem_actionPerformed(ActionEvent e)
- {
- }
-
- protected void averageDistanceTreeMenuItem_actionPerformed(ActionEvent e)
- {
- }
-
protected void neighbourTreeMenuItem_actionPerformed(ActionEvent e)
{
}
- protected void njTreeBlosumMenuItem_actionPerformed(ActionEvent e)
- {
- }
-
- protected void avTreeBlosumMenuItem_actionPerformed(ActionEvent e)
- {
- }
-
- protected void userDefinedColour_actionPerformed(ActionEvent e)
- {
- }
-
-
-
- /*
- * protected void covariationColour_actionPerformed() { }
- */
-
- protected void noColourmenuItem_actionPerformed()
- {
- }
-
- protected void conservationMenuItem_actionPerformed()
+ protected void conservationMenuItem_actionPerformed(boolean selected)
{
}
{
}
- protected void abovePIDThreshold_actionPerformed()
+ protected void abovePIDThreshold_actionPerformed(boolean selected)
{
}
{
}
- protected void copy_actionPerformed(ActionEvent e)
+ protected void copy_actionPerformed()
{
}
- protected void cut_actionPerformed(ActionEvent e)
+ protected void cut_actionPerformed()
{
}
- protected void delete_actionPerformed(ActionEvent e)
+ protected void delete_actionPerformed()
{
}
{
}
- protected void applyToAllGroups_actionPerformed()
+ protected void applyToAllGroups_actionPerformed(boolean selected)
{
}
{
}
- protected void saveAs_actionPerformed(ActionEvent e)
+ protected void saveAs_actionPerformed()
{
}
}
- public void showTranslation_actionPerformed(ActionEvent e)
+ public void showTranslation_actionPerformed(GeneticCodeI codeTable)
{
}
}
- public void fetchSequence_actionPerformed(ActionEvent e)
+ public void fetchSequence_actionPerformed()
{
}
}
- public void buildTreeMenu()
+ public void buildTreeSortMenu()
{
}