From 4ea0a263a0a750dcf570a9d47a9a1152bae9d88c Mon Sep 17 00:00:00 2001 From: gmungoc Date: Thu, 6 Nov 2014 14:33:26 +0000 Subject: [PATCH] JAL-1152 use a proper RadioButton not a faked one --- src/jalview/jbgui/GAlignFrame.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java index 1e67ff7..599cba8 100755 --- a/src/jalview/jbgui/GAlignFrame.java +++ b/src/jalview/jbgui/GAlignFrame.java @@ -372,9 +372,9 @@ public class GAlignFrame extends JInternalFrame protected JCheckBoxMenuItem applyAutoAnnotationSettings = new JCheckBoxMenuItem(); - protected JCheckBoxMenuItem showAutoFirst = new JCheckBoxMenuItem(); + protected JRadioButtonMenuItem showAutoFirst = new JRadioButtonMenuItem(); - protected JCheckBoxMenuItem showAutoLast = new JCheckBoxMenuItem(); + protected JRadioButtonMenuItem showAutoLast = new JRadioButtonMenuItem(); private JMenuItem grpsFromSelection = new JMenuItem(); @@ -1422,8 +1422,11 @@ public class GAlignFrame extends JInternalFrame } }); + ButtonGroup buttonGroup = new ButtonGroup(); + buttonGroup.add(showAutoFirst); + buttonGroup.add(showAutoLast); showAutoFirst.setText(MessageManager.getString("label.show_first")); - showAutoFirst.setState(Cache.getDefault( + showAutoFirst.setSelected(Cache.getDefault( Preferences.SHOW_AUTOCALC_ABOVE, false)); showAutoFirst.addActionListener(new ActionListener() @@ -1431,22 +1434,18 @@ public class GAlignFrame extends JInternalFrame @Override public void actionPerformed(ActionEvent e) { - boolean sortFirst = showAutoFirst.getState(); - setShowAutoCalculatedAbove(sortFirst); - showAutoLast.setState(!sortFirst); + setShowAutoCalculatedAbove(showAutoFirst.isSelected()); sortAnnotations_actionPerformed(); } }); showAutoLast.setText(MessageManager.getString("label.show_last")); - showAutoLast.setState(!showAutoFirst.getState()); + showAutoLast.setSelected(!showAutoFirst.isSelected()); showAutoLast.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - boolean sortLast = showAutoLast.getState(); - setShowAutoCalculatedAbove(!sortLast); - showAutoFirst.setState(!sortLast); + setShowAutoCalculatedAbove(!showAutoLast.isSelected()); sortAnnotations_actionPerformed(); } }); -- 1.7.10.2