X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJvOptionPane.java;fp=src%2Fjalview%2Fgui%2FJvOptionPane.java;h=028e50b0d1e646efdc24cdc65aebeb12d5939180;hb=3459a8a691cb22508d7067f240b7254e588e77d3;hp=bf15b865f405dfdec0f834b423df69fa12fa34d9;hpb=5b27f1062b2203c4c31702e205f4c78e1992063e;p=jalview.git diff --git a/src/jalview/gui/JvOptionPane.java b/src/jalview/gui/JvOptionPane.java index bf15b86..028e50b 100644 --- a/src/jalview/gui/JvOptionPane.java +++ b/src/jalview/gui/JvOptionPane.java @@ -21,24 +21,34 @@ package jalview.gui; -import jalview.util.Platform; -import jalview.util.dialogrunner.DialogRunnerI; - import java.awt.Component; +import java.awt.Dialog.ModalityType; import java.awt.HeadlessException; +import java.awt.Window; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.Executors; import javax.swing.Icon; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JInternalFrame; import javax.swing.JOptionPane; import javax.swing.JPanel; +import javax.swing.UIManager; -public class JvOptionPane extends JOptionPane implements DialogRunnerI, - PropertyChangeListener +import jalview.util.Platform; +import jalview.util.dialogrunner.DialogRunnerI; + +public class JvOptionPane extends JOptionPane + implements DialogRunnerI, PropertyChangeListener { private static final long serialVersionUID = -3019167117756785229L; @@ -55,7 +65,7 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, * option (text); this list allows conversion to index (int) */ List ourOptions; - + public JvOptionPane(final Component parent) { this.parentComponent = Platform.isJS() ? this : parent; @@ -91,7 +101,7 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, switch (optionType) { case JvOptionPane.YES_NO_CANCEL_OPTION: - // FeatureRenderer amendFeatures ?? TODO ?? + // FeatureRenderer amendFeatures ?? TODO ?? // Chimera close // PromptUserConfig // $FALL-THROUGH$ @@ -164,8 +174,10 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, Object message) { // JvOptionPaneTest only; - return isInteractiveMode() ? JOptionPane.showInternalConfirmDialog( - parentComponent, message) : (int) getMockResponse(); + return isInteractiveMode() + ? JOptionPane.showInternalConfirmDialog(parentComponent, + message) + : (int) getMockResponse(); } /** @@ -399,7 +411,6 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, JOptionPane.showMessageDialog(parentComponent, message); } - /** * Adds title and messageType * @@ -506,6 +517,7 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, return JOptionPane.showInputDialog(message, initialSelectionValue); } + /** * centered on parent * @@ -535,15 +547,14 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, public static String showInputDialog(Component parentComponent, String message, String initialSelectionValue) { - + // AnnotationPanel - + return isInteractiveMode() ? JOptionPane.showInputDialog(parentComponent, message, initialSelectionValue) : getMockResponse().toString(); } - /** * input with initial selection @@ -556,9 +567,9 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, public static String showInputDialog(Component parentComponent, Object message, Object initialSelectionValue) { - + // AnnotationPanel - + return isInteractiveMode() ? JOptionPane.showInputDialog(parentComponent, message, initialSelectionValue) @@ -581,13 +592,14 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, // test only - return isInteractiveMode() ? JOptionPane - .showInputDialog(parentComponent, message, title, messageType) + return isInteractiveMode() + ? JOptionPane.showInputDialog(parentComponent, message, title, + messageType) : getMockResponse().toString(); } /** - * Customized input option + * Customized input option * * @param parentComponent * @param message @@ -604,9 +616,9 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, Object[] selectionValues, Object initialSelectionValue) throws HeadlessException { - + // test only - + return isInteractiveMode() ? JOptionPane.showInputDialog(parentComponent, message, title, messageType, icon, selectionValues, @@ -614,8 +626,6 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, : getMockResponse().toString(); } - - /** * internal version * @@ -627,13 +637,12 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, String message) { // test only - + return isInteractiveMode() ? JOptionPane.showInternalInputDialog(parentComponent, message) : getMockResponse().toString(); } - /** * internal with title and messageType * @@ -646,9 +655,9 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, public static String showInternalInputDialog(Component parentComponent, String message, String title, int messageType) { - + // AlignFrame tabbedPane_mousePressed - + return isInteractiveMode() ? JOptionPane.showInternalInputDialog(parentComponent, getPrefix(messageType) + message, title, messageType) @@ -672,7 +681,7 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, Object[] selectionValues, Object initialSelectionValue) { // test only - + return isInteractiveMode() ? JOptionPane.showInternalInputDialog(parentComponent, message, title, messageType, icon, selectionValues, @@ -680,10 +689,8 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, : getMockResponse().toString(); } - ///////////// end of options /////////////// - - + private static void outputMessage(Object message) { System.out.println(">>> JOption Message : " + message.toString()); @@ -717,8 +724,8 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, private static String getPrefix(int messageType) { - String prefix = ""; - + String prefix = ""; + // JavaScript only if (Platform.isJS()) { @@ -756,11 +763,17 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, return new JvOptionPane(parentComponent); } - public void showDialog( - String message, String title, int optionType, int messageType, - Icon icon, Object[] options, Object initialValue) + public void showDialog(String message, String title, int optionType, + int messageType, Icon icon, Object[] options, Object initialValue) { + showDialog(message, title, optionType, messageType, icon, options, + initialValue, true); + } + public void showDialog(String message, String title, int optionType, + int messageType, Icon icon, Object[] options, Object initialValue, + boolean modal) + { if (!isInteractiveMode()) { handleResponse(getMockResponse()); @@ -779,24 +792,130 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, // // 2) UserDefinedColors warning about saving over a name already defined // - + ourOptions = Arrays.asList(options); - - int response = JOptionPane.showOptionDialog(parentComponent, message, title, - optionType, messageType, icon, options, initialValue); - - /* - * In Java, the response is returned to this thread and handled here; - * (for Javascript, see propertyChange) - */ - if (!Platform.isJS()) - /** - * Java only - * - * @j2sIgnore - */ + + if (modal) { - handleResponse(response); + // use a JOptionPane as usual + int response = JOptionPane.showOptionDialog(parentComponent, message, + title, optionType, messageType, icon, options, initialValue); + + /* + * In Java, the response is returned to this thread and handled here; + * (for Javascript, see propertyChange) + */ + if (!Platform.isJS()) + /** + * Java only + * + * @j2sIgnore + */ + { + handleResponse(response); + } + } + else + { + /* + * This is java similar to the swingjs handling, with the callbacks + * attached to the button press of the dialog. This means we can use + * a non-modal JDialog for the confirmation without blocking the GUI. + */ + JOptionPane joptionpane = new JOptionPane(); + // Make button options + int[] buttonActions = { JvOptionPane.YES_OPTION, + JvOptionPane.NO_OPTION, JvOptionPane.CANCEL_OPTION }; + + // we need the strings to make the buttons with actionEventListener + if (options == null) + { + ArrayList options_default = new ArrayList<>(); + options_default + .add(UIManager.getString("OptionPane.yesButtonText")); + if (optionType == JvOptionPane.YES_NO_OPTION + || optionType == JvOptionPane.YES_NO_CANCEL_OPTION) + { + options_default + .add(UIManager.getString("OptionPane.noButtonText")); + } + if (optionType == JvOptionPane.YES_NO_CANCEL_OPTION) + { + options_default + .add(UIManager.getString("OptionPane.cancelButtonText")); + } + options = options_default.toArray(); + } + + ArrayList options_btns = new ArrayList<>(); + Object initialValue_btn = null; + if (!Platform.isJS()) // JalviewJS already uses callback, don't need to add them here + { + for (int i = 0; i < options.length && i < 3; i++) + { + Object o = options[i]; + int buttonAction = buttonActions[i]; + Runnable action = callbacks.get(buttonAction); + JButton jb = new JButton(); + jb.setText((String) o); + jb.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + joptionpane.setValue(buttonAction); + if (action != null) + Executors.defaultThreadFactory().newThread(action).start(); + // joptionpane.transferFocusBackward(); + joptionpane.transferFocusBackward(); + joptionpane.setVisible(false); + // put focus and raise parent window if possible, unless cancel + // button pressed + boolean raiseParent = (parentComponent != null); + if (buttonAction == JvOptionPane.CANCEL_OPTION) + raiseParent = false; + if (optionType == JvOptionPane.YES_NO_OPTION + && buttonAction == JvOptionPane.NO_OPTION) + raiseParent = false; + if (raiseParent) + { + parentComponent.requestFocus(); + if (parentComponent instanceof JInternalFrame) + { + JInternalFrame jif = (JInternalFrame) parentComponent; + jif.show(); + jif.moveToFront(); + jif.grabFocus(); + } + else if (parentComponent instanceof Window) + { + Window w = (Window) parentComponent; + w.toFront(); + w.requestFocus(); + } + } + joptionpane.setVisible(false); + } + }); + options_btns.add(jb); + if (o.equals(initialValue)) + initialValue_btn = jb; + } + } + joptionpane.setMessage(message); + joptionpane.setMessageType(messageType); + joptionpane.setOptionType(optionType); + joptionpane.setIcon(icon); + joptionpane.setOptions( + Platform.isJS() ? options : options_btns.toArray()); + joptionpane.setInitialValue( + Platform.isJS() ? initialValue : initialValue_btn); + + JDialog dialog = joptionpane.createDialog(parentComponent, title); + dialog.setModalityType(modal ? ModalityType.APPLICATION_MODAL + : ModalityType.MODELESS); + dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + dialog.setVisible(true); } } @@ -808,19 +927,19 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, { handleResponse(getMockResponse()); } - + ourOptions = Arrays.asList(options); int response; - if (parentComponent != this) + if (parentComponent != this) { - response = JOptionPane.showInternalOptionDialog(parentComponent, mainPanel, - title, yesNoCancelOption, questionMessage, icon, options, - initresponse); + response = JOptionPane.showInternalOptionDialog(parentComponent, + mainPanel, title, yesNoCancelOption, questionMessage, icon, + options, initresponse); } else { - response = JOptionPane.showOptionDialog(parentComponent, mainPanel, title, - yesNoCancelOption, questionMessage, icon, options, + response = JOptionPane.showOptionDialog(parentComponent, mainPanel, + title, yesNoCancelOption, questionMessage, icon, options, initresponse); } if (!Platform.isJS()) @@ -833,18 +952,18 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, handleResponse(response); } } - + @Override public JvOptionPane setResponseHandler(Object response, Runnable action) { - callbacks.put(response, action); + callbacks.put(response, action); return this; } /** - * JalviewJS signals option selection by a property change event - * for the option e.g. "OK". This methods responds to that by - * running the response action that corresponds to that option. + * JalviewJS signals option selection by a property change event for the + * option e.g. "OK". This methods responds to that by running the response + * action that corresponds to that option. * * @param evt */ @@ -852,7 +971,7 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, public void propertyChange(PropertyChangeEvent evt) { Object newValue = evt.getNewValue(); - int ourOption = ourOptions.indexOf(newValue); + int ourOption = ourOptions.indexOf(newValue); if (ourOption >= 0) { handleResponse(ourOption); @@ -868,8 +987,8 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, public void handleResponse(Object response) { /* - * this test is for NaN in Chrome - */ + * this test is for NaN in Chrome + */ if (response != null && !response.equals(response)) { return; @@ -878,6 +997,7 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, if (action != null) { action.run(); + parentComponent.requestFocus(); } } }