fixes InnerXXXXDialog to remove focus manager calls

BobHanson · BobHanson · commit 017ed66caf83 · 2018-07-03T20:20:09.000+01:00
diff --git a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JOptionPane.java b/sources/net.sf.j2s.java.core/src/javax/swing/JOptionPane.java
@@ -1387,7 +1387,7 @@ public static int showInternalOptionDialog(Component parentComponent, Object mes
 			int messageType, Icon icon, Object[] options, Object initialValue) {
 		JOptionPane pane = new JOptionPane(message, messageType, optionType, icon, options, initialValue);
 		pane.putClientProperty(ClientPropertyKey.PopupFactory_FORCE_HEAVYWEIGHT_POPUP, Boolean.TRUE);
-		Component fo = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
+		//Component fo = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
 		//
 		pane.setInitialValue(initialValue);
 
@@ -1435,9 +1435,9 @@ public static int showInternalOptionDialog(Component parentComponent, Object mes
 
 		Object selectedValue = pane.getValue();
 
-		if (fo != null && fo.isShowing()) {
-			fo.requestFocus();
-		}
+//		if (fo != null && fo.isShowing()) {
+//			fo.requestFocus();
+//		}
 		if (selectedValue == null) {
 			return CLOSED_OPTION;
 		}
@@ -1524,7 +1524,8 @@ public static Object showInternalInputDialog(Component parentComponent, Object m
 			int messageType, Icon icon, Object[] selectionValues, Object initialSelectionValue) {
 		JOptionPane pane = new JOptionPane(message, messageType, OK_CANCEL_OPTION, icon, null, null);
 		pane.putClientProperty(ClientPropertyKey.PopupFactory_FORCE_HEAVYWEIGHT_POPUP, Boolean.TRUE);
-		Component fo = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
+		
+	//	Component fo = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
 
 		pane.setWantsInput(true);
 		pane.setSelectionValues(selectionValues);
@@ -1575,9 +1576,9 @@ public static Object showInternalInputDialog(Component parentComponent, Object m
 			}
 		}
 
-		if (fo != null && fo.isShowing()) {
-			fo.requestFocus();
-		}
+//		if (fo != null && fo.isShowing()) {
+//			fo.requestFocus();
+//		}
 		Object value = pane.getInputValue();
 
 		if (value == UNINITIALIZED_VALUE) {
diff --git a/sources/net.sf.j2s.java.core/srcjs/swingjs2.js b/sources/net.sf.j2s.java.core/srcjs/swingjs2.js
@@ -14221,7 +14221,7 @@ var minimalObjNames = [ "equals", "equals$O", "hashCode" /*"toString",*/  ];
   addProto(proto, "finalize", function () {});
   addProto(proto, "notify", function () {});
   addProto(proto, "notifyAll", function () {});
-  addProto(proto, "wait", function () {alert("Object.wait was called!" + arguments.callee.caller.toString()});
+  addProto(proto, "wait", function () {alert("Object.wait was called!" + arguments.callee.caller.toString())});
   addProto(proto, "to$tring", Object.prototype.toString);
   addProto(proto, "toString", function () { return (this.__CLASS_NAME__ ? "[" + this.__CLASS_NAME__ + " object]" : this.to$tring.apply(this, arguments)); });
 
