stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6690791: Even more ClassCasetException with TrayIcon

Browse Source 
Event.getComponent() is used unstead of (Component)event.getSource()

Reviewed-by: peterz
This commit is contained in:
Mikhail Lapshin 2008-04-30 13:19:26 +04:00
parent 4594b0f8ea
commit 92019e467c
2 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jdk/src/share/classes/javax/swing/MenuSelectionManager.java
View File

@ -218,9 +218,9 @@ public class MenuSelectionManager {
int selectionSize;
p = event.getPoint();
Component source = (Component)event.getSource();
Component source = event.getComponent();
if (!source.isShowing()) {
if ((source != null) && !source.isShowing()) {
// This can happen if a mouseReleased removes the
// containing component -- bug 4146684
return;
@ -236,7 +236,9 @@ public class MenuSelectionManager {
return;
}
SwingUtilities.convertPointToScreen(p,source);
if (source != null) {
SwingUtilities.convertPointToScreen(p, source);
}
screenX = p.x;
screenY = p.y;

44
jdk/test/javax/swing/JPopupMenu/6690791/bug6690791.java Normal file
View File

@ -0,0 +1,44 @@
/*
* Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
/*
* @test
* @bug 6690791
* @summary Checks that there is no ClassCastException
* in MenuSelectionManager.processMouseEvent()
* @author Mikhail Lapshin
* @run main bug6690791
*/
import javax.swing.*;
import java.awt.event.MouseEvent;
public class bug6690791 {
public static void main(String[] args) throws Exception {
MouseEvent me = new MouseEvent(new JLabel(), MouseEvent.MOUSE_CLICKED,
System.currentTimeMillis(), MouseEvent.ALT_MASK,
10, 10, 100, 100, 1, false, MouseEvent.BUTTON1);
me.setSource(new Object());
MenuSelectionManager.defaultManager().processMouseEvent(me);
}
}