This fixes a problem pointed out by JAPI which is that JMenu shadows a
protected field from AbstractButton and makes it private.
2006-08-13 Roman Kennke <[EMAIL PROTECTED]>
* javax/swing/JMenu.java
(changeListener): Renamed to menuChangeListener to avoid
shadowing changeListener field from AbstractButton.
/Roman
Index: javax/swing/JMenu.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JMenu.java,v
retrieving revision 1.31
diff -u -1 -2 -r1.31 JMenu.java
--- javax/swing/JMenu.java 13 Aug 2006 00:54:49 -0000 1.31
+++ javax/swing/JMenu.java 13 Aug 2006 20:37:21 -0000
@@ -119,25 +119,25 @@
/* PopupListener */
protected WinListener popupListener;
/** Location at which popup menu associated with this menu will be
displayed */
private Point menuLocation;
/**
* The ChangeListener for the ButtonModel.
*
* @see MenuChangeListener
*/
- private ChangeListener changeListener;
+ private ChangeListener menuChangeListener;
/**
* Creates a new JMenu object.
*/
public JMenu()
{
super();
setOpaque(false);
}
/**
* Creates a new <code>JMenu</code> with the specified label.
