summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2006-07-30 22:00:39 +0000
committerMark Wielaard <mark@klomp.org>2006-07-30 22:00:39 +0000
commit87b96cef3271a298c5d20b95fd10d881343d680a (patch)
treee878f0cfacd552bbab34330f7332e335082f53f8
parent96860a0094b2dbb47d071af1aa4ec451fee16a6c (diff)
downloadclasspath-87b96cef3271a298c5d20b95fd10d881343d680a.tar.gz
* javax/swing/JComponent.java (getListeners): Revert
un-genericization.
-rw-r--r--ChangeLog5
-rw-r--r--javax/swing/JComponent.java6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index fcdff245a..2f58a1740 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-07-30 Mark Wielaard <mark@klomp.org>
+ * javax/swing/JComponent.java (getListeners): Revert
+ un-genericization.
+
+2006-07-30 Mark Wielaard <mark@klomp.org>
+
* resource/java/security/classpath.security: Add /dev/urandom as
default securerandom.source.
diff --git a/javax/swing/JComponent.java b/javax/swing/JComponent.java
index fa8350294..25fc9b424 100644
--- a/javax/swing/JComponent.java
+++ b/javax/swing/JComponent.java
@@ -943,12 +943,12 @@ public abstract class JComponent extends Container implements Serializable
*
* @since 1.3
*/
- public EventListener[] getListeners(Class listenerType)
+ public <T extends EventListener> T[] getListeners(Class<T> listenerType)
{
if (listenerType == PropertyChangeListener.class)
- return getPropertyChangeListeners();
+ return (T[]) getPropertyChangeListeners();
else if (listenerType == VetoableChangeListener.class)
- return getVetoableChangeListeners();
+ return (T[]) getVetoableChangeListeners();
else
return listenerList.getListeners(listenerType);
}