X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationColumnChooser.java;h=c0d7084d2c932cf5006eee562a7f9b4e37e0b04e;hb=4d7f98a6dd54d9863ba449ec79dcd95d25ed863d;hp=e87be356f2f82a429a13fd87edf462b768472d8a;hpb=5d44cd39caf9a34e9b934b2e2e04fd664d24bfd6;p=jalview.git diff --git a/src/jalview/gui/AnnotationColumnChooser.java b/src/jalview/gui/AnnotationColumnChooser.java index e87be35..c0d7084 100644 --- a/src/jalview/gui/AnnotationColumnChooser.java +++ b/src/jalview/gui/AnnotationColumnChooser.java @@ -66,6 +66,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements private CardLayout switchableViewsLayout = (CardLayout) (switchableViewsPanel .getLayout()); + private JPanel noGraphFilterView = new JPanel(); private JPanel graphFilterView = new JPanel(); @@ -294,6 +295,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements slider.setToolTipText(defaultTtip); } } + public void reset() { if (this.getOldColumnSelection() != null) @@ -585,7 +587,6 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements updateView(); } - public class FurtherActionPanel extends JPanel { private AnnotationColumnChooser aColChooser; @@ -646,8 +647,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements { if (aColChooser.getActionOption() == AnnotationColumnChooser.ACTION_OPTION_HIDE) { - this.optionsGroup.setSelected(this.hideOption.getModel(), - true); + this.optionsGroup.setSelected(this.hideOption.getModel(), true); } else { @@ -816,27 +816,26 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements JvSwingUtils.jvInitComponent(searchBox); searchBox.setToolTipText(MessageManager .getString("info.enter_search_text_here")); - searchBox.getDocument().addDocumentListener( - new DocumentListener() - { - @Override - public void insertUpdate(DocumentEvent e) - { - searchStringAction(); - } - - @Override - public void removeUpdate(DocumentEvent e) - { - searchStringAction(); - } - - @Override - public void changedUpdate(DocumentEvent e) - { - searchStringAction(); - } - }); + searchBox.getDocument().addDocumentListener(new DocumentListener() + { + @Override + public void insertUpdate(DocumentEvent e) + { + searchStringAction(); + } + + @Override + public void removeUpdate(DocumentEvent e) + { + searchStringAction(); + } + + @Override + public void changedUpdate(DocumentEvent e) + { + searchStringAction(); + } + }); JvSwingUtils.jvInitComponent(displayName, "label.label"); displayName.setEnabled(false); @@ -905,15 +904,14 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements { String defaultTtip = MessageManager .getString("info.enter_search_text_to_enable"); - String labelTtip = MessageManager -.formatMessage( + String labelTtip = MessageManager.formatMessage( "info.search_in_annotation_label", annotations .getSelectedItem().toString()); - String descTtip = MessageManager -.formatMessage( + String descTtip = MessageManager.formatMessage( "info.search_in_annotation_description", annotations .getSelectedItem().toString()); - displayName.setToolTipText(displayName.isEnabled() ? labelTtip : defaultTtip); + displayName.setToolTipText(displayName.isEnabled() ? labelTtip + : defaultTtip); description.setToolTipText(description.isEnabled() ? descTtip : defaultTtip); }