[webbeans-commits] Webbeans SVN: r929 - in ri/trunk/webbeans-ri/src: main/java/org/jboss/webbeans/introspector and 2 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Tue Jan 13 18:42:38 EST 2009
Author: pete.muir at jboss.org
Date: 2009-01-13 18:42:38 -0500 (Tue, 13 Jan 2009)
New Revision: 929
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedConstructor.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java
Log:
more fixes to generic types
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-01-13 23:33:32 UTC (rev 928)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-01-13 23:42:38 UTC (rev 929)
@@ -101,7 +101,7 @@
*/
protected void initInjectionPoints()
{
- for (AnnotatedParameter<Object> parameter : method.getParameters())
+ for (AnnotatedParameter<?> parameter : method.getParameters())
{
annotatedInjectionPoints.add(parameter);
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-01-13 23:33:32 UTC (rev 928)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-01-13 23:42:38 UTC (rev 929)
@@ -311,13 +311,13 @@
protected void initInjectionPoints()
{
super.initInjectionPoints();
- for (AnnotatedParameter<Object> parameter : constructor.getParameters())
+ for (AnnotatedParameter<?> parameter : constructor.getParameters())
{
annotatedInjectionPoints.add(parameter);
}
for (AnnotatedMethod<Object> initializer : getInitializerMethods())
{
- for (AnnotatedParameter<Object> parameter : initializer.getParameters())
+ for (AnnotatedParameter<?> parameter : initializer.getParameters())
{
annotatedInjectionPoints.add(parameter);
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedConstructor.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedConstructor.java 2009-01-13 23:33:32 UTC (rev 928)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedConstructor.java 2009-01-13 23:42:38 UTC (rev 929)
@@ -38,7 +38,7 @@
* @return A set of abstracted parameters. Returns an empty set if there are
* no parameters
*/
- public List<AnnotatedParameter<Object>> getParameters();
+ public List<AnnotatedParameter<?>> getParameters();
/**
* Gets all parameters to the constructor which are annotated with
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java 2009-01-13 23:33:32 UTC (rev 928)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java 2009-01-13 23:42:38 UTC (rev 929)
@@ -32,6 +32,7 @@
import javax.webbeans.Fires;
import javax.webbeans.IfExists;
import javax.webbeans.Observes;
+
import org.jboss.webbeans.ManagerImpl;
/**
@@ -52,7 +53,7 @@
* @return A list of parameters. Returns an empty list if no parameters are
* present.
*/
- public List<AnnotatedParameter<Object>> getParameters();
+ public List<AnnotatedParameter<?>> getParameters();
/**
* Gets the list of annotated parameters for a given annotation
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java 2009-01-13 23:33:32 UTC (rev 928)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java 2009-01-13 23:42:38 UTC (rev 929)
@@ -190,7 +190,7 @@
* @param manager The Web Beans manager
* @return The object array of looked up values
*/
- protected Object[] getParameterValues(List<AnnotatedParameter<Object>> parameters, ManagerImpl manager)
+ protected Object[] getParameterValues(List<AnnotatedParameter<?>> parameters, ManagerImpl manager)
{
return getParameterValues(parameters, null, null, manager);
}
@@ -203,17 +203,17 @@
* @param manager The Web Beans manager
* @return The object array of looked up values
*/
- protected Object[] getParameterValues(List<AnnotatedParameter<Object>> parameters, Object specialVal, Class<? extends Annotation> specialParam, ManagerImpl manager)
+ protected Object[] getParameterValues(List<AnnotatedParameter<?>> parameters, Object specialVal, Class<? extends Annotation> specialParam, ManagerImpl manager)
{
Object[] parameterValues = new Object[parameters.size()];
InjectionPointProvider injectionPointProvider = manager.getInjectionPointProvider();
injectionPointProvider.pushInjectionMember(this);
try
{
- Iterator<AnnotatedParameter<Object>> iterator = parameters.iterator();
+ Iterator<AnnotatedParameter<?>> iterator = parameters.iterator();
for (int i = 0; i < parameterValues.length; i++)
{
- AnnotatedParameter<Object> param = iterator.next();
+ AnnotatedParameter<?> param = iterator.next();
if (specialParam != null && param.isAnnotationPresent(specialParam))
{
parameterValues[i] = specialVal;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java 2009-01-13 23:33:32 UTC (rev 928)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java 2009-01-13 23:42:38 UTC (rev 929)
@@ -26,6 +26,7 @@
import java.util.List;
import javax.webbeans.ExecutionException;
+
import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.introspector.AnnotatedConstructor;
import org.jboss.webbeans.introspector.AnnotatedParameter;
@@ -49,7 +50,7 @@
private final Constructor<T> constructor;
// The list of parameter abstractions
- private final List<AnnotatedParameter<Object>> parameters;
+ private final List<AnnotatedParameter<?>> parameters;
// The mapping of annotation -> parameter abstraction
private final AnnotatedParameterMap annotatedParameters;
@@ -74,7 +75,7 @@
this.constructor = constructor;
this.declaringClass = declaringClass;
- this.parameters = new ArrayList<AnnotatedParameter<Object>>();
+ this.parameters = new ArrayList<AnnotatedParameter<?>>();
annotatedParameters = new AnnotatedParameterMap();
for (int i = 0; i < constructor.getParameterTypes().length; i++)
{
@@ -154,7 +155,7 @@
*
* @see org.jboss.webbeans.introspector.AnnotatedConstructor#getParameters()
*/
- public List<AnnotatedParameter<Object>> getParameters()
+ public List<AnnotatedParameter<?>> getParameters()
{
return Collections.unmodifiableList(parameters);
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java 2009-01-13 23:33:32 UTC (rev 928)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java 2009-01-13 23:42:38 UTC (rev 929)
@@ -51,7 +51,7 @@
private final Method method;
// The abstracted parameters
- private final List<AnnotatedParameter<Object>> parameters;
+ private final List<AnnotatedParameter<?>> parameters;
// A mapping from annotation type to parameter abstraction with that
// annotation present
private final AnnotatedParameterMap annotatedParameters;
@@ -89,7 +89,7 @@
this.actualTypeArguments = new Type[0];
}
- this.parameters = new ArrayList<AnnotatedParameter<Object>>();
+ this.parameters = new ArrayList<AnnotatedParameter<?>>();
this.annotatedParameters = new AnnotatedParameterMap();
for (int i = 0; i < method.getParameterTypes().length; i++)
{
@@ -177,7 +177,7 @@
*
* @see org.jboss.webbeans.introspector.AnnotatedMethod#getParameters()
*/
- public List<AnnotatedParameter<Object>> getParameters()
+ public List<AnnotatedParameter<?>> getParameters()
{
return Collections.unmodifiableList(parameters);
}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2009-01-13 23:33:32 UTC (rev 928)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2009-01-13 23:42:38 UTC (rev 929)
@@ -174,7 +174,7 @@
assert constructor.getParameters().size() == 2;
Map<Class<?>, Set<? extends Annotation>> map = new HashMap<Class<?>, Set<? extends Annotation>>();
- for (AnnotatedParameter<Object> parameter : constructor.getParameters())
+ for (AnnotatedParameter<?> parameter : constructor.getParameters())
{
map.put(parameter.getType(), parameter.getBindingTypes());
}
@@ -208,7 +208,7 @@
AnnotatedConstructor<Turkey> constructor = SimpleBean.of(Turkey.class, manager).getConstructor();
assert constructor.getParameters().size() == 2;
Map<Class<?>, Set<? extends Annotation>> map = new HashMap<Class<?>, Set<? extends Annotation>>();
- for (AnnotatedParameter<Object> parameter : constructor.getParameters())
+ for (AnnotatedParameter<?> parameter : constructor.getParameters())
{
map.put(parameter.getType(), parameter.getBindingTypes());
}
@@ -267,7 +267,7 @@
assert constructor.getDeclaringClass().getType().equals(Duck.class);
assert constructor.getParameters().size() == 2;
Map<Class<?>, Set<? extends Annotation>> map = new HashMap<Class<?>, Set<? extends Annotation>>();
- for (AnnotatedParameter<Object> parameter : constructor.getParameters())
+ for (AnnotatedParameter<?> parameter : constructor.getParameters())
{
map.put(parameter.getType(), parameter.getBindingTypes());
}
More information about the weld-commits
mailing list