[webbeans-commits] Webbeans SVN: r932 - in ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector: jlr and 1 other directory.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-01-13 19:22:17 -0500 (Tue, 13 Jan 2009)
New Revision: 932

Modified:
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java
Log:
Fix generic types

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java	2009-01-14 00:20:43 UTC (rev 931)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java	2009-01-14 00:22:17 UTC (rev 932)
@@ -36,7 +36,7 @@
     * 
     * @return A set of abstracted fields
     */
-   public Set<AnnotatedField<Object>> getFields();
+   public Set<AnnotatedField<?>> getFields();
 
    /**
     * Gets all annotations which are annotated with the given annotation type

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java	2009-01-14 00:20:43 UTC (rev 931)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java	2009-01-14 00:22:17 UTC (rev 932)
@@ -216,7 +216,7 @@
    private final Type[] actualTypeArguments;
 
    // The set of abstracted fields
-   private final Set<AnnotatedField<Object>> fields;
+   private final Set<AnnotatedField<?>> fields;
    // The map from annotation type to abstracted field with annotation
    private final AnnotatedFieldMap annotatedFields;
    // The map from annotation type to abstracted field with meta-annotation
@@ -264,7 +264,7 @@
          actualTypeArguments = new Type[0];
       }
 
-      this.fields = new HashSet<AnnotatedField<Object>>();
+      this.fields = new HashSet<AnnotatedField<?>>();
       this.annotatedFields = new AnnotatedFieldMap();
       this.metaAnnotatedFields = new AnnotatedFieldMap();
       for (Class<?> c = clazz; c != Object.class && c != null; c = c.getSuperclass())
@@ -389,7 +389,7 @@
     * 
     * @return The set of abstracted fields
     */
-   public Set<AnnotatedField<Object>> getFields()
+   public Set<AnnotatedField<?>> getFields()
    {
       return Collections.unmodifiableSet(fields);
    }