focus

hansonr · hansonr · commit 776b663ca591 · 2019-01-10T22:40:54.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java b/sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java
@@ -964,13 +964,11 @@ public PrintJob getPrintJob(Frame frame, String jobtitle,
 		return null;
 	}
 
-	private KeyboardFocusManagerPeer focusManager;
+	private static KeyboardFocusManagerPeer focusManager;
 	
 	@Override
 	public KeyboardFocusManagerPeer getKeyboardFocusManagerPeer() {
-		if (focusManager == null)
-			focusManager = new JSFocusManager();
-		return focusManager;
+		return (focusManager == null ? focusManager = new JSFocusPeer() : focusManager);
 	}
 
 	public static void consumeEvent(Object e) {
@@ -990,6 +988,10 @@ public static void consumeEvent(Object e) {
 		 * 
 		 */
 	}
+	
+	public static JSComponentUI getFocusedUI() {
+		return ( /** @j2sNative	document.activeElement && document.activeElement.ui || */ null);
+	}
 
 
 }

Original file line number	Diff line number	Diff line change
`@@ -964,13 +964,11 @@ public PrintJob getPrintJob(Frame frame, String jobtitle,`
`964`	`964`	`return null;`
`965`	`965`	`}`
`966`	`966`
`967`		`- private KeyboardFocusManagerPeer focusManager;`
	`967`	`+ private static KeyboardFocusManagerPeer focusManager;`
`968`	`968`
`969`	`969`	`@Override`
`970`	`970`	`public KeyboardFocusManagerPeer getKeyboardFocusManagerPeer() {`
`971`		`- if (focusManager == null)`
`972`		`- focusManager = new JSFocusManager();`
`973`		`- return focusManager;`
	`971`	`+ return (focusManager == null ? focusManager = new JSFocusPeer() : focusManager);`
`974`	`972`	`}`
`975`	`973`
`976`	`974`	`public static void consumeEvent(Object e) {`
`@@ -990,6 +988,10 @@ public static void consumeEvent(Object e) {`
`990`	`988`	`*`
`991`	`989`	`*/`
`992`	`990`	`}`
	`991`	`+`
	`992`	`+ public static JSComponentUI getFocusedUI() {`
	`993`	`+ return ( /** @j2sNative document.activeElement && document.activeElement.ui \|\| */ null);`
	`994`	`+ }`
`993`	`995`
`994`	`996`
`995`	`997`	`}`