This fixes some warnings that were pointed out by Eclipse in
java.awt.MenuBar.

2006-01-13  Roman Kennke  <[EMAIL PROTECTED]>

        * java/awt/MenuBar.java
        (accessibleContext): Removed unnecessary field. This is already
        defined in MenuComponent.
        (setHelpMenu): Renamed the peer variable to myPeer because it was
        hiding a field of MenuComponent.
        (addNotify): Removed unnecessary cast.

/Roman
Index: java/awt/MenuBar.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/MenuBar.java,v
retrieving revision 1.19
diff -u -r1.19 MenuBar.java
--- java/awt/MenuBar.java	13 Jan 2006 21:40:09 -0000	1.19
+++ java/awt/MenuBar.java	13 Jan 2006 21:46:35 -0000
@@ -39,7 +39,6 @@
 package java.awt;
 
 import java.awt.peer.MenuBarPeer;
-import java.awt.peer.MenuComponentPeer;
 
 import java.io.Serializable;
 import java.util.Enumeration;
@@ -74,14 +73,6 @@
   private Vector menus = new Vector();
 
   /**
-   * The accessible context for this component.
-   *
-   * @see #getAccessibleContext()
-   * @serial ignored.
-   */
-  private transient AccessibleContext accessibleContext;
-
-  /**
    * The frame that this menubar is associated with. We need to know this so
    * that [EMAIL PROTECTED] MenuComponent#postEvent(Event)} can post the event to the
    * frame if no other component processed the event.
@@ -127,11 +118,11 @@
       menu.parent.remove(menu);
     menu.parent = this;
 
-    MenuBarPeer peer = (MenuBarPeer) getPeer ();
-    if (peer != null)
+    MenuBarPeer myPeer = (MenuBarPeer) getPeer ();
+    if (myPeer != null)
       {
         menu.addNotify();
-        peer.addHelpMenu(menu);
+        myPeer.addHelpMenu(menu);
       }
   }
 
@@ -234,7 +225,7 @@
   public void addNotify()
   {
     if (getPeer() == null)
-      setPeer((MenuComponentPeer) getToolkit().createMenuBar(this));
+      setPeer(getToolkit().createMenuBar(this));
     Enumeration e = menus.elements();
     while (e.hasMoreElements())
       {
_______________________________________________
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches

Reply via email to