--- a/jdk/src/share/classes/java/awt/Component.java Mon May 21 18:55:36 2012 +0400
+++ b/jdk/src/share/classes/java/awt/Component.java Tue May 22 01:12:16 2012 +0400
@@ -7947,32 +7947,21 @@
if (rootAncestor != null) {
Container rootAncestorRootAncestor =
rootAncestor.getFocusCycleRootAncestor();
-
- final Container fcr = (rootAncestorRootAncestor != null) ?
+ Container fcr = (rootAncestorRootAncestor != null) ?
rootAncestorRootAncestor : rootAncestor;
- AccessController.doPrivileged(new PrivilegedAction() {
- public Object run() {
- KeyboardFocusManager.getCurrentKeyboardFocusManager().
- setGlobalCurrentFocusCycleRoot(fcr);
- return null;
- }
- });
+ KeyboardFocusManager.getCurrentKeyboardFocusManager().
+ setGlobalCurrentFocusCycleRootPriv(fcr);
rootAncestor.requestFocus(CausedFocusEvent.Cause.TRAVERSAL_UP);
} else {
- final Window window = getContainingWindow();
+ Window window = getContainingWindow();
if (window != null) {
Component toFocus = window.getFocusTraversalPolicy().
getDefaultComponent(window);
if (toFocus != null) {
- AccessController.doPrivileged(new PrivilegedAction() {
- public Object run() {
- KeyboardFocusManager.getCurrentKeyboardFocusManager().
- setGlobalCurrentFocusCycleRoot(window);
- return null;
- }
- });
+ KeyboardFocusManager.getCurrentKeyboardFocusManager().
+ setGlobalCurrentFocusCycleRootPriv(window);
toFocus.requestFocus(CausedFocusEvent.Cause.TRAVERSAL_UP);
}
}