Author: pete.muir(a)jboss.org Date: 2009-01-13 19:31:55 -0500 (Tue, 13 Jan 2009) New Revision: 935 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:29:18 UTC (rev 934) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java 2009-01-14 00:31:55 UTC (rev 935) @@ -96,7 +96,7 @@ * @param methodDescriptor * @return */ - public AnnotatedMethod<Object> getMethod(Method method); + public AnnotatedMethod<?> getMethod(Method method); /** * Gets all with parameters annotated with annotationType 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:29:18 UTC (rev 934) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2009-01-14 00:31:55 UTC (rev 935) @@ -509,10 +509,10 @@ return methodsByAnnotatedParameters.get(annotationType); } - public AnnotatedMethod<Object> getMethod(Method methodDescriptor) + public AnnotatedMethod<?> getMethod(Method methodDescriptor) { // TODO Cache? - for (AnnotatedMethod<Object> annotatedMethod : methods) + for (AnnotatedMethod<?> annotatedMethod : methods) { if (annotatedMethod.getName().equals(methodDescriptor.getName()) && Arrays.equals(annotatedMethod.getParameterTypesAsArray(), methodDescriptor.getParameterTypes())) {