* java/beans/EventSetDescriptor.java (EventSetDescriptor):

	Genericized.
	(getListenerType): Likewise.
	* java/beans/Introspector.java (getBeanInfo): Genericized.
	* java/beans/DefaultPersistenceDelegate.java (initialize):
	Genericized.

4 files changed, 22 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 0b8150e46..bf4a8cf81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-03-03  Tom Tromey  <tromey@redhat.com>
+
+	* java/beans/EventSetDescriptor.java (EventSetDescriptor):
+	Genericized.
+	(getListenerType): Likewise.
+	* java/beans/Introspector.java (getBeanInfo): Genericized.
+	* java/beans/DefaultPersistenceDelegate.java (initialize):
+	Genericized.
+
 2006-03-01  Anthony Balkissoon  <abalkiss@redhat.com>
 
 	* java/math/BigDecimal.java:
diff --git a/java/beans/DefaultPersistenceDelegate.java b/java/beans/DefaultPersistenceDelegate.java
index ca1041fef..08f6174bb 100644
--- a/java/beans/DefaultPersistenceDelegate.java
+++ b/java/beans/DefaultPersistenceDelegate.java
@@ -154,8 +154,8 @@ public class DefaultPersistenceDelegate extends PersistenceDelegate
     return new Expression(oldInstance, oldInstance.getClass(), "new", args);
   }
 
-  protected void initialize(Class type, Object oldInstance, Object newInstance,
-                            Encoder out)
+  protected void initialize(Class<?> type, Object oldInstance,
+                            Object newInstance, Encoder out)
   {
     // Calling the supertype's implementation of initialize makes it
     // possible that descendants of classes like AbstractHashMap
diff --git a/java/beans/EventSetDescriptor.java b/java/beans/EventSetDescriptor.java
index 381a45303..69c07423f 100644
--- a/java/beans/EventSetDescriptor.java
+++ b/java/beans/EventSetDescriptor.java
@@ -164,8 +164,8 @@ public class EventSetDescriptor extends FeatureDescriptor
    *              if listenerType is not an EventListener, or if methods are not
    *              found or are invalid.
    */
-  public EventSetDescriptor(Class eventSourceClass, String eventSetName,
-                            Class listenerType, String listenerMethodName)
+  public EventSetDescriptor(Class<?> eventSourceClass, String eventSetName,
+                            Class<?> listenerType, String listenerMethodName)
       throws IntrospectionException
   {
     setName(eventSetName);
@@ -225,8 +225,8 @@ public class EventSetDescriptor extends FeatureDescriptor
    *              if listenerType is not an EventListener or if methods are not
    *              found or are invalid.
    */
-  public EventSetDescriptor(Class eventSourceClass, String eventSetName,
-                            Class listenerType, String[] listenerMethodNames,
+  public EventSetDescriptor(Class<?> eventSourceClass, String eventSetName,
+                            Class<?> listenerType, String[] listenerMethodNames,
                             String addListenerMethodName,
                             String removeListenerMethodName)
       throws IntrospectionException
@@ -287,8 +287,8 @@ public class EventSetDescriptor extends FeatureDescriptor
    *              found or are invalid.
    * @since 1.4
    */
-  public EventSetDescriptor(Class eventSourceClass, String eventSetName,
-                            Class listenerType, String[] listenerMethodNames,
+  public EventSetDescriptor(Class<?> eventSourceClass, String eventSetName,
+                            Class<?> listenerType, String[] listenerMethodNames,
                             String addListenerMethodName,
                             String removeListenerMethodName,
                             String getListenerMethodName)
@@ -357,7 +357,7 @@ public class EventSetDescriptor extends FeatureDescriptor
    *              methods are invalid.
    * @since 1.4
    */
-  public EventSetDescriptor(String eventSetName, Class listenerType,
+  public EventSetDescriptor(String eventSetName, Class<?> listenerType,
                             Method[] listenerMethods, Method addListenerMethod,
                             Method removeListenerMethod,
                             Method getListenerMethod)
@@ -402,7 +402,7 @@ public class EventSetDescriptor extends FeatureDescriptor
    *              if the listenerType is not an EventListener, or any of the
    *              methods are invalid.
    */
-  public EventSetDescriptor(String eventSetName, Class listenerType,
+  public EventSetDescriptor(String eventSetName, Class<?> listenerType,
                             Method[] listenerMethods, Method addListenerMethod,
                             Method removeListenerMethod)
       throws IntrospectionException
@@ -449,7 +449,7 @@ public class EventSetDescriptor extends FeatureDescriptor
    *              if the listenerType is not an EventListener, or any of the
    *              methods are invalid.
    */
-  public EventSetDescriptor(String eventSetName, Class listenerType,
+  public EventSetDescriptor(String eventSetName, Class<?> listenerType,
                             MethodDescriptor[] listenerMethodDescriptors,
                             Method addListenerMethod,
                             Method removeListenerMethod)
@@ -484,7 +484,7 @@ public class EventSetDescriptor extends FeatureDescriptor
 
   /** Returns the class that contains the event firing methods.
    */
-  public Class getListenerType()
+  public Class<?> getListenerType()
   {
     return listenerType;
   }
diff --git a/java/beans/Introspector.java b/java/beans/Introspector.java
index ae8905590..28df87f67 100644
--- a/java/beans/Introspector.java
+++ b/java/beans/Introspector.java
@@ -246,7 +246,7 @@ public class Introspector {
    * @throws IntrospectionException If something goes wrong while retrieving
    *    the bean data.
    */
-  public static BeanInfo getBeanInfo(Class beanClass, int flag)
+  public static BeanInfo getBeanInfo(Class<?> beanClass, int flag)
     throws IntrospectionException
   {
     IntrospectionIncubator ii;