src/solaris/classes/sun/awt/X11/XBaseMenuWindow.java
Print this page
rev 9830 : 8039642: Fix raw and unchecked warnings in sun.awt.*
Reviewed-by: darcy, prr
*** 229,239 ****
/**
* Overrides XBaseWindow.instantPreInit
*/
void instantPreInit(XCreateWindowParams params) {
super.instantPreInit(params);
! items = new ArrayList();
}
/************************************************
*
* General-purpose functions
--- 229,239 ----
/**
* Overrides XBaseWindow.instantPreInit
*/
void instantPreInit(XCreateWindowParams params) {
super.instantPreInit(params);
! items = new ArrayList<>();
}
/************************************************
*
* General-purpose functions
*** 365,378 ****
/**
* Clears items vector and loads specified vector
* @param items vector to be loaded
*/
! public void reloadItems(Vector items) {
synchronized(getMenuTreeLock()) {
this.items.clear();
! MenuItem[] itemArray = (MenuItem[])items.toArray(new MenuItem[] {});
int itemCnt = itemArray.length;
for(int i = 0; i < itemCnt; i++) {
addItem(itemArray[i]);
}
}
--- 365,378 ----
/**
* Clears items vector and loads specified vector
* @param items vector to be loaded
*/
! public void reloadItems(Vector<? extends MenuItem> items) {
synchronized(getMenuTreeLock()) {
this.items.clear();
! MenuItem[] itemArray = items.toArray(new MenuItem[] {});
int itemCnt = itemArray.length;
for(int i = 0; i < itemCnt; i++) {
addItem(itemArray[i]);
}
}