X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGAlignFrame.java;h=37073437e703b65b3b3ad4bac5f22360023122de;hb=567c2595554096f10feab130153f97286f3f7d80;hp=faa0d5d612af40e25b2d42e6ff14fdad9e38552f;hpb=94379c810f9115b8564ee7bac46ed119218d5fd2;p=jalview.git diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java index faa0d5d..3707343 100755 --- a/src/jalview/jbgui/GAlignFrame.java +++ b/src/jalview/jbgui/GAlignFrame.java @@ -25,13 +25,12 @@ 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.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; @@ -66,8 +65,6 @@ public class GAlignFrame extends JInternalFrame protected JMenuItem closeMenuItem = new JMenuItem(); - protected JMenu colourMenu = new JMenu(); - protected JMenu webService = new JMenu(); protected JMenuItem webServiceNoServices; @@ -82,10 +79,6 @@ public class GAlignFrame extends JInternalFrame protected JMenu outputTextboxMenu = new JMenu(); - protected JRadioButtonMenuItem textColour; - - protected JRadioButtonMenuItem userDefinedColour; - protected JCheckBoxMenuItem annotationPanelMenuItem = new JCheckBoxMenuItem(); protected JCheckBoxMenuItem colourTextMenuItem = new JCheckBoxMenuItem(); @@ -96,16 +89,10 @@ public class GAlignFrame extends JInternalFrame 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(); @@ -114,8 +101,6 @@ public class GAlignFrame extends JInternalFrame JMenu pasteMenu = new JMenu(); - protected JCheckBoxMenuItem applyToAllGroups; - protected JCheckBoxMenuItem seqLimits = new JCheckBoxMenuItem(); protected JCheckBoxMenuItem scaleAbove = new JCheckBoxMenuItem(); @@ -124,17 +109,27 @@ public class GAlignFrame extends JInternalFrame 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 JCheckBoxMenuItem abovePIDThreshold; + + protected JMenuItem modifyPID; + protected JMenuItem 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(); @@ -216,7 +211,7 @@ public class GAlignFrame extends JInternalFrame 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); @@ -249,37 +244,6 @@ public class GAlignFrame extends JInternalFrame } } - /** - * 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(); @@ -569,26 +533,6 @@ public class GAlignFrame extends JInternalFrame 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)); @@ -599,27 +543,6 @@ public class GAlignFrame extends JInternalFrame 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")); @@ -1011,7 +934,7 @@ public class GAlignFrame extends JInternalFrame }); JMenuItem createGroup = new JMenuItem( - MessageManager.getString("action.create_groups")); + MessageManager.getString("action.create_group")); keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_G, Toolkit .getDefaultToolkit().getMenuShortcutKeyMask(), false); al = new ActionListener() @@ -1239,7 +1162,7 @@ public class GAlignFrame extends JInternalFrame @Override public void menuSelected(MenuEvent e) { - buildTreeMenu(); + buildTreeSortMenu(); } @Override @@ -1276,8 +1199,8 @@ public class GAlignFrame extends JInternalFrame }); sortByAnnotScore.setVisible(false); - calculateTree - .setText(MessageManager.getString("action.calculate_tree")); + calculateTree.setText(MessageManager + .getString("action.calculate_tree_pca")); padGapsMenuitem.setText(MessageManager.getString("label.pad_gaps")); padGapsMenuitem.setState(jalview.bin.Cache @@ -1689,6 +1612,7 @@ public class GAlignFrame extends JInternalFrame formatMenu.setText(MessageManager.getString("action.format")); JMenu selectMenu = new JMenu(MessageManager.getString("action.select")); + idRightAlign.setText(MessageManager .getString("label.right_align_sequence_id")); idRightAlign.addActionListener(new ActionListener() @@ -1878,7 +1802,7 @@ public class GAlignFrame extends JInternalFrame calculateMenu.add(calculateTree); calculateMenu.addSeparator(); calculateMenu.add(pairwiseAlignmentMenuItem); - calculateMenu.add(PCAMenuItem); + // calculateMenu.add(PCAMenuItem); calculateMenu.addSeparator(); calculateMenu.add(showTranslation); calculateMenu.add(showReverse); @@ -1940,11 +1864,15 @@ public class GAlignFrame extends JInternalFrame // selectMenu.add(listenToViewSelections); } + protected void configureSelectMenu() + { + // TODO Auto-generated method stub + + } + /** * 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() { @@ -1955,12 +1883,12 @@ public class GAlignFrame extends JInternalFrame @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 @@ -1970,18 +1898,6 @@ public class GAlignFrame extends JInternalFrame } }); - 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() @@ -1989,18 +1905,8 @@ public class GAlignFrame extends JInternalFrame @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()); } }); @@ -2011,7 +1917,7 @@ public class GAlignFrame extends JInternalFrame @Override public void actionPerformed(ActionEvent e) { - abovePIDThreshold_actionPerformed(); + abovePIDThreshold_actionPerformed(abovePIDThreshold.isSelected()); } }); modifyPID = new JMenuItem( @@ -2387,37 +2293,11 @@ public class GAlignFrame extends JInternalFrame { } - 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) { } @@ -2433,7 +2313,7 @@ public class GAlignFrame extends JInternalFrame { } - protected void abovePIDThreshold_actionPerformed() + protected void abovePIDThreshold_actionPerformed(boolean selected) { } @@ -2473,7 +2353,7 @@ public class GAlignFrame extends JInternalFrame { } - protected void applyToAllGroups_actionPerformed() + protected void applyToAllGroups_actionPerformed(boolean selected) { } @@ -2701,7 +2581,7 @@ public class GAlignFrame extends JInternalFrame } - public void buildTreeMenu() + public void buildTreeSortMenu() { }