Mercurial > hg > release > icedtea7-forest-2.0 > jdk
changeset 4581:1d04b88d06f2
7116384: backout the unallowed changes in the KeyboardFocusManager.java javadoc
Reviewed-by: art, bagiras
author | ant |
---|---|
date | Fri, 02 Dec 2011 10:44:11 +0400 |
parents | 4fe44cde3384 |
children | c90dba86a584 |
files | src/share/classes/java/awt/KeyboardFocusManager.java |
diffstat | 1 files changed, 6 insertions(+), 50 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/awt/KeyboardFocusManager.java Wed Oct 26 14:29:43 2011 +0400 +++ b/src/share/classes/java/awt/KeyboardFocusManager.java Fri Dec 02 10:44:11 2011 +0400 @@ -522,9 +522,6 @@ * <code>getFocusOwner()</code>. Use <code>Component.requestFocus()</code> * or <code>Component.requestFocusInWindow()</code> to change the focus * owner, subject to platform limitations. - * <p> - * This method will throw a SecurityException if this KeyboardFocusManager - * is not the current KeyboardFocusManager for the calling thread's context. * * @param focusOwner the focus owner * @see #getFocusOwner @@ -532,14 +529,10 @@ * @see Component#requestFocus() * @see Component#requestFocusInWindow() * @see Component#isFocusable - * @throws SecurityException if this KeyboardFocusManager is not the - * current KeyboardFocusManager for the calling thread's context * @beaninfo * bound: true */ - protected void setGlobalFocusOwner(Component focusOwner) - throws SecurityException - { + protected void setGlobalFocusOwner(Component focusOwner) { Component oldFocusOwner = null; boolean shouldFire = false; @@ -591,18 +584,11 @@ * a new Component to receive focus, or a Component is given focus * explicitly via a call to <code>requestFocus()</code>. This operation * does not change the focused or active Windows. - * <p> - * This method will throw a SecurityException if this KeyboardFocusManager - * is not the current KeyboardFocusManager for the calling thread's context. * * @see Component#requestFocus() * @see java.awt.event.FocusEvent#FOCUS_LOST - * @throws SecurityException if this KeyboardFocusManager is not the - * current KeyboardFocusManager for the calling thread's context */ - public void clearGlobalFocusOwner() - throws SecurityException - { + public void clearGlobalFocusOwner() { synchronized (KeyboardFocusManager.class) { checkCurrentKFMSecurity(); } @@ -705,10 +691,6 @@ * <code>Component.requestFocus()</code> or * <code>Component.requestFocusInWindow()</code> to change the focus owner, * subject to platform limitations. - * <p> - * This method will throw a SecurityException if this KeyboardFocusManager - * is not the current KeyboardFocusManager for the calling thread's - * context. * * @param permanentFocusOwner the permanent focus owner * @see #getPermanentFocusOwner @@ -716,14 +698,10 @@ * @see Component#requestFocus() * @see Component#requestFocusInWindow() * @see Component#isFocusable - * @throws SecurityException if this KeyboardFocusManager is not the - * current KeyboardFocusManager for the calling thread's context * @beaninfo * bound: true */ - protected void setGlobalPermanentFocusOwner(Component permanentFocusOwner) - throws SecurityException - { + protected void setGlobalPermanentFocusOwner(Component permanentFocusOwner) { Component oldPermanentFocusOwner = null; boolean shouldFire = false; @@ -812,9 +790,6 @@ * <code>Component.requestFocus()</code> or * <code>Component.requestFocusInWindow()</code> to change the focused * Window, subject to platform limitations. - * <p> - * This method will throw a SecurityException if this KeyboardFocusManager - * is not the current KeyboardFocusManager for the calling thread's context. * * @param focusedWindow the focused Window * @see #getFocusedWindow @@ -822,14 +797,10 @@ * @see Component#requestFocus() * @see Component#requestFocusInWindow() * @see Window#isFocusableWindow - * @throws SecurityException if this KeyboardFocusManager is not the - * current KeyboardFocusManager for the calling thread's context * @beaninfo * bound: true */ - protected void setGlobalFocusedWindow(Window focusedWindow) - throws SecurityException - { + protected void setGlobalFocusedWindow(Window focusedWindow) { Window oldFocusedWindow = null; boolean shouldFire = false; @@ -921,23 +892,16 @@ * <code>Component.requestFocus()</code> or * <code>Component.requestFocusInWindow()</code>to change the active * Window, subject to platform limitations. - * <p> - * This method will throw a SecurityException if this KeyboardFocusManager - * is not the current KeyboardFocusManager for the calling thread's context. * * @param activeWindow the active Window * @see #getActiveWindow * @see #getGlobalActiveWindow * @see Component#requestFocus() * @see Component#requestFocusInWindow() - * @throws SecurityException if this KeyboardFocusManager is not the - * current KeyboardFocusManager for the calling thread's context * @beaninfo * bound: true */ - protected void setGlobalActiveWindow(Window activeWindow) - throws SecurityException - { + protected void setGlobalActiveWindow(Window activeWindow) { Window oldActiveWindow; synchronized (KeyboardFocusManager.class) { checkCurrentKFMSecurity(); @@ -1250,22 +1214,14 @@ * <p> * This method is intended to be used only by KeyboardFocusManagers and * focus implementations. It is not for general client use. - * <p> - * This method will throw a SecurityException if this KeyboardFocusManager - * is not the current KeyboardFocusManager for the calling thread's - * context. * * @param newFocusCycleRoot the new focus cycle root * @see #getCurrentFocusCycleRoot * @see #getGlobalCurrentFocusCycleRoot - * @throws SecurityException if this KeyboardFocusManager is not the - * current KeyboardFocusManager for the calling thread's context * @beaninfo * bound: true */ - public void setGlobalCurrentFocusCycleRoot(Container newFocusCycleRoot) - throws SecurityException - { + public void setGlobalCurrentFocusCycleRoot(Container newFocusCycleRoot) { Container oldFocusCycleRoot; synchronized (KeyboardFocusManager.class) {