JAL-360 JAL-3975 update parent for text colour dialog - doesn't seem to help but...

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

diff --git a/src/jalview/gui/TextColourChooser.java b/src/jalview/gui/TextColourChooser.java
index 1eba84c..f9ff337 100644 (file)
--- 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;
@@ -40,6 +35,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 +101,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 +122,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
@@ -149,8 +150,8 @@ public class TextColourChooser
     Object[] options = new Object[] { MessageManager.getString("action.ok"),
         MessageManager.getString("action.cancel") };
     String title = MessageManager
-            .getString("label.adjunst_foreground_text_colour_threshold");
-    RunResponse action = new RunResponse(JvOptionPane.NO_OPTION) // Cancel
+            .getString("label.adjust_foreground_text_colour_threshold");
+    Runnable action = new Runnable() // response for 1 = Cancel
     {
       @Override
       public void run()
@@ -158,9 +159,9 @@ public class TextColourChooser
         restoreInitialSettings();
       }
     };
-    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"));
   }