src/share/classes/javax/swing/JMenuBar.java

rev 1527 : 6727662: Code improvement and warnings removing from swing packages
Summary: Removed unnecessary castings and other warnings
Reviewed-by: malenkov

*** 410,433 ****
       * other menu elements.
       * @return an array of menu items in the menu bar.
       */
      public MenuElement[] getSubElements() {
          MenuElement result[];
!         Vector tmp = new Vector();
          int c = getComponentCount();
          int i;
          Component m;
  
          for(i=0 ; i < c ; i++) {
              m = getComponent(i);
              if(m instanceof MenuElement)
!                 tmp.addElement(m);
          }
  
          result = new MenuElement[tmp.size()];
          for(i=0,c=tmp.size() ; i < c ; i++)
!             result[i] = (MenuElement) tmp.elementAt(i);
          return result;
      }
  
      /**
       * Implemented to be a <code>MenuElement</code>. Returns this object.
--- 410,433 ----
       * other menu elements.
       * @return an array of menu items in the menu bar.
       */
      public MenuElement[] getSubElements() {
          MenuElement result[];
!         Vector<MenuElement> tmp = new Vector<MenuElement>();
          int c = getComponentCount();
          int i;
          Component m;
  
          for(i=0 ; i < c ; i++) {
              m = getComponent(i);
              if(m instanceof MenuElement)
!                 tmp.addElement((MenuElement) m);
          }
  
          result = new MenuElement[tmp.size()];
          for(i=0,c=tmp.size() ; i < c ; i++)
!             result[i] = tmp.elementAt(i);
          return result;
      }
  
      /**
       * Implemented to be a <code>MenuElement</code>. Returns this object.
*** 660,672 ****
                                          int condition, boolean pressed) {
          // See if we have a local binding.
          boolean retValue = super.processKeyBinding(ks, e, condition, pressed);
          if (!retValue) {
              MenuElement[] subElements = getSubElements();
!             for (int i=0; i<subElements.length; i++) {
                  if (processBindingForKeyStrokeRecursive(
!                                                         subElements[i], ks, e, condition, pressed)) {
                      return true;
                  }
              }
          }
          return retValue;
--- 660,672 ----
                                          int condition, boolean pressed) {
          // See if we have a local binding.
          boolean retValue = super.processKeyBinding(ks, e, condition, pressed);
          if (!retValue) {
              MenuElement[] subElements = getSubElements();
!             for (MenuElement subElement : subElements) {
                  if (processBindingForKeyStrokeRecursive(
!                         subElement, ks, e, condition, pressed)) {
                      return true;
                  }
              }
          }
          return retValue;
*** 689,701 ****
  
              return true;
          }
  
          MenuElement[] subElements = elem.getSubElements();
!         for(int i=0; i<subElements.length; i++) {
!             if (processBindingForKeyStrokeRecursive(subElements[i], ks, e,
!                                                     condition, pressed)) {
                  return true;
                  // We don't, pass along to children JMenu's
              }
          }
          return false;
--- 689,700 ----
  
              return true;
          }
  
          MenuElement[] subElements = elem.getSubElements();
!         for (MenuElement subElement : subElements) {
!             if (processBindingForKeyStrokeRecursive(subElement, ks, e, condition, pressed)) {
                  return true;
                  // We don't, pass along to children JMenu's
              }
          }
          return false;