working on InputMap issues

hansonr · hansonr · commit 67c32851c40e · 2019-04-04T16:47:49.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/JSComponent.java b/sources/net.sf.j2s.java.core/src/java/awt/JSComponent.java
@@ -477,6 +477,12 @@ public void removeKeyListener(KeyListener l) {
 			((JSComponentUI)ui).enableJSKeys(false);
 	}
 	
+	protected void jsInputMapSet() {
+		if (ui != null)
+			((JSComponentUI)ui).enableJSKeys(true);		
+	}
+
+	
 	
  	/**
  	 * Invoker must be focusable and could cross from popupmenu to associated component
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JComponent.java b/sources/net.sf.j2s.java.core/src/javax/swing/JComponent.java
@@ -2309,6 +2309,7 @@ final InputMap getInputMap(int condition, boolean create) {
 			if (create) {
 				InputMap km = new InputMap();
 				setInputMap(condition, km);
+				jsInputMapSet();
 				return km;
 			}
 			break;

Original file line number	Diff line number	Diff line change
`@@ -2309,6 +2309,7 @@ final InputMap getInputMap(int condition, boolean create) {`
`2309`	`2309`	`if (create) {`
`2310`	`2310`	`InputMap km = new InputMap();`
`2311`	`2311`	`setInputMap(condition, km);`
	`2312`	`+ jsInputMapSet();`
`2312`	`2313`	`return km;`
`2313`	`2314`	`}`
`2314`	`2315`	`break;`