Merged gcj-eclipse branch to trunk.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120621 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 4 insertions, 4 deletions

diff --git a/libjava/classpath/java/beans/IndexedPropertyDescriptor.java b/libjava/classpath/java/beans/IndexedPropertyDescriptor.java
index 0ba2ed4f493..61c3f228da0 100644
--- a/libjava/classpath/java/beans/IndexedPropertyDescriptor.java
+++ b/libjava/classpath/java/beans/IndexedPropertyDescriptor.java
@@ -76,7 +76,7 @@ import java.lang.reflect.Method;
  */
 public class IndexedPropertyDescriptor extends PropertyDescriptor
 {
-  private Class indexedPropertyType;
+  private Class<?> indexedPropertyType;
   private Method setIndex;
   private Method getIndex;
 
@@ -112,7 +112,7 @@ public class IndexedPropertyDescriptor extends PropertyDescriptor
    * @exception IntrospectionException if the methods are not found or
    *            invalid.
    */
-  public IndexedPropertyDescriptor(String name, Class beanClass)
+  public IndexedPropertyDescriptor(String name, Class<?> beanClass)
     throws IntrospectionException
   {
     super(name);
@@ -161,7 +161,7 @@ public class IndexedPropertyDescriptor extends PropertyDescriptor
    *
    * @exception IntrospectionException if the methods are not found or invalid.
    */
-  public IndexedPropertyDescriptor(String name, Class beanClass,
+  public IndexedPropertyDescriptor(String name, Class<?> beanClass,
                                    String getMethodName, String setMethodName,
                                    String getIndexName, String setIndexName)
     throws IntrospectionException
@@ -272,7 +272,7 @@ public class IndexedPropertyDescriptor extends PropertyDescriptor
          : Array.newInstance(this.indexedPropertyType,0).getClass());
   }
 
-  public Class getIndexedPropertyType()
+  public Class<?> getIndexedPropertyType()
   {
     return indexedPropertyType;
   }