diff options
| author | Roman Kennke <roman@kennke.org> | 2006-07-26 19:43:59 +0000 |
|---|---|---|
| committer | Roman Kennke <roman@kennke.org> | 2006-07-26 19:43:59 +0000 |
| commit | c8cb7048b2c34cf1952e02be3830356e3947cb15 (patch) | |
| tree | 5c825af61d5ec63715d704a63d8d54cc42d258e1 | |
| parent | 46bcd5182d2757b9cdaecd448101774317778d73 (diff) | |
| download | classpath-c8cb7048b2c34cf1952e02be3830356e3947cb15.tar.gz | |
2006-07-26 Roman Kennke <kennke@aicas.com>
* java/awt/KeyboardFocusManager.java
(getFocusOwner): Don't check permanent owner.
(getGlobalFocusOwner): Don't check permanent owner.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | java/awt/KeyboardFocusManager.java | 10 |
2 files changed, 8 insertions, 8 deletions
@@ -1,3 +1,9 @@ +2006-07-26 Roman Kennke <kennke@aicas.com> + + * java/awt/KeyboardFocusManager.java + (getFocusOwner): Don't check permanent owner. + (getGlobalFocusOwner): Don't check permanent owner. + 2006-07-26 Carsten Neumann <cn-develop@gmx.net> * StrictMath.java (cosh): New method. diff --git a/java/awt/KeyboardFocusManager.java b/java/awt/KeyboardFocusManager.java index 7729c5c4c..0b329ba6e 100644 --- a/java/awt/KeyboardFocusManager.java +++ b/java/awt/KeyboardFocusManager.java @@ -304,10 +304,7 @@ public abstract class KeyboardFocusManager */ public Component getFocusOwner () { - Component owner = (Component) getObject (currentFocusOwners); - if (owner == null) - owner = (Component) getObject (currentPermanentFocusOwners); - return owner; + return (Component) getObject (currentFocusOwners); } /** @@ -323,10 +320,7 @@ public abstract class KeyboardFocusManager */ protected Component getGlobalFocusOwner () { - // Check if there is a temporary focus owner. - Component focusOwner = (Component) getGlobalObject (currentFocusOwners); - - return (focusOwner == null) ? getGlobalPermanentFocusOwner () : focusOwner; + return (Component) getGlobalObject(currentFocusOwners); } /** |