X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJalviewColourChooser.java;h=6dc8a2bf10e4424164e5d806d06b3e32e3821784;hb=fb616bbaa70ca0f8bbae7e076f3c403a737205a9;hp=e0c4eeb54b31c963bf722edc57c7ad0fbe08b902;hpb=217274a8e9ea2ae20d5a6d21989b8b16840ca6f0;p=jalview.git

diff --git a/src/jalview/gui/JalviewColourChooser.java b/src/jalview/gui/JalviewColourChooser.java
index e0c4eeb..6dc8a2b 100644
--- a/src/jalview/gui/JalviewColourChooser.java
+++ b/src/jalview/gui/JalviewColourChooser.java
@@ -1,16 +1,12 @@
 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
@@ -21,6 +17,8 @@ public class JalviewColourChooser
   public interface ColourChooserListener
   {
     void colourSelected(Color c);
+    
+    default void cancel() {};
   }
 
   /**
@@ -41,17 +39,11 @@ public class JalviewColourChooser
     {
       colorChooser.setColor(initialColour);
     }
-    ActionListener al = new ActionListener()
-    {
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        listener.colourSelected(colorChooser.getColor());
-      };
-    };
-    JDialog dialog = JColorChooser.createDialog(parent, title, true,
-            colorChooser, al, null);
-    dialog.setVisible(true);
+    ActionListener onChoose = evt -> listener.colourSelected(colorChooser.getColor());
+    ActionListener onCancel = evt -> listener.cancel();
+	JDialog dialog = JColorChooser.createDialog(parent, title, true, colorChooser,
+		onChoose, onCancel);
+	dialog.setVisible(true);
   }
 
   /**