Find attached a patch that illustrates the idea (couldn't find a recent version of webrev tool online, at least not in http://openjdk.java.net/guide/codeReview.html/webrevHelp.html).

It basically moves identical/equivalent code from the peers to java.awt package. Notice that this is not yet complete, with this change, the methods shouldNativelyFocusHeavyweight() and processSynchronousLightweightTransfer() can be removed from the KeyboardFocusManagerAccessor and KeyboardFocusManagerPeerImpl classes.

Maybe I am missing something important, i.e. why this code has to be in the peers and needs to jump through hoops to satisfy the KFM. ?

Regards, Roman

Am Montag, den 14.11.2011, 22:35 +0100 schrieb Roman Kennke:

diff -r 28f768c41a90 src/share/classes/java/awt/Component.java --- a/src/share/classes/java/awt/Component.java Sat Nov 12 04:13:38 2011 +0400 +++ b/src/share/classes/java/awt/Component.java Tue Nov 15 10:38:32 2011 +0100 @@ -7649,8 +7649,8 @@

// Focus this Component long time = EventQueue.getMostRecentEventTime(); - boolean success = peer.requestFocus - (this, temporary, focusedWindowChangeAllowed, time, cause); + boolean success = peerRequestFocus + (heavyweight, temporary, focusedWindowChangeAllowed, time, cause); if (!success) { KeyboardFocusManager.getCurrentKeyboardFocusManager (appContext).dequeueKeyEvents(time, this); @@ -7665,6 +7665,32 @@ return success; }

+ private boolean peerRequestFocus(Component hw, boolean temporary, boolean
focusedWindowChangeAllowed, long time, Cause cause) { + + if (KeyboardFocusManager. + processSynchronousLightweightTransfer(hw, this, temporary, + focusedWindowChangeAllowed,
time)) + { + return true; + } + + int result = KeyboardFocusManager. + shouldNativelyFocusHeavyweight(hw, this, + temporary,
focusedWindowChangeAllowed, + time, cause); + + switch (result) { + case KeyboardFocusManager.SNFH_FAILURE: + return false; + case KeyboardFocusManager.SNFH_SUCCESS_PROCEED: + return hw.peer.requestFocus(this, temporary,
focusedWindowChangeAllowed, time, cause); + case KeyboardFocusManager.SNFH_SUCCESS_HANDLED: + // Either lightweight or excessive request - all events are
generated. + return true; + } + return false; + } + private boolean isRequestFocusAccepted(boolean temporary, boolean focusedWindowChangeAllowed, CausedFocusEvent.Cause cause) diff -r 28f768c41a90 src/solaris/classes/sun/awt/X11/XComponentPeer.java --- a/src/solaris/classes/sun/awt/X11/XComponentPeer.java Sat Nov 12 04:13:38
2011 +0400 +++ b/src/solaris/classes/sun/awt/X11/XComponentPeer.java Tue Nov 15 10:38:32
2011 +0100 @@ -290,66 +290,48 @@ boolean focusedWindowChangeAllowed, long
time, CausedFocusEvent.Cause cause) { - if (XKeyboardFocusManagerPeer. - processSynchronousLightweightTransfer(target, lightweightChild,
temporary, - focusedWindowChangeAllowed,
time)) - { - return true; + // Currently we just generate focus events like we deal with
lightweight instead of calling + // XSetInputFocus on native window + if (focusLog.isLoggable(PlatformLogger.FINER)) { + focusLog.finer("Proceeding with request to " + + lightweightChild + " in " + target); } + /** + * The problems with requests in non-focused window arise because
shouldNativelyFocusHeavyweight + * checks that native window is focused while appropriate
WINDOW_GAINED_FOCUS has not yet + * been processed - it is in EventQueue. Thus, SNFH allows native
request and stores request record + * in requests list - and it breaks our requests sequence as first
record on WGF should be the last + * focus owner which had focus before WLF. So, we should not add
request record for such requests + * but store this component in mostRecent - and return true as before
for compatibility. + */ + Window parentWindow = SunToolkit.getContainingWindow(target); + if (parentWindow == null) { + return rejectFocusRequestHelper("WARNING: Parent window is null"); + } + XWindowPeer wpeer = (XWindowPeer) parentWindow.getPeer(); + if (wpeer == null) { + return rejectFocusRequestHelper("WARNING: Parent window's peer is
null"); + } + /* + * Passing null 'actualFocusedWindow' as we don't want to restore focus
on it + * when a component inside a Frame is requesting focus. + * See 6314575 for details. + */ + boolean res = wpeer.requestWindowFocus(null);

- int result = XKeyboardFocusManagerPeer. - shouldNativelyFocusHeavyweight(target, lightweightChild, - temporary,
focusedWindowChangeAllowed, - time, cause); - - switch (result) { - case XKeyboardFocusManagerPeer.SNFH_FAILURE: - return false; - case XKeyboardFocusManagerPeer.SNFH_SUCCESS_PROCEED: - // Currently we just generate focus events like we deal with
lightweight instead of calling - // XSetInputFocus on native window - if (focusLog.isLoggable(PlatformLogger.FINER))
focusLog.finer("Proceeding with request to " + - lightweightChild + " in " + target); - /** - * The problems with requests in non-focused window arise because
shouldNativelyFocusHeavyweight - * checks that native window is focused while appropriate
WINDOW_GAINED_FOCUS has not yet - * been processed - it is in EventQueue. Thus, SNFH allows native
request and stores request record - * in requests list - and it breaks our requests sequence as
first record on WGF should be the last - * focus owner which had focus before WLF. So, we should not add
request record for such requests - * but store this component in mostRecent - and return true as
before for compatibility. - */ - Window parentWindow = SunToolkit.getContainingWindow(target); - if (parentWindow == null) { - return rejectFocusRequestHelper("WARNING: Parent window is
null"); - } - XWindowPeer wpeer = (XWindowPeer)parentWindow.getPeer(); - if (wpeer == null) { - return rejectFocusRequestHelper("WARNING: Parent window's
peer is null"); - } - /* - * Passing null 'actualFocusedWindow' as we don't want to restore
focus on it - * when a component inside a Frame is requesting focus. - * See 6314575 for details. - */ - boolean res = wpeer.requestWindowFocus(null); - - if (focusLog.isLoggable(PlatformLogger.FINER))
focusLog.finer("Requested window focus: " + res); - // If parent window can be made focused and has been made
focused(synchronously) - // then we can proceed with children, otherwise we retreat. - if (!(res && parentWindow.isFocused())) { - return rejectFocusRequestHelper("Waiting for asynchronous
processing of the request"); - } - return XKeyboardFocusManagerPeer.deliverFocus(lightweightChild, - (Component)target, - temporary, -
focusedWindowChangeAllowed, - time, cause); - // Motif compatibility code - case XKeyboardFocusManagerPeer.SNFH_SUCCESS_HANDLED: - // Either lightweight or excessive request - all events are
generated. - return true; + if (focusLog.isLoggable(PlatformLogger.FINER)) { + focusLog.finer("Requested window focus: " + res); } - return false; + // If parent window can be made focused and has been made
focused(synchronously) + // then we can proceed with children, otherwise we retreat. + if (!(res && parentWindow.isFocused())) { + return rejectFocusRequestHelper("Waiting for asynchronous
processing of the request"); + } + return XKeyboardFocusManagerPeer.deliverFocus(lightweightChild, + (Component) target, + temporary, + focusedWindowChangeAllowed, + time, cause); }

private boolean rejectFocusRequestHelper(String logMsg) { diff -r 28f768c41a90 src/windows/classes/sun/awt/windows/WComponentPeer.java --- a/src/windows/classes/sun/awt/windows/WComponentPeer.java Sat Nov 12
04:13:38 2011 +0400 +++ b/src/windows/classes/sun/awt/windows/WComponentPeer.java Tue Nov 15
10:38:32 2011 +0100 @@ -660,52 +660,33 @@ boolean focusedWindowChangeAllowed, long time, CausedFocusEvent.Cause cause) { - if (WKeyboardFocusManagerPeer. - processSynchronousLightweightTransfer((Component)target,
lightweightChild, temporary, - focusedWindowChangeAllowed,
time)) - { - return true; + if (focusLog.isLoggable(PlatformLogger.FINER)) { + focusLog.finer("Proceeding with request to " + lightweightChild + "
in " + target); } + Window parentWindow = SunToolkit.getContainingWindow((Component)
target); + if (parentWindow == null) { + return rejectFocusRequestHelper("WARNING: Parent window is null"); + } + WWindowPeer wpeer = (WWindowPeer) parentWindow.getPeer(); + if (wpeer == null) { + return rejectFocusRequestHelper("WARNING: Parent window's peer is
null"); + } + boolean res = wpeer.requestWindowFocus(cause);

- int result = WKeyboardFocusManagerPeer - .shouldNativelyFocusHeavyweight((Component)target,
lightweightChild, - temporary,
focusedWindowChangeAllowed, - time, cause); + if (focusLog.isLoggable(PlatformLogger.FINER)) { + focusLog.finer("Requested window focus: " + res); + } + // If parent window can be made focused and has been made
focused(synchronously) + // then we can proceed with children, otherwise we retreat. + if (!(res && parentWindow.isFocused())) { + return rejectFocusRequestHelper("Waiting for asynchronous
processing of the request"); + } + return WKeyboardFocusManagerPeer.deliverFocus(lightweightChild, + (Component) target, + temporary, + focusedWindowChangeAllowed, + time, cause);

- switch (result) { - case WKeyboardFocusManagerPeer.SNFH_FAILURE: - return false; - case WKeyboardFocusManagerPeer.SNFH_SUCCESS_PROCEED: - if (focusLog.isLoggable(PlatformLogger.FINER)) { - focusLog.finer("Proceeding with request to " +
lightweightChild + " in " + target); - } - Window parentWindow =
SunToolkit.getContainingWindow((Component)target); - if (parentWindow == null) { - return rejectFocusRequestHelper("WARNING: Parent window is
null"); - } - WWindowPeer wpeer = (WWindowPeer)parentWindow.getPeer(); - if (wpeer == null) { - return rejectFocusRequestHelper("WARNING: Parent window's
peer is null"); - } - boolean res = wpeer.requestWindowFocus(cause); - - if (focusLog.isLoggable(PlatformLogger.FINER))
focusLog.finer("Requested window focus: " + res); - // If parent window can be made focused and has been made
focused(synchronously) - // then we can proceed with children, otherwise we retreat. - if (!(res && parentWindow.isFocused())) { - return rejectFocusRequestHelper("Waiting for asynchronous
processing of the request"); - } - return WKeyboardFocusManagerPeer.deliverFocus(lightweightChild, - (Component)target, - temporary, -
focusedWindowChangeAllowed, - time, cause); - - case WKeyboardFocusManagerPeer.SNFH_SUCCESS_HANDLED: - // Either lightweight or excessive request - all events are
generated. - return true; - } - return false; }

private boolean rejectFocusRequestHelper(String logMsg) {