X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FAnnotationColumnChooser.java;h=6b66d9c095984d01a05e29056f0925370c6bdaba;hb=9876fdccf311378e690c1f9e18db52675d427b89;hp=9f3aa7b6da892a9534fa07c5e7ff1aedd8e4d433;hpb=95de746a08351b07696a0c455ef37d866c8104d2;p=jalview.git
diff --git a/src/jalview/gui/AnnotationColumnChooser.java b/src/jalview/gui/AnnotationColumnChooser.java
index 9f3aa7b..6b66d9c 100644
--- a/src/jalview/gui/AnnotationColumnChooser.java
+++ b/src/jalview/gui/AnnotationColumnChooser.java
@@ -1,6 +1,26 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 The Jalview Authors
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
+
package jalview.gui;
-import jalview.controller.AlignViewController;
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.ColumnSelection;
import jalview.schemes.AnnotationColourGradient;
@@ -18,7 +38,6 @@ import java.awt.event.ItemListener;
import java.util.Iterator;
import javax.swing.ButtonGroup;
-import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JInternalFrame;
@@ -39,10 +58,6 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
private JComboBox annotations;
- private JButton ok = new JButton();
-
- private JButton cancel = new JButton();
-
private JPanel actionPanel = new JPanel();
private JPanel thresholdPanel = new JPanel();
@@ -179,6 +194,8 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
});
annotations.addItemListener(this);
+ annotations.setToolTipText(MessageManager
+ .getString("info.select_annotation_row"));
threshold.addActionListener(new ActionListener()
{
@Override
@@ -259,10 +276,26 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
this.add(actionPanel, java.awt.BorderLayout.SOUTH);
selectedAnnotationChanged();
+ updateThresholdPanelToolTip();
this.validate();
}
- @SuppressWarnings("unchecked")
+ public void updateThresholdPanelToolTip()
+ {
+ thresholdValue.setToolTipText("");
+ slider.setToolTipText("");
+
+ String defaultTtip = MessageManager
+ .getString("info.change_threshold_mode_to_enable");
+
+ String threshold = getThreshold().getSelectedItem().toString();
+ if (threshold.equalsIgnoreCase("No Threshold"))
+ {
+ thresholdValue.setToolTipText(defaultTtip);
+ slider.setToolTipText(defaultTtip);
+ }
+ }
+
public void reset()
{
if (this.getOldColumnSelection() != null)
@@ -395,6 +428,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
}
}
+ updateThresholdPanelToolTip();
if (currentStructureFilterPanel != null)
{
if (currentStructureFilterPanel.alphaHelix.isSelected())
@@ -437,9 +471,8 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
}
}
- AlignViewController.filterAnnotations(
- getCurrentAnnotation().annotations, filterParams,
- av.getColumnSelection());
+ av.getColumnSelection().filterAnnotations(
+ getCurrentAnnotation().annotations, filterParams);
av.showAllHiddenColumns();
if (getActionOption() == ACTION_OPTION_HIDE)
@@ -554,7 +587,6 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
updateView();
}
-
public class FurtherActionPanel extends JPanel
{
private AnnotationColumnChooser aColChooser;
@@ -615,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
{
@@ -783,29 +814,30 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
.getString("label.search_filter")));
JvSwingUtils.jvInitComponent(searchBox);
- 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.display_name");
+ 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();
+ }
+ });
+
+ JvSwingUtils.jvInitComponent(displayName, "label.label");
displayName.setEnabled(false);
displayName.addActionListener(new ActionListener()
{
@@ -849,6 +881,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
{
aColChooser.setCurrentSearchPanel(this);
aColChooser.updateView();
+ updateSearchPanelToolTips();
}
public void syncState()
@@ -864,6 +897,23 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
searchBox.setText(sp.searchBox.getText());
}
+ updateSearchPanelToolTips();
+ }
+
+ public void updateSearchPanelToolTips()
+ {
+ String defaultTtip = MessageManager
+ .getString("info.enter_search_text_to_enable");
+ String labelTtip = MessageManager.formatMessage(
+ "info.search_in_annotation_label", annotations
+ .getSelectedItem().toString());
+ String descTtip = MessageManager.formatMessage(
+ "info.search_in_annotation_description", annotations
+ .getSelectedItem().toString());
+ displayName.setToolTipText(displayName.isEnabled() ? labelTtip
+ : defaultTtip);
+ description.setToolTipText(description.isEnabled() ? descTtip
+ : defaultTtip);
}
}