+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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 <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.gui;
-import jalview.gui.JalviewColourChooser.ColourChooserListener;
-
import java.awt.Color;
import java.awt.Component;
-import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.JColorChooser;
import javax.swing.JComponent;
import javax.swing.JDialog;
-import javax.swing.JPanel;
/**
* A helper class that shows a JColorChooser and passes the selected colour back
public interface ColourChooserListener
{
void colourSelected(Color c);
+
+ default void cancel()
+ {
+ };
}
/**
{
colorChooser.setColor(initialColour);
}
- ActionListener al = new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- listener.colourSelected(colorChooser.getColor());
- };
- };
+ ActionListener onChoose = evt -> listener
+ .colourSelected(colorChooser.getColor());
+ ActionListener onCancel = evt -> listener.cancel();
JDialog dialog = JColorChooser.createDialog(parent, title, true,
- colorChooser, al, null);
+ colorChooser, onChoose, onCancel);
dialog.setVisible(true);
}