From: Jim Procter Date: Fri, 6 Jul 2018 13:29:34 +0000 (+0100) Subject: JAL-3048 internalDialog with dialogRunner X-Git-Tag: Release_2_11_4_0~45^2~18^2~569 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=13391b836bdc59c53cd8e8aba8d449629307d9b7;p=jalview.git JAL-3048 internalDialog with dialogRunner --- diff --git a/src/jalview/gui/JvOptionPane.java b/src/jalview/gui/JvOptionPane.java index 4e443e7..89899e2 100644 --- a/src/jalview/gui/JvOptionPane.java +++ b/src/jalview/gui/JvOptionPane.java @@ -34,6 +34,7 @@ import java.util.List; import javax.swing.Icon; import javax.swing.JOptionPane; +import javax.swing.JPanel; public class JvOptionPane extends JOptionPane implements DialogRunnerI, PropertyChangeListener @@ -759,6 +760,45 @@ public class JvOptionPane extends JOptionPane } + public void showInternalDialog(JPanel mainPanel, String title, + int yesNoCancelOption, int questionMessage, Icon icon, + Object[] options, String initresponse) + { + if (!isInteractiveMode()) + { + runner.firstRun((int) getMockResponse()); + } + Component parent; + /** + * @j2sNative parent = this; + */ + { + parent = parentComponent; + } + ; + ourOptions = Arrays.asList(options); + + int response; + if (parent!=this) { + + response = JOptionPane.showInternalOptionDialog(parent, mainPanel, + title, yesNoCancelOption, questionMessage, icon, options, + initresponse); + } + else + { + response = JOptionPane.showOptionDialog(parent, mainPanel, title, + yesNoCancelOption, questionMessage, icon, options, + initresponse); + } + /** + * @j2sNative + */ + { + runner.firstRun(response); + } + + } @Override public JvOptionPane response(RunResponse action) { @@ -788,4 +828,5 @@ public class JvOptionPane extends JOptionPane } } + }