import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.GraphLine;
import jalview.datamodel.SequenceGroup;
+import jalview.gui.JalviewColourChooser.ColourChooserListener;
import jalview.schemes.AnnotationColourGradient;
import jalview.schemes.ColourSchemeI;
import jalview.util.MessageManager;
import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JCheckBox;
-import javax.swing.JColorChooser;
import javax.swing.JComboBox;
import javax.swing.JInternalFrame;
import javax.swing.JLayeredPane;
private JCheckBox useOriginalColours = new JCheckBox();
- private JPanel minColour = new JPanel();
+ JPanel minColour = new JPanel();
- private JPanel maxColour = new JPanel();
+ JPanel maxColour = new JPanel();
private JCheckBox thresholdIsMin = new JCheckBox();
{
if (minColour.isEnabled())
{
- minColour_actionPerformed();
+ showColourChooser(minColour, "label.select_colour_minimum_value");
}
}
});
{
if (maxColour.isEnabled())
{
- maxColour_actionPerformed();
+ showColourChooser(maxColour, "label.select_colour_maximum_value");
}
}
});
Cache.getDefaultColour("ANNOTATIONCOLOUR_MAX", Color.red));
}
- public void minColour_actionPerformed()
+ protected void showColourChooser(JPanel colourPanel, String titleKey)
{
- Color col = JColorChooser.showDialog(this,
- MessageManager.getString("label.select_colour_minimum_value"),
- minColour.getBackground());
- if (col != null)
+ String ttl = MessageManager.getString(titleKey);
+ ColourChooserListener listener = new ColourChooserListener()
{
- minColour.setBackground(col);
- }
- minColour.repaint();
- updateView();
- }
-
- public void maxColour_actionPerformed()
- {
- Color col = JColorChooser.showDialog(this,
- MessageManager.getString("label.select_colour_maximum_value"),
- maxColour.getBackground());
- if (col != null)
- {
- maxColour.setBackground(col);
- }
- maxColour.repaint();
- updateView();
+ @Override
+ public void colourSelected(Color c)
+ {
+ colourPanel.setBackground(c);
+ colourPanel.repaint();
+ updateView();
+ }
+ };
+ JalviewColourChooser.showColourChooser(Desktop.getDesktop(), ttl,
+ colourPanel.getBackground(), listener);
}
@Override