* javax/swing/tree/DefaultTreeSelectionModel.java (getListeners):

	Genericized.
	* javax/swing/tree/DefaultTreeModel.java (getListeners): Genericized.
	* javax/swing/Timer.java (getListeners): Genericized.
	* javax/swing/text/StyleContext.java (getListeners): Genericized.
	* javax/swing/text/DefaultCaret.java (getListeners): Genericized.
	* javax/swing/text/AbstractDocument.java (getListeners):
	Genericized.
	* javax/swing/table/DefaultTableColumnModel.java (getListeners):
	Genericized.
	* javax/swing/table/AbstractTableModel.java (getListeners):
	Genericized.
	* javax/swing/JComponent.java (getListeners): Genericized.
	* javax/swing/DefaultSingleSelectionModel.java (getListeners):
	Genericized.
	* javax/swing/DefaultListSelectionModel.java (getListeners):
	Genericized.
	* javax/swing/DefaultButtonModel.java (getListeners): Genericized.
	* javax/swing/DefaultBoundedRangeModel.java (getListeners):
	Genericized.
	* javax/swing/AbstractSpinnerModel.java (getListeners): Genericized.
	* javax/swing/event/EventListenerList.java (add): Genericized.
	(getListeners): Likewise.
	(remove): Likewise.
	* java/awt/dnd/DragSource.java (getListeners): Genericized.
	* java/awt/TextField.java (getListeners): Genericized.
	* java/awt/Window.java (getListeners): Genericized.
	* java/awt/Scrollbar.java (getListeners): Genericized.
	* java/awt/List.java (getListeners): Genericized.
	* java/awt/Choice.java (getListeners): Genericized.
	* java/awt/TextComponent.java (getListeners): Genericized.
	* java/awt/CheckboxMenuItem.java (getListeners): Genericized.
	* java/awt/Button.java (getListeners): Genericized.
	* java/awt/Container.java (getListeners): Genericized.

16 files changed, 19 insertions, 19 deletions

diff --git a/javax/swing/AbstractListModel.java b/javax/swing/AbstractListModel.java
index 8973e5292..6cff6a28c 100644
--- a/javax/swing/AbstractListModel.java
+++ b/javax/swing/AbstractListModel.java
@@ -161,7 +161,7 @@ public abstract class AbstractListModel implements ListModel, Serializable
    *
    * @return The set of listeners of the specified type
    */
-  public EventListener[] getListeners(Class listenerType)
+  public <T extends EventListener> T[] getListeners(Class<T> listenerType)
   {
     return listenerList.getListeners(listenerType);
   }
diff --git a/javax/swing/AbstractSpinnerModel.java b/javax/swing/AbstractSpinnerModel.java
index d61113b08..2590fe195 100644
--- a/javax/swing/AbstractSpinnerModel.java
+++ b/javax/swing/AbstractSpinnerModel.java
@@ -79,7 +79,7 @@ public abstract class AbstractSpinnerModel implements SpinnerModel
    * @param c the type of listener
    * @return the listeners that are of the specific type
    */
-  public EventListener[] getListeners(Class c)
+  public <T extends EventListener> T[] getListeners(Class<T> c)
   {
     return listenerList.getListeners(c);
   }
diff --git a/javax/swing/DefaultBoundedRangeModel.java b/javax/swing/DefaultBoundedRangeModel.java
index 10de4b948..88026efa7 100644
--- a/javax/swing/DefaultBoundedRangeModel.java
+++ b/javax/swing/DefaultBoundedRangeModel.java
@@ -421,7 +421,7 @@ public class DefaultBoundedRangeModel
    *
    * @since 1.3
    */
-  public EventListener[] getListeners(Class listenerType)
+  public <T extends EventListener> T[] getListeners(Class<T> listenerType)
   {
     return listenerList.getListeners(listenerType);
   }
diff --git a/javax/swing/DefaultButtonModel.java b/javax/swing/DefaultButtonModel.java
index f7d09d578..13a126461 100644
--- a/javax/swing/DefaultButtonModel.java
+++ b/javax/swing/DefaultButtonModel.java
@@ -165,7 +165,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);
   }
diff --git a/javax/swing/DefaultListSelectionModel.java b/javax/swing/DefaultListSelectionModel.java
index f8d544d9b..7344b0dca 100644
--- a/javax/swing/DefaultListSelectionModel.java
+++ b/javax/swing/DefaultListSelectionModel.java
@@ -667,7 +667,7 @@ public class DefaultListSelectionModel implements Cloneable,
    * @see #getListSelectionListeners
    * @since 1.3
    */
-  public EventListener[] getListeners(Class listenerType)
+  public <T extends EventListener> T[] getListeners(Class<T> listenerType)
   {
     return listenerList.getListeners(listenerType);
   }
diff --git a/javax/swing/DefaultSingleSelectionModel.java b/javax/swing/DefaultSingleSelectionModel.java
index 8f4d405f9..fbf30cee8 100644
--- a/javax/swing/DefaultSingleSelectionModel.java
+++ b/javax/swing/DefaultSingleSelectionModel.java
@@ -156,7 +156,7 @@ public class DefaultSingleSelectionModel
    *
    * @since 1.3
    */
-  public EventListener[] getListeners(Class listenerClass)
+  public <T extends EventListener> T[] getListeners(Class<T> listenerClass)
   {
     return listenerList.getListeners(listenerClass);
   }
diff --git a/javax/swing/JComponent.java b/javax/swing/JComponent.java
index 3b4dbf32a..b13f2d14c 100644
--- a/javax/swing/JComponent.java
+++ b/javax/swing/JComponent.java
@@ -598,7 +598,7 @@ public abstract class JComponent extends Container implements Serializable
    *
    * @see #listenerList
    */
-  public EventListener[] getListeners(Class listenerType)
+  public <T extends EventListener> T[] getListeners(Class<T> listenerType)
   {
     return listenerList.getListeners(listenerType);
   }
diff --git a/javax/swing/Timer.java b/javax/swing/Timer.java
index e38915dc3..4e3cd7dc4 100644
--- a/javax/swing/Timer.java
+++ b/javax/swing/Timer.java
@@ -251,7 +251,7 @@ public class Timer
    * fired by this timer
    * @since 1.3
    */
-  public EventListener[] getListeners(Class listenerType)
+  public <T extends EventListener> T[] getListeners(Class<T> listenerType)
   {
     return listenerList.getListeners(listenerType);
   }
diff --git a/javax/swing/event/EventListenerList.java b/javax/swing/event/EventListenerList.java
index 3b9f4c807..7ed8582bd 100644
--- a/javax/swing/event/EventListenerList.java
+++ b/javax/swing/event/EventListenerList.java
@@ -135,7 +135,7 @@ public class EventListenerList
    *
    * @throws NullPointerException if <code>t</code> is <code>null</code>.
    */
-  public void add(Class t, EventListener listener)
+  public <T extends EventListener> void add(Class<T> t, T listener)
   {
     int oldLength;
     Object[] newList;
@@ -219,7 +219,7 @@ public class EventListenerList
    *
    * @since 1.3
    */
-  public EventListener[] getListeners(Class c)
+  public <T extends EventListener> T[] getListeners(Class<T> c)
   {
     int count, f;
     EventListener[] result;
@@ -231,7 +231,7 @@ public class EventListenerList
       if (listenerList[i] == c)
         result[f++] = (EventListener) listenerList[i + 1];
     
-    return result;
+    return (T[]) result;
   }
 
 
@@ -248,7 +248,7 @@ public class EventListenerList
    *
    * @throws NullPointerException if <code>t</code> is <code>null</code>.
    */
-  public void remove(Class t, EventListener listener)
+  public <T extends EventListener> void remove(Class<T> t, T listener)
   {
     Object[] oldList, newList;
     int oldLength;
diff --git a/javax/swing/table/AbstractTableModel.java b/javax/swing/table/AbstractTableModel.java
index 3e9f6e9b3..5085e6017 100644
--- a/javax/swing/table/AbstractTableModel.java
+++ b/javax/swing/table/AbstractTableModel.java
@@ -294,7 +294,7 @@ public abstract class AbstractTableModel implements TableModel, Serializable
    * 
    * @return An array of listeners (possibly empty).
    */
-  public EventListener[] getListeners(Class listenerType)
+  public <T extends EventListener> T[] getListeners(Class<T> listenerType)
   {
     return listenerList.getListeners(listenerType);
   }
diff --git a/javax/swing/table/DefaultTableColumnModel.java b/javax/swing/table/DefaultTableColumnModel.java
index 10871770d..d6cf28436 100644
--- a/javax/swing/table/DefaultTableColumnModel.java
+++ b/javax/swing/table/DefaultTableColumnModel.java
@@ -499,7 +499,7 @@ public class DefaultTableColumnModel
    *
    * @return EventListener[] array of model's listeners of the specified type
    */
-  public EventListener[] getListeners(Class listenerType)
+  public <T extends EventListener> T[] getListeners(Class<T> listenerType)
   {
     return listenerList.getListeners(listenerType);
   }
diff --git a/javax/swing/text/AbstractDocument.java b/javax/swing/text/AbstractDocument.java
index 660cd2b09..54213dcb1 100644
--- a/javax/swing/text/AbstractDocument.java
+++ b/javax/swing/text/AbstractDocument.java
@@ -404,7 +404,7 @@ public abstract class AbstractDocument implements Document, Serializable
    *
    * @return all registered listeners of the specified type
    */
-  public EventListener[] getListeners(Class listenerType)
+  public <T extends EventListener> T[] getListeners(Class<T> listenerType)
   {
     return listenerList.getListeners(listenerType);
   }
diff --git a/javax/swing/text/DefaultCaret.java b/javax/swing/text/DefaultCaret.java
index c247afcff..401e2e08f 100644
--- a/javax/swing/text/DefaultCaret.java
+++ b/javax/swing/text/DefaultCaret.java
@@ -425,7 +425,7 @@ public class DefaultCaret extends Rectangle
    *
    * @return all registered event listeners of the specified type
    */
-  public EventListener[] getListeners(Class listenerType)
+  public <T extends EventListener> T[] getListeners(Class<T> listenerType)
   {
     return listenerList.getListeners(listenerType);
   }
diff --git a/javax/swing/text/StyleContext.java b/javax/swing/text/StyleContext.java
index eda13e744..fba15f6fd 100644
--- a/javax/swing/text/StyleContext.java
+++ b/javax/swing/text/StyleContext.java
@@ -112,7 +112,7 @@ public class StyleContext
       listenerList.remove(ChangeListener.class, l);
     }
       
-    public EventListener[] getListeners(Class listenerType)
+    public <T extends EventListener> T[] getListeners(Class<T> listenerType)
     {
       return listenerList.getListeners(listenerType);
     }
diff --git a/javax/swing/tree/DefaultTreeModel.java b/javax/swing/tree/DefaultTreeModel.java
index 5b5e03914..609592a73 100644
--- a/javax/swing/tree/DefaultTreeModel.java
+++ b/javax/swing/tree/DefaultTreeModel.java
@@ -558,7 +558,7 @@ public class DefaultTreeModel
    *
    * @since 1.3
    */
-  public EventListener[] getListeners(Class listenerType)
+  public <T extends EventListener> T[] getListeners(Class<T> listenerType)
   {
     return listenerList.getListeners(listenerType);
   }
diff --git a/javax/swing/tree/DefaultTreeSelectionModel.java b/javax/swing/tree/DefaultTreeSelectionModel.java
index 75b76a9e8..b30481425 100644
--- a/javax/swing/tree/DefaultTreeSelectionModel.java
+++ b/javax/swing/tree/DefaultTreeSelectionModel.java
@@ -527,7 +527,7 @@ public class DefaultTreeSelectionModel
 	 * 
 	 * @since 1.3
 	 */
-	public EventListener[] getListeners(Class listenerType)
+	public <T extends EventListener> T[] getListeners(Class<T> listenerType)
 	{
 		return listenerList.getListeners(listenerType);
 	}