X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTextColourChooser.java;h=5bc6563f8da79a753bd57bc6a35fa8b22c184f83;hb=6caf8e67439a4ea034d8f3575d3f6167c86784d0;hp=86a51ab32efcb2464b2fc40cd6d2976efcc49f1a;hpb=f5cadda2a0b026f7f9be53db4c9b5bc3c6d47a83;p=jalview.git diff --git a/src/jalview/gui/TextColourChooser.java b/src/jalview/gui/TextColourChooser.java index 86a51ab..5bc6563 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; @@ -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,18 +150,14 @@ 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 = () -> // response for 1 = Cancel { - @Override - public void run() - { - restoreInitialSettings(); - } + restoreInitialSettings(); }; - JvOptionPane.newOptionDialog(alignPanel).response(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")); }