git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3058 refactored raising JColorChooser for JS compatibility
[jalview.git]
/
src
/
jalview
/
gui
/
PCAPanel.java
diff --git
a/src/jalview/gui/PCAPanel.java
b/src/jalview/gui/PCAPanel.java
index
7ceceee
..
d2f789f
100644
(file)
--- a/
src/jalview/gui/PCAPanel.java
+++ b/
src/jalview/gui/PCAPanel.java
@@
-27,8
+27,10
@@
import jalview.api.analysis.SimilarityParamsI;
import jalview.datamodel.Alignment;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.AlignmentView;
import jalview.datamodel.Alignment;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.AlignmentView;
+import jalview.datamodel.Annotation;
import jalview.datamodel.HiddenColumns;
import jalview.datamodel.SequenceI;
import jalview.datamodel.HiddenColumns;
import jalview.datamodel.SequenceI;
+import jalview.gui.JalviewColourChooser.ColourChooserListener;
import jalview.jbgui.GPCAPanel;
import jalview.util.MessageManager;
import jalview.viewmodel.AlignmentViewport;
import jalview.jbgui.GPCAPanel;
import jalview.util.MessageManager;
import jalview.viewmodel.AlignmentViewport;
@@
-48,6
+50,7
@@
import java.awt.print.PrinterJob;
import javax.swing.ButtonGroup;
import javax.swing.JCheckBoxMenuItem;
import javax.swing.JColorChooser;
import javax.swing.ButtonGroup;
import javax.swing.JCheckBoxMenuItem;
import javax.swing.JColorChooser;
+import javax.swing.JDialog;
import javax.swing.JMenuItem;
import javax.swing.JRadioButtonMenuItem;
import javax.swing.event.InternalFrameAdapter;
import javax.swing.JMenuItem;
import javax.swing.JRadioButtonMenuItem;
import javax.swing.event.InternalFrameAdapter;
@@
-210,15
+213,18
@@
public class PCAPanel extends GPCAPanel
@Override
public void bgcolour_actionPerformed(ActionEvent e)
{
@Override
public void bgcolour_actionPerformed(ActionEvent e)
{
- Color col = JColorChooser.showDialog(this,
- MessageManager.getString("label.select_background_colour"),
- rc.bgColour);
-
- if (col != null)
+ String ttl = MessageManager.getString("label.select_background_colour");
+ ColourChooserListener listener = new ColourChooserListener()
{
{
- rc.bgColour = col;
- }
- rc.repaint();
+ @Override
+ public void colourSelected(Color c)
+ {
+ rc.bgColour = c;
+ rc.repaint();
+ }
+ };
+ JalviewColourChooser.showColourChooser(this, ttl, rc.bgColour,
+ listener);
}
/**
}
/**