--- a/jdk/src/share/classes/javax/swing/JMenuBar.java Tue Aug 26 12:16:23 2008 +0400
+++ b/jdk/src/share/classes/javax/swing/JMenuBar.java Tue Aug 26 15:12:54 2008 +0400
@@ -414,7 +414,7 @@
*/
public MenuElement[] getSubElements() {
MenuElement result[];
- Vector tmp = new Vector();
+ Vector<MenuElement> tmp = new Vector<MenuElement>();
int c = getComponentCount();
int i;
Component m;
@@ -422,12 +422,12 @@
for(i=0 ; i < c ; i++) {
m = getComponent(i);
if(m instanceof MenuElement)
- tmp.addElement(m);
+ tmp.addElement((MenuElement) m);
}
result = new MenuElement[tmp.size()];
for(i=0,c=tmp.size() ; i < c ; i++)
- result[i] = (MenuElement) tmp.elementAt(i);
+ result[i] = tmp.elementAt(i);
return result;
}
@@ -664,9 +664,9 @@
boolean retValue = super.processKeyBinding(ks, e, condition, pressed);
if (!retValue) {
MenuElement[] subElements = getSubElements();
- for (int i=0; i<subElements.length; i++) {
+ for (MenuElement subElement : subElements) {
if (processBindingForKeyStrokeRecursive(
- subElements[i], ks, e, condition, pressed)) {
+ subElement, ks, e, condition, pressed)) {
return true;
}
}
@@ -693,9 +693,8 @@
}
MenuElement[] subElements = elem.getSubElements();
- for(int i=0; i<subElements.length; i++) {
- if (processBindingForKeyStrokeRecursive(subElements[i], ks, e,
- condition, pressed)) {
+ for (MenuElement subElement : subElements) {
+ if (processBindingForKeyStrokeRecursive(subElement, ks, e, condition, pressed)) {
return true;
// We don't, pass along to children JMenu's
}