CVSROOT: /cvsroot/classpath Module name: classpath Changes by: Tania Bento <tbento> 06/06/21 16:10:20
Modified files: . : ChangeLog javax/swing/plaf/basic: BasicPopupMenuUI.java Log message: 2006-06-21 Tania Bento <[EMAIL PROTECTED]> * javax/swing/JMenu.java Changed instantiation of popupMenu to null. (JMenu): Instantiated popupMenu to new JPopupMenu. (JMenu): Instantiated popupMenu to new JPopupMenu. (add): Changed popupMenu to getPopupMenu(). (add): Changed popupMenu to getPopupMenu(). (add): Changed popupMenu to getPopupMenu(). (add): Changed popupMenu to getPopupMenu(). (remove): Changed popupMenu to getPopupMenu(). (remove): Changed popupMenu to getPopupMenu(). (insert): Changed popupMenu to getPopupMenu(). (setSelectedHelper): Changed popupMenu to getPopupMenu(). (isPopupMenuVisible): Changed popupMenu to getPopupMenu(). (setPopupMenuVisible): Changed popupMenu to getPopupMenu(). (getMenuComponentCount): Changed popupMenu to getPopupMenu(). (getMenuComponents): Changed popupMenu to getPopupMenu(). (getPopupMenu): Check first if popupMenu is null and if so, instantiate it to a new JPopupMenu and set the invoker. * javax/swing/plaf/basic/BasicPopupMenuUI.java (popupMenuWillBecomeVisible): Component Listener should only be added to the root container if the root container is not null. This avoids a null pointer exception. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7902&r2=1.7903 http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicPopupMenuUI.java?cvsroot=classpath&r1=1.18&r2=1.19 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/classpath/classpath/ChangeLog,v retrieving revision 1.7902 retrieving revision 1.7903 diff -u -b -r1.7902 -r1.7903 --- ChangeLog 21 Jun 2006 15:35:08 -0000 1.7902 +++ ChangeLog 21 Jun 2006 16:10:19 -0000 1.7903 @@ -7,6 +7,31 @@ 2006-06-21 Tania Bento <[EMAIL PROTECTED]> * javax/swing/JMenu.java + Changed instantiation of popupMenu to null. + (JMenu): Instantiated popupMenu to new JPopupMenu. + (JMenu): Instantiated popupMenu to new JPopupMenu. + (add): Changed popupMenu to getPopupMenu(). + (add): Changed popupMenu to getPopupMenu(). + (add): Changed popupMenu to getPopupMenu(). + (add): Changed popupMenu to getPopupMenu(). + (remove): Changed popupMenu to getPopupMenu(). + (remove): Changed popupMenu to getPopupMenu(). + (insert): Changed popupMenu to getPopupMenu(). + (setSelectedHelper): Changed popupMenu to getPopupMenu(). + (isPopupMenuVisible): Changed popupMenu to getPopupMenu(). + (setPopupMenuVisible): Changed popupMenu to getPopupMenu(). + (getMenuComponentCount): Changed popupMenu to getPopupMenu(). + (getMenuComponents): Changed popupMenu to getPopupMenu(). + (getPopupMenu): Check first if popupMenu is null and if so, + instantiate it to a new JPopupMenu and set the invoker. + * javax/swing/plaf/basic/BasicPopupMenuUI.java + (popupMenuWillBecomeVisible): Component Listener should only + be added to the root container if the root container is not + null. This avoids a null pointer exception. + +2006-06-21 Tania Bento <[EMAIL PROTECTED]> + + * javax/swing/JMenu.java (JMenu): Delay should be set to 200, not default of 0. (JMenu): Delay should be set to 200, not default of 0. (JMenu): Delay should be set to 200, not default of 0. Index: javax/swing/plaf/basic/BasicPopupMenuUI.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicPopupMenuUI.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -b -r1.18 -r1.19 --- javax/swing/plaf/basic/BasicPopupMenuUI.java 17 Apr 2006 07:41:05 -0000 1.18 +++ javax/swing/plaf/basic/BasicPopupMenuUI.java 21 Jun 2006 16:10:20 -0000 1.19 @@ -280,6 +280,7 @@ // if topWindow to which this popup belongs was resized or moved. Component invoker = popupMenu.getInvoker(); Component rootContainer = SwingUtilities.getRoot(invoker); + if (rootContainer != null) rootContainer.addComponentListener(topWindowListener); // if this popup menu is a free floating popup menu,