Merged gcj-eclipse branch to trunk.
From-SVN: r120621
This commit is contained in:
parent
c648dedbde
commit
97b8365caf
17478 changed files with 606493 additions and 100744 deletions
|
@ -166,7 +166,7 @@ public class DefaultButtonModel implements ButtonModel, Serializable
|
|||
*
|
||||
* @return array of listeners
|
||||
*/
|
||||
public EventListener[] getListeners(Class listenerType)
|
||||
public <T extends EventListener> T[] getListeners(Class<T> listenerType)
|
||||
{
|
||||
return listenerList.getListeners(listenerType);
|
||||
}
|
||||
|
@ -425,7 +425,7 @@ public class DefaultButtonModel implements ButtonModel, Serializable
|
|||
public void setRollover(boolean r)
|
||||
{
|
||||
// if this call does not represent a CHANGE in state, then return
|
||||
if ((r && isRollover()) || (!r && !isRollover()))
|
||||
if (r == isRollover())
|
||||
return;
|
||||
|
||||
// cannot set ROLLOVER property unless button is enabled
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue