JAL-3058 refactored raising JColorChooser for JS compatibility

[jalview.git] / src / jalview / gui / AnnotationPanel.java

diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index bf8c709..49d4554 100755 (executable)
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@ -25,8 +25,10 @@ import jalview.datamodel.Annotation;
 import jalview.datamodel.ColumnSelection;
 import jalview.datamodel.HiddenColumns;
 import jalview.datamodel.SequenceI;
+import jalview.gui.JalviewColourChooser.ColourChooserListener;
 import jalview.renderer.AnnotationRenderer;
 import jalview.renderer.AwtRenderPanelI;
+import jalview.schemes.FeatureColour;
 import jalview.schemes.ResidueProperties;
 import jalview.util.Comparison;
 import jalview.util.MessageManager;
@@ -341,12 +343,12 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
     else if (action.equals(COLOUR))
     {
       final Annotation[] fAnot = anot;
-      JColorChooser colorChooser = new JColorChooser();
-      colorChooser.setColor(Color.black);
-      String title = MessageManager.getString("label.select_foreground_colour");
-      ActionListener listener = new ActionListener() {
+      String title = MessageManager
+              .getString("label.select_foreground_colour");
+      ColourChooserListener listener = new ColourChooserListener()
+      {
         @Override
-        public void actionPerformed(ActionEvent e)
+        public void colourSelected(Color c)
         {
           HiddenColumns hiddenColumns = av.getAlignment().getHiddenColumns();
           for (int index : av.getColumnSelection().getSelected())
@@ -357,12 +359,12 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
               {
                 fAnot[index] = new Annotation("", "", ' ', 0);
               }
-              fAnot[index].colour = colorChooser.getColor();
+              fAnot[index].colour = c;
             }
         }};
       };
-      JDialog dialog = JColorChooser.createDialog(this, title, true, colorChooser, listener, null);
-      dialog.setVisible(true);
+      JalviewColourChooser.showColourChooser(this,
+              title, Color.black, listener);
     }
     else
     // HELIX, SHEET or STEM