X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJvOptionPane.java;h=733223d7792480caf2731cb51812d7748e988092;hb=0e8bd9f4db76c85561be7e65f1e987c2d78b4fd6;hp=5bbe75f9bc73a6bf37ac748f5c656abce0b44e5c;hpb=26b115b0a77d521da92a06572d9b7819c2d0d49a;p=jalview.git diff --git a/src/jalview/gui/JvOptionPane.java b/src/jalview/gui/JvOptionPane.java index 5bbe75f..733223d 100644 --- a/src/jalview/gui/JvOptionPane.java +++ b/src/jalview/gui/JvOptionPane.java @@ -21,9 +21,6 @@ package jalview.gui; -import jalview.util.Platform; -import jalview.util.dialogrunner.DialogRunnerI; - import java.awt.Component; import java.awt.HeadlessException; import java.beans.PropertyChangeEvent; @@ -37,8 +34,11 @@ import javax.swing.Icon; import javax.swing.JOptionPane; import javax.swing.JPanel; -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 +55,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 +91,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 +164,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 +401,6 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, JOptionPane.showMessageDialog(parentComponent, message); } - /** * Adds title and messageType * @@ -506,6 +507,7 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, return JOptionPane.showInputDialog(message, initialSelectionValue); } + /** * centered on parent * @@ -535,15 +537,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 +557,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 +582,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 +606,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 +616,6 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, : getMockResponse().toString(); } - - /** * internal version * @@ -627,13 +627,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 +645,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 +671,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 +679,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 +714,8 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, private static String getPrefix(int messageType) { - String prefix = ""; - + String prefix = ""; + // JavaScript only if (Platform.isJS()) { @@ -756,9 +753,8 @@ 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) { if (!isInteractiveMode()) @@ -779,17 +775,22 @@ 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); - + + 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); } @@ -803,38 +804,43 @@ 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()) + /** + * Java only + * + * @j2sIgnore + */ { 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 */ @@ -842,7 +848,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); @@ -858,8 +864,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; @@ -868,6 +874,7 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI, if (action != null) { action.run(); + parentComponent.requestFocus(); } } }