src/solaris/classes/sun/awt/X11/XPopupMenuPeer.java
Print this page
rev 9830 : 8039642: Fix raw and unchecked warnings in sun.awt.*
Reviewed-by: darcy, prr
*** 132,142 ****
* From PopupMenuPeer
*/
public void show(Event e) {
target = (Component)e.target;
// Get menus from the target.
! Vector targetItemVector = getMenuTargetItems();
if (targetItemVector != null) {
reloadItems(targetItemVector);
//Fix for 6287092: JCK15a: api/java_awt/interactive/event/EventTests.html#EventTest0015 fails, mustang
Point tl = target.getLocationOnScreen();
Point pt = new Point(tl.x + e.x, tl.y + e.y);
--- 132,142 ----
* From PopupMenuPeer
*/
public void show(Event e) {
target = (Component)e.target;
// Get menus from the target.
! Vector<MenuItem> targetItemVector = getMenuTargetItems();
if (targetItemVector != null) {
reloadItems(targetItemVector);
//Fix for 6287092: JCK15a: api/java_awt/interactive/event/EventTests.html#EventTest0015 fails, mustang
Point tl = target.getLocationOnScreen();
Point pt = new Point(tl.x + e.x, tl.y + e.y);
*** 186,196 ****
return false;
}
return AWTAccessor.getMenuItemAccessor().isEnabled(popupMenuTarget);
}
! Vector getMenuTargetItems() {
if (popupMenuTarget == null) {
return null;
}
return AWTAccessor.getMenuAccessor().getItems(popupMenuTarget);
}
--- 186,196 ----
return false;
}
return AWTAccessor.getMenuItemAccessor().isEnabled(popupMenuTarget);
}
! Vector<MenuItem> getMenuTargetItems() {
if (popupMenuTarget == null) {
return null;
}
return AWTAccessor.getMenuAccessor().getItems(popupMenuTarget);
}