correct outputs for JOptionDialog

BobHanson · BobHanson · commit 04198c4bbc82 · 2020-05-16T01:53:48.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/javajs/async/AsyncDialog.java b/sources/net.sf.j2s.java.core/src/javajs/async/AsyncDialog.java
@@ -63,6 +63,8 @@ public AsyncDialog() {
 	private ActionListener actionListener;
 	private Object choice;
 	private Object[] options;
+	private Object value;
+	private boolean wantsInput;
 
 	// These options can be supplemented as desired.
 
@@ -81,13 +83,15 @@ public static String showInputDialog(Component frame, String msg) {
 
 	public void showInputDialog(Component frame, Object message, ActionListener a) {
 		setListener(a);
+		wantsInput = true;
 		process(JOptionPane.showInputDialog(frame, message));
 		unsetListener();
 	}
 
 	public void showInputDialog(Component frame, Object message, String title, int messageType, Icon icon,
 			Object[] selectionValues, Object initialSelectionValue, ActionListener a) {
 		setListener(a);
+		wantsInput = true;
 		process(JOptionPane.showInputDialog(frame, message, title, messageType, icon, selectionValues,
 				initialSelectionValue));
 		unsetListener();
@@ -214,21 +218,21 @@ private void unsetListener() {
 	 */
 	@Override
 	public void propertyChange(PropertyChangeEvent evt) {
-		Object val = evt.getNewValue();
+		value = evt.getNewValue();
 		switch (evt.getPropertyName()) {
 		case "inputValue":			
-			process(val);
+			process(value);
 			break;
 		case "value":
-			if (val != null && options == null && !(val instanceof Integer)) {
-				process(getOptionIndex(((JOptionPane) evt.getSource()).getOptions(), val));
+			if (value != null && options == null && !(value instanceof Integer)) {
+				process(getOptionIndex(((JOptionPane) evt.getSource()).getOptions(), value));
 				return;
 			}
 			if (options != null) {
-				int i = getOptionIndex(options, val);
-				val = Integer.valueOf(i >= 0 ? i : JOptionPane.CLOSED_OPTION);
+				int i = getOptionIndex(options, value);
+				value = Integer.valueOf(i >= 0 ? i : JOptionPane.CLOSED_OPTION);
 			} 
-			process(val);
+			process(value);
 			break;
 		}
 	}
@@ -242,6 +246,13 @@ private int getOptionIndex(Object[] options, Object val) {
 		return -1;
 	}
 
+	public Object getValue() {
+		if (wantsInput || options == null)
+			return value;
+		int val = ((Integer) value).intValue();
+		return (val < 0 ? null : options[val]);
+	}
+	
 	private boolean processed;
 
 	/**
