X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTextColourChooser.java;h=e72a0844b157ab809859fbc84a5b0c26ecd44978;hb=140b350c1bb78f0d6b46f9fcbfc523a05c32beba;hp=01d9b81c69641c4ad67eedb10e96c65b06dc8720;hpb=d5bc056b7dff2e83166c0a25df7d52082954297a;p=jalview.git

diff --git a/src/jalview/gui/TextColourChooser.java b/src/jalview/gui/TextColourChooser.java
index 01d9b81..e72a084 100644
--- a/src/jalview/gui/TextColourChooser.java
+++ b/src/jalview/gui/TextColourChooser.java
@@ -20,11 +20,6 @@
  */
 package jalview.gui;
 
-import jalview.datamodel.SequenceGroup;
-import jalview.gui.JalviewColourChooser.ColourChooserListener;
-import jalview.util.MessageManager;
-import jalview.util.dialogrunner.RunResponse;
-
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -32,6 +27,7 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.Callable;
 
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
@@ -40,6 +36,10 @@ import javax.swing.JSlider;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
+import jalview.datamodel.SequenceGroup;
+import jalview.gui.JalviewColourChooser.ColourChooserListener;
+import jalview.util.MessageManager;
+
 public class TextColourChooser
 {
   AlignmentPanel ap;
@@ -102,7 +102,8 @@ public class TextColourChooser
       @Override
       public void mousePressed(MouseEvent e)
       {
-        String ttl = MessageManager.getString("label.select_colour_for_text");
+        String ttl = MessageManager
+                .getString("label.select_colour_for_text");
         ColourChooserListener listener = new ColourChooserListener()
         {
           @Override
@@ -122,7 +123,8 @@ public class TextColourChooser
       @Override
       public void mousePressed(MouseEvent e)
       {
-        String ttl = MessageManager.getString("label.select_colour_for_text");
+        String ttl = MessageManager
+                .getString("label.select_colour_for_text");
         ColourChooserListener listener = new ColourChooserListener()
         {
           @Override
@@ -150,17 +152,14 @@ public class TextColourChooser
         MessageManager.getString("action.cancel") };
     String title = MessageManager
             .getString("label.adjust_foreground_text_colour_threshold");
-    RunResponse action = new RunResponse(JvOptionPane.NO_OPTION) // = 1 Cancel
+    Callable<Void> action = () -> // response for 1 = Cancel
     {
-      @Override
-      public void run()
-      {
-        restoreInitialSettings();
-      }
+      restoreInitialSettings();
+      return null;
     };
-    JvOptionPane.newOptionDialog(alignPanel).addResponse(action)
-            .showInternalDialog(bigpanel, title,
-                    JvOptionPane.YES_NO_CANCEL_OPTION,
+    JvOptionPane.newOptionDialog(alignPanel.alignFrame)
+            .setResponseHandler(1, action).showInternalDialog(bigpanel,
+                    title, JvOptionPane.YES_NO_CANCEL_OPTION,
                     JvOptionPane.PLAIN_MESSAGE, null, options,
                     MessageManager.getString("action.ok"));
   }