diff options
Diffstat (limited to 'libjava/java/awt/DefaultFocusTraversalPolicy.java')
| -rw-r--r-- | libjava/java/awt/DefaultFocusTraversalPolicy.java | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/libjava/java/awt/DefaultFocusTraversalPolicy.java b/libjava/java/awt/DefaultFocusTraversalPolicy.java index 73b1e95..f49f386 100644 --- a/libjava/java/awt/DefaultFocusTraversalPolicy.java +++ b/libjava/java/awt/DefaultFocusTraversalPolicy.java @@ -92,19 +92,17 @@ public class DefaultFocusTraversalPolicy && comp.enabled) { if (comp.isFocusTraversableOverridden != 0 - && comp.isFocusTraversable ()) - return true; - else - { - if (!(comp instanceof Canvas - || comp instanceof Panel - || comp instanceof Label - || comp instanceof ScrollPane - || comp instanceof Scrollbar - || comp instanceof Window - || comp.isLightweight ())) - return true; - } + && (comp.isFocusTraversable () || comp.isFocusable())) + return true; + + if (!(comp instanceof Canvas + || comp instanceof Panel + || comp instanceof Label + || comp instanceof ScrollPane + || comp instanceof Scrollbar + || comp instanceof Window + || comp.isLightweight ())) + return true; } return false; } |