--- a/jdk/src/share/classes/javax/swing/SortingFocusTraversalPolicy.java Wed Jun 17 21:13:04 2009 +0100
+++ b/jdk/src/share/classes/javax/swing/SortingFocusTraversalPolicy.java Thu Jun 18 11:28:54 2009 +0400
@@ -444,11 +444,10 @@
for (Component comp : cycle) {
if (accept(comp)) {
return comp;
- } else if (comp instanceof Container && comp != aContainer) {
- Container cont = (Container)comp;
- if (cont.isFocusTraversalPolicyProvider()) {
- return cont.getFocusTraversalPolicy().getDefaultComponent(cont);
- }
+ } else if (comp != aContainer &&
+ (comp = getComponentDownCycle(comp, FORWARD_TRAVERSAL)) != null)
+ {
+ return comp;
}
}
return null;