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

Author: pete.muir(a)jboss.org Date: 2008-11-05 13:56:51 -0500 (Wed, 05 Nov 2008) New Revision: 248 Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableParameter.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedAnnotation.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedConstructor.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedItem.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedMethod.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedParameter.java Log: Tidy up type parameters Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableParameter.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableParameter.java 2008-11-05 18:33:56 UTC (rev 247) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableParameter.java 2008-11-05 18:56:51 UTC (rev 248) @@ -13,7 +13,7 @@ protected InjectableParameter() {} - public InjectableParameter(Annotation[] bindingTypes, Class<? extends T> type) + public InjectableParameter(Annotation[] bindingTypes, Class<T> type) { super(new SimpleAnnotatedParameter<T>(bindingTypes, type)); } @@ -23,7 +23,7 @@ super(annotatedParameter); } - public InjectableParameter(Class<? extends T> type) + public InjectableParameter(Class<T> type) { this(currentBinding, type); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java 2008-11-05 18:33:56 UTC (rev 247) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java 2008-11-05 18:56:51 UTC (rev 248) @@ -51,7 +51,7 @@ public S getDelegate(); - public Class<? extends T> getType(); + public Class<T> getType(); public boolean isAssignableFrom(AnnotatedItem<?, ?> that); Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedAnnotation.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedAnnotation.java 2008-11-05 18:33:56 UTC (rev 247) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedAnnotation.java 2008-11-05 18:56:51 UTC (rev 248) @@ -45,7 +45,7 @@ return clazz; } - public Class<? extends T> getType() + public Class<T> getType() { return clazz; } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedConstructor.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedConstructor.java 2008-11-05 18:33:56 UTC (rev 247) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedConstructor.java 2008-11-05 18:56:51 UTC (rev 248) @@ -64,13 +64,13 @@ if (constructor.getParameterAnnotations()[i].length > 0) { Class<? extends Object> clazz = constructor.getParameterTypes()[i]; - AnnotatedParameter<Object> parameter = new SimpleAnnotatedParameter<Object>(constructor.getParameterAnnotations()[i], clazz); + AnnotatedParameter<Object> parameter = new SimpleAnnotatedParameter<Object>(constructor.getParameterAnnotations()[i], (Class<Object>) clazz); parameters.add(parameter); } else { Class<? extends Object> clazz = constructor.getParameterTypes()[i]; - AnnotatedParameter<Object> parameter = new SimpleAnnotatedParameter<Object>(new Annotation[0], clazz); + AnnotatedParameter<Object> parameter = new SimpleAnnotatedParameter<Object>(new Annotation[0], (Class<Object>) clazz); parameters.add(parameter); } } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedItem.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedItem.java 2008-11-05 18:33:56 UTC (rev 247) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedItem.java 2008-11-05 18:56:51 UTC (rev 248) @@ -11,7 +11,7 @@ { private Type[] actualTypeArguments = new Type[0]; - private Class<? extends T> type; + private Class<T> type; private Annotation[] actualAnnotations; private SimpleAnnotatedItem(Map<Class<? extends Annotation>, Annotation> annotationMap) @@ -19,13 +19,13 @@ super(annotationMap); } - private SimpleAnnotatedItem(Map<Class<? extends Annotation>, Annotation> annotationMap, Class<? extends T> type) + private SimpleAnnotatedItem(Map<Class<? extends Annotation>, Annotation> annotationMap, Class<T> type) { super(annotationMap); this.type = type; } - private SimpleAnnotatedItem(Map<Class<? extends Annotation>, Annotation> annotationMap, TypeLiteral<? extends T> apiType) + private SimpleAnnotatedItem(Map<Class<? extends Annotation>, Annotation> annotationMap, TypeLiteral<T> apiType) { super(annotationMap); this.type = apiType.getRawType(); @@ -35,7 +35,7 @@ } } - private SimpleAnnotatedItem(Map<Class<? extends Annotation>, Annotation> annotationMap, Class<? extends T> type, Type[] actualTypeArguments) + private SimpleAnnotatedItem(Map<Class<? extends Annotation>, Annotation> annotationMap, Class<T> type, Type[] actualTypeArguments) { this(annotationMap, type); this.actualTypeArguments = actualTypeArguments; @@ -47,19 +47,19 @@ this.actualAnnotations = annotations; } - public SimpleAnnotatedItem(Annotation[] annotations, Class<? extends T> type) + public SimpleAnnotatedItem(Annotation[] annotations, Class<T> type) { this(buildAnnotationMap(annotations), type); this.actualAnnotations = annotations; } - public SimpleAnnotatedItem(Annotation[] annotations, TypeLiteral<? extends T> apiType) + public SimpleAnnotatedItem(Annotation[] annotations, TypeLiteral<T> apiType) { this(buildAnnotationMap(annotations), apiType); this.actualAnnotations = annotations; } - public SimpleAnnotatedItem(Annotation[] annotations, Class<? extends T> type, Type[] actualTypeArguments) + public SimpleAnnotatedItem(Annotation[] annotations, Class<T> type, Type[] actualTypeArguments) { this(buildAnnotationMap(annotations), type, actualTypeArguments); this.actualAnnotations = annotations; @@ -70,7 +70,7 @@ return null; } - public Class<? extends T> getType() + public Class<T> getType() { return type; } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedMethod.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedMethod.java 2008-11-05 18:33:56 UTC (rev 247) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedMethod.java 2008-11-05 18:56:51 UTC (rev 248) @@ -64,13 +64,13 @@ if (method.getParameterAnnotations()[i].length > 0) { Class<? extends Object> clazz = method.getParameterTypes()[i]; - AnnotatedParameter<Object> parameter = new SimpleAnnotatedParameter<Object>(method.getParameterAnnotations()[i], clazz); + AnnotatedParameter<Object> parameter = new SimpleAnnotatedParameter<Object>(method.getParameterAnnotations()[i], (Class<Object>) clazz); parameters.add(parameter); } else { Class<? extends Object> clazz = method.getParameterTypes()[i]; - AnnotatedParameter<Object> parameter = new SimpleAnnotatedParameter<Object>(new Annotation[0], clazz); + AnnotatedParameter<Object> parameter = new SimpleAnnotatedParameter<Object>(new Annotation[0], (Class<Object>) clazz); parameters.add(parameter); } } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedParameter.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedParameter.java 2008-11-05 18:33:56 UTC (rev 247) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedParameter.java 2008-11-05 18:56:51 UTC (rev 248) @@ -8,12 +8,12 @@ public class SimpleAnnotatedParameter<T> extends AbstractAnnotatedItem<T, Object> implements AnnotatedParameter<T> { - private Class<? extends T> type; + private Class<T> type; private Type[] actualTypeArguments = new Type[0]; private boolean _final; private boolean _static; - public SimpleAnnotatedParameter(Annotation[] annotations, Class<? extends T> type) + public SimpleAnnotatedParameter(Annotation[] annotations, Class<T> type) { super(buildAnnotationMap(annotations)); this.type = type; @@ -29,7 +29,7 @@ return null; } - public Class<? extends T> getType() + public Class<T> getType() { return type; }