X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationChooser.java;fp=src%2Fjalview%2Fgui%2FAnnotationChooser.java;h=5ac76db0f0b4f1f7c54f74f3178822366f6ba664;hb=4d7f98a6dd54d9863ba449ec79dcd95d25ed863d;hp=33c49929919351620eb6954c14d8d63ef48ff825;hpb=619cc880371f3228e6a1fb33c6bfb6e7a7e2622c;p=jalview.git diff --git a/src/jalview/gui/AnnotationChooser.java b/src/jalview/gui/AnnotationChooser.java index 33c4992..5ac76db 100644 --- a/src/jalview/gui/AnnotationChooser.java +++ b/src/jalview/gui/AnnotationChooser.java @@ -62,7 +62,7 @@ public class AnnotationChooser extends JPanel // currently selected 'annotation type' checkboxes private Map selectedTypes = new HashMap(); - + /** * Constructor. * @@ -388,7 +388,7 @@ public class AnnotationChooser extends JPanel final boolean wholeAlignment = this.sg == null; JPanel applyToOptions = new JPanel(new FlowLayout(FlowLayout.LEFT)); CheckboxGroup actingOn = new CheckboxGroup(); - + String forAll = MessageManager.getString("label.all_sequences"); final Checkbox allSequences = new Checkbox(forAll, actingOn, wholeAlignment); @@ -397,7 +397,8 @@ public class AnnotationChooser extends JPanel @Override public void itemStateChanged(ItemEvent evt) { - if (evt.getStateChange() == ItemEvent.SELECTED) { + if (evt.getStateChange() == ItemEvent.SELECTED) + { AnnotationChooser.this.setApplyToSelectedSequences(true); AnnotationChooser.this.setApplyToUnselectedSequences(true); AnnotationChooser.this.changeApplyTo_actionPerformed(); @@ -405,7 +406,7 @@ public class AnnotationChooser extends JPanel } }); applyToOptions.add(allSequences); - + String forSelected = MessageManager .getString("label.selected_sequences"); final Checkbox selectedSequences = new Checkbox(forSelected, actingOn, @@ -425,10 +426,11 @@ public class AnnotationChooser extends JPanel } }); applyToOptions.add(selectedSequences); - + String exceptSelected = MessageManager .getString("label.except_selected_sequences"); - final Checkbox unselectedSequences = new Checkbox(exceptSelected, actingOn, false); + final Checkbox unselectedSequences = new Checkbox(exceptSelected, + actingOn, false); unselectedSequences.setEnabled(!wholeAlignment); unselectedSequences.addItemListener(new ItemListener() { @@ -444,7 +446,7 @@ public class AnnotationChooser extends JPanel } }); applyToOptions.add(unselectedSequences); - + // set member variables to match the initial selection state this.applyToSelectedSequences = selectedSequences.getState() || allSequences.getState(); @@ -476,7 +478,8 @@ public class AnnotationChooser extends JPanel @Override public void itemStateChanged(ItemEvent evt) { - if (evt.getStateChange() == ItemEvent.SELECTED) { + if (evt.getStateChange() == ItemEvent.SELECTED) + { AnnotationChooser.this.setShowSelected(true); AnnotationChooser.this.changeShowHide_actionPerformed(); } @@ -521,7 +524,7 @@ public class AnnotationChooser extends JPanel { JPanel jp = new JPanel(); final Font labelFont = JvSwingUtils.getLabelFont(); - + JButton ok = new JButton(MessageManager.getString("action.ok")); ok.setFont(labelFont); ok.addActionListener(new ActionListener() @@ -533,7 +536,7 @@ public class AnnotationChooser extends JPanel } }); jp.add(ok); - + JButton cancel = new JButton(MessageManager.getString("action.cancel")); cancel.setFont(labelFont); cancel.addActionListener(new ActionListener()