[webbeans-commits] Webbeans SVN: r507 - in ri/trunk/webbeans-ri/src: main/java/org/jboss/webbeans/bean and 4 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Tue Dec 9 16:03:47 EST 2008
Author: nickarls
Date: 2008-12-09 16:03:47 -0500 (Tue, 09 Dec 2008)
New Revision: 507
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/FacadeImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/InstanceImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InstanceBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java
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/event/EventImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.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/AnnotatedField.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/AnnotatedParameter.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.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/AnnotatedFieldImpl.java
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/AnnotatedParameterImpl.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventTest.java
Log:
Manager as last parameter, Manager instead of ManagerImpl where applicable, remove proxyable check from manager (done at boot)
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/FacadeImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/FacadeImpl.java 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/FacadeImpl.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -22,6 +22,7 @@
import java.util.Set;
import javax.webbeans.DuplicateBindingTypeException;
+import javax.webbeans.manager.Manager;
import org.jboss.webbeans.util.Reflections;
@@ -37,18 +38,18 @@
// The binding types the helper operates on
protected final Set<? extends Annotation> bindingTypes;
// The Web Beans manager
- protected final ManagerImpl manager;
+ protected final Manager manager;
// The type of the operation
protected final Class<T> type;
/**
* Constructor
*
+ * @param type The event type
* @param manager The Web Beans manager
- * @param type The event type
* @param bindingTypes The binding types
*/
- protected FacadeImpl(ManagerImpl manager, Class<T> type, Annotation... bindingTypes)
+ protected FacadeImpl(Class<T> type, Manager manager, Annotation... bindingTypes)
{
this.manager = manager;
this.type = type;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/InstanceImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/InstanceImpl.java 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/InstanceImpl.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -22,6 +22,7 @@
import java.util.Set;
import javax.webbeans.Instance;
+import javax.webbeans.manager.Manager;
import org.jboss.webbeans.util.Strings;
@@ -38,11 +39,13 @@
/**
* Constructor
*
+ * @param type The event type
+ * @param manager The Web Beans manager
* @param bindingTypes The binding types
*/
- public InstanceImpl(ManagerImpl manager, Class<T> type, Annotation... bindingTypes)
+ public InstanceImpl(Class<T> type, Manager manager, Annotation... bindingTypes)
{
- super(manager, type, bindingTypes);
+ super(type, manager, bindingTypes);
}
public T get(Annotation... bindingTypes)
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -39,7 +39,6 @@
import javax.webbeans.Production;
import javax.webbeans.Standard;
import javax.webbeans.TypeLiteral;
-import javax.webbeans.UnproxyableDependencyException;
import javax.webbeans.UnsatisfiedDependencyException;
import javax.webbeans.manager.Bean;
import javax.webbeans.manager.Context;
@@ -74,7 +73,7 @@
public class ManagerImpl implements Manager
{
public static final String JNDI_KEY = "java:comp/Manager";
-
+
private List<Class<? extends Annotation>> enabledDeploymentTypes;
private EventManager eventManager;
private Resolver resolver;
@@ -83,7 +82,7 @@
private List<Bean<?>> beans;
private Set<Decorator> decorators;
private Set<Interceptor> interceptors;
-
+
@SuppressWarnings("unchecked")
public ManagerImpl()
{
@@ -430,7 +429,7 @@
}
return activeContexts.iterator().next();
}
-
+
/**
* Direct access to build in contexts for internal use
*
@@ -450,7 +449,6 @@
*
* @see javax.webbeans.manager.Manager#getInstance(javax.webbeans.manager.Bean)
*/
- @SuppressWarnings("unchecked")
public <T> T getInstance(Bean<T> bean)
{
try
@@ -511,11 +509,11 @@
{
return getInstanceByType(new AnnotatedClassImpl<T>(type, type, bindings), bindings);
}
-
+
public <T> T getMostSpecializedInstance(Bean<T> bean, boolean create)
{
- //TODO!!!!!
- return getInstance(bean);
+ // TODO!!!!!
+ return getInstance(bean);
}
/**
@@ -554,15 +552,7 @@
}
else
{
- Bean<T> bean = beans.iterator().next();
- if (MetaDataCache.instance().getScopeModel(bean.getScopeType()).isNormal() && !element.isProxyable())
- {
- throw new UnproxyableDependencyException(element + "Unable to proxy");
- }
- else
- {
- return getInstance(bean);
- }
+ return getInstance(beans.iterator().next());
}
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -109,6 +109,8 @@
/**
* Constructor
+ *
+ * @param manager The Web Beans manager
*/
public AbstractBean(ManagerImpl manager)
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -60,9 +60,10 @@
private Set<AnnotatedMethod<Object>> initializerMethods;
/**
+ * Constructor
*
- * @param annotatedItem Annotations read from java classes
- * @param xmlAnnotatedItem Annotations read from XML
+ * @param type The type
+ * @param manager The Web Beans manager
*/
public AbstractClassBean(Class<T> type, ManagerImpl manager)
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -56,6 +56,7 @@
* Constructor
*
* @param type The type of the bean
+ * @param manager The Web Beans manager
*/
public EnterpriseBean(Class<T> type, ManagerImpl manager)
{
@@ -218,7 +219,7 @@
bindDecorators();
bindInterceptors();
injectEjbAndCommonFields();
- injectBoundFields(manager, instance);
+ injectBoundFields(instance, manager);
callInitializers(instance);
return instance;
}
@@ -259,12 +260,13 @@
* Injects bound fields
*
* @param instance The bean instance
+ * @param manager The Web Beans manager
*/
- protected void injectBoundFields(Manager manager, T instance)
+ protected void injectBoundFields(T instance, Manager manager)
{
for (AnnotatedField<?> field : getInjectableFields())
{
- field.inject(manager, instance);
+ field.inject(instance, manager);
}
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -39,6 +39,7 @@
* Constructor
*
* @param field The underlying field abstraction
+ * @param manager The Web Beans manager
*/
public EventBean(AnnotatedItem<Event<T>, S> field, ManagerImpl manager)
{
@@ -48,7 +49,7 @@
@Override
public Event<T> create()
{
- return new EventImpl<T>(manager, getTypeParameter(), getBindingTypesArray());
+ return new EventImpl<T>(getTypeParameter(), manager, getBindingTypesArray());
}
/**
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InstanceBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InstanceBean.java 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InstanceBean.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -54,7 +54,7 @@
@Override
public Instance<T> create()
{
- return new InstanceImpl<T>(manager, getTypeParameter(), getBindingTypesArray());
+ return new InstanceImpl<T>(getTypeParameter(), manager, getBindingTypesArray());
}
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerBean.java 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerBean.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -39,7 +39,7 @@
protected AbstractClassBean<?> declaringBean;
- public ProducerBean(ManagerImpl manager, AbstractClassBean<?> declaringBean) {
+ public ProducerBean(AbstractClassBean<?> declaringBean, ManagerImpl manager) {
super(manager);
this.declaringBean = declaringBean;
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -41,6 +41,7 @@
*
* @param method The producer field
* @param declaringBean The declaring bean instance
+ * @param manager The Web Beans manager
*/
public ProducerFieldBean(Field field, AbstractClassBean<?> declaringBean, ManagerImpl manager)
{
@@ -52,10 +53,11 @@
*
* @param method The producer field abstraction
* @param declaringBean The declaring bean
+ * @param manager The Web Beans manager
*/
public ProducerFieldBean(AnnotatedField<T> field, AbstractClassBean<?> declaringBean, ManagerImpl manager)
{
- super(manager, declaringBean);
+ super(declaringBean, manager);
this.field = field;
init();
}
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 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -49,6 +49,7 @@
*
* @param method The producer method
* @param declaringBean The declaring bean instance
+ * @param manager The Web Beans manager
*/
public ProducerMethodBean(Method method, AbstractClassBean<?> declaringBean, ManagerImpl manager)
{
@@ -60,10 +61,11 @@
*
* @param method The producer method abstraction
* @param declaringBean The declaring bean
+ * @param manager The Web Beans manager
*/
public ProducerMethodBean(AnnotatedMethod<T> method, AbstractClassBean<?> declaringBean, ManagerImpl manager)
{
- super(manager, declaringBean);
+ super(declaringBean, manager);
this.method = method;
init();
}
@@ -76,7 +78,7 @@
@Override
public T create()
{
- T instance = method.invoke(manager, getReceiver());
+ T instance = method.invoke(getReceiver(), manager);
checkReturnValue(instance);
return instance;
}
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 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -59,6 +59,7 @@
* Constructor
*
* @param type The type of the bean
+ * @param manager The Web Beans manager
*/
public SimpleBean(Class<T> type, ManagerImpl manager)
{
@@ -78,7 +79,7 @@
bindDecorators();
bindInterceptors();
injectEjbAndCommonFields();
- injectBoundFields(manager, instance);
+ injectBoundFields(instance, manager);
callInitializers(instance);
callPostConstruct(instance);
return instance;
@@ -108,7 +109,7 @@
try
{
//note: RI supports injection into @PreDestroy
- preDestroy.invoke(manager, instance);
+ preDestroy.invoke(instance, manager);
}
catch (Exception e)
{
@@ -130,7 +131,7 @@
try
{
//note: RI supports injection into @PostConstruct
- postConstruct.invoke(manager, instance);
+ postConstruct.invoke(instance, manager);
}
catch (Exception e)
{
@@ -148,7 +149,7 @@
{
for (AnnotatedMethod<Object> initializer : getInitializerMethods())
{
- initializer.invoke(manager, instance);
+ initializer.invoke(instance, manager);
}
}
@@ -164,12 +165,13 @@
* Injects bound fields
*
* @param instance The instance to inject into
+ * @param manager The Web Beans manager
*/
- protected void injectBoundFields(Manager manager, T instance)
+ protected void injectBoundFields(T instance, Manager manager)
{
for (AnnotatedField<?> injectableField : getInjectableFields())
{
- injectableField.inject(manager, instance);
+ injectableField.inject(instance, manager);
}
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -25,9 +25,9 @@
import javax.webbeans.Event;
import javax.webbeans.Observable;
import javax.webbeans.Observer;
+import javax.webbeans.manager.Manager;
import org.jboss.webbeans.FacadeImpl;
-import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.util.Strings;
/**
@@ -46,11 +46,13 @@
/**
* Constructor
*
+ * @param eventType The event type
+ * @param manager The Web Beans manager
* @param bindingTypes The binding types
*/
- public EventImpl(ManagerImpl manager, Class<T> eventType, Annotation... bindingTypes)
+ public EventImpl(Class<T> eventType, Manager manager, Annotation... bindingTypes)
{
- super(manager, eventType, bindingTypes);
+ super(eventType, manager, bindingTypes);
}
/**
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -142,6 +142,8 @@
/**
* Initializes a new instance of the EventManager.
+ *
+ * @param manager The Web Beans manager
*/
public EventManager(ManagerImpl manager)
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -73,13 +73,9 @@
* Creates an Observer which describes and encapsulates an observer method
* (8.5).
*
- * @param componentModel The model for the component which defines the
- * observer method
- * @param observer The observer method to notify
- * @param eventType The type of event being observed
- * @param beanModel The model for the bean which defines the observer method
- * @param observer The observer method to notify
- * @param eventType The type of event being observed
+ * @param observer The observer
+ * @param observerBean The observer bean
+ * @param manager The Web Beans manager
*/
public ObserverImpl(final AnnotatedMethod<Object> observer, final Bean<?> observerBean, final ManagerImpl manager)
{
@@ -176,7 +172,7 @@
// TODO replace event parameter
try
{
- observerMethod.invokeWithSpecialValue(manager, instance, Observes.class, event);
+ observerMethod.invokeWithSpecialValue(instance, Observes.class, event, manager);
}
catch (ExecutionException e)
{
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 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedConstructor.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -53,6 +53,7 @@
/**
* Creates a new instance of the class, using this constructor
*
+ * @param manager The Web Beans manager
* @return The created instance
*/
public T newInstance(Manager manager);
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -42,8 +42,9 @@
* Injects an instance
*
* @param instance The instance to inject
+ * @param manager The Web Beans manager
*/
- public void inject(Manager manager, Object instance);
+ public void inject(Object instance, Manager manager);
/**
* Injects an instance
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 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -66,18 +66,20 @@
* Invokes the method
*
* @param instance The instance to invoke
+ * @param manager The Web Beans manager
* @return A reference to the instance
*/
- public T invoke(Manager manager, Object instance);
+ public T invoke(Object instance, Manager manager);
/**
* Invokes the observer method
*
* @param instance The instance to invoke
* @param event the event object
+ * @param manager The Web Beans manager
* @return A reference to the instance
*/
- public T invokeWithSpecialValue(Manager manager, Object instance, Class<? extends Annotation> specialParam, Object specialVal);
+ public T invokeWithSpecialValue(Object instance, Class<? extends Annotation> specialParam, Object specialVal, Manager manager);
/**
* Invokes the method
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -33,6 +33,7 @@
/**
* Gets the actual value of the parameter from the manager
*
+ * @param manager The Web Beans manager
* @return The value
*/
public T getValue(Manager manager);
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -194,12 +194,12 @@
* of annotated parameters.
*
* @param parameters The list of annotated parameter to look up
+ * @param manager The Web Beans manager
* @return The object array of looked up values
- *
*/
- protected static Object[] getParameterValues(Manager manager, List<AnnotatedParameter<Object>> parameters)
+ protected static Object[] getParameterValues(List<AnnotatedParameter<Object>> parameters, Manager manager)
{
- return getParameterValues(manager, parameters, null, null);
+ return getParameterValues(parameters, null, null, manager);
}
/**
@@ -207,10 +207,10 @@
* of annotated parameters.
*
* @param parameters The list of annotated parameter to look up
+ * @param manager The Web Beans manager
* @return The object array of looked up values
- *
*/
- protected static Object[] getParameterValues(Manager manager, List<AnnotatedParameter<Object>> parameters, Object specialVal, Class<? extends Annotation> specialParam)
+ protected static Object[] getParameterValues(List<AnnotatedParameter<Object>> parameters, Object specialVal, Class<? extends Annotation> specialParam, Manager manager)
{
Object[] parameterValues = new Object[parameters.size()];
Iterator<AnnotatedParameter<Object>> iterator = parameters.iterator();
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 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -132,6 +132,7 @@
/**
* Gets the current value of the member
*
+ * @param manager The Web Beans manager
* @return The current value
*/
public T getValue(Manager manager)
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 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -196,6 +196,7 @@
/**
* Creates a new instance
*
+ * @param manager The Web Beans manager
* @return An instance
*
* @see org.jboss.webbeans.introspector.AnnotatedConstructor#newInstance(ManagerImpl)
@@ -205,7 +206,7 @@
try
{
// TODO: more details in the exceptions
- return getDelegate().newInstance(getParameterValues(manager, parameters));
+ return getDelegate().newInstance(getParameterValues(parameters, manager));
}
catch (IllegalArgumentException e)
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -24,7 +24,6 @@
import javax.webbeans.manager.Manager;
-import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.introspector.AnnotatedField;
import org.jboss.webbeans.introspector.AnnotatedType;
import org.jboss.webbeans.util.Names;
@@ -119,17 +118,18 @@
* Gets the current value and injects this instance into an instance
*
* @param instance The instance to inject into
- *
+ * @param manager The Web Beans manager
* @see org.jboss.webbeans.introspector.AnnotatedField#inject(Object,
- * ManagerImpl)
+ * Manager)
*/
- public void inject(Manager manager, Object instance)
+ public void inject(Object instance, Manager manager)
{
Reflections.setAndWrap(getDelegate(), instance, getValue(manager));
}
-
+
@SuppressWarnings("unchecked")
- public T get(Object instance) {
+ public T get(Object instance)
+ {
return (T) Reflections.getAndWrap(getDelegate(), instance);
}
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 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -232,22 +232,22 @@
/**
* Invokes the method on an instance with current parameters from manager
*
- * @param mananger The Web Beans manager
* @param instance The instance to invoke on
- *
+ * @param manager The Web Beans manager
+ * @return The return value of the invocation
* @see org.jboss.webbeans.introspector.AnnotatedMethod#invoke(ManagerImpl,
* Object)
*/
@SuppressWarnings("unchecked")
- public T invoke(Manager manager, Object instance)
+ public T invoke(Object instance, Manager manager)
{
- return (T) Reflections.invokeAndWrap(getDelegate(), instance, getParameterValues(manager, parameters));
+ return (T) Reflections.invokeAndWrap(getDelegate(), instance, getParameterValues(parameters, manager));
}
@SuppressWarnings("unchecked")
- public T invokeWithSpecialValue(Manager manager, Object instance, Class<? extends Annotation> specialParam, Object specialVal)
+ public T invokeWithSpecialValue(Object instance, Class<? extends Annotation> specialParam, Object specialVal, Manager manager)
{
- return (T) Reflections.invokeAndWrap(getDelegate(), instance, getParameterValues(manager, parameters, specialVal, specialParam));
+ return (T) Reflections.invokeAndWrap(getDelegate(), instance, getParameterValues(parameters, specialVal, specialParam, manager));
}
/**
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -126,6 +126,7 @@
/**
* Gets the current value
*
+ * @param manager The Web Beans manager
* @return the value
*
* @see org.jboss.webbeans.introspector.AnnotatedParameter
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventTest.java 2008-12-09 16:00:24 UTC (rev 506)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventTest.java 2008-12-09 21:03:47 UTC (rev 507)
@@ -66,7 +66,7 @@
//Create a test annotation for the event and use it to construct the
//event object
Annotation[] annotations = new Annotation[] { new TameAnnotationLiteral() };
- EventImpl<DangerCall> eventComponent = new EventImpl<DangerCall>(manager, DangerCall.class, annotations);
+ EventImpl<DangerCall> eventComponent = new EventImpl<DangerCall>(DangerCall.class, manager, annotations);
eventComponent.fire(anEvent, new SynchronousAnnotationLiteral());
assert anEvent.equals(manager.getEvent());
assert Reflections.annotationSetMatches(manager.getEventBindings(),
@@ -107,7 +107,7 @@
//Create a test annotation for the event and use it to construct the
//event object
Annotation[] annotations = new Annotation[] { new TameAnnotationLiteral() };
- EventImpl<DangerCall> eventComponent = new EventImpl<DangerCall>(manager, DangerCall.class, annotations);
+ EventImpl<DangerCall> eventComponent = new EventImpl<DangerCall>(DangerCall.class, manager, annotations);
Observer<DangerCall> observer = new AnObserver<DangerCall>();
eventComponent.observe(observer, new SynchronousAnnotationLiteral());
assert manager.getObservedEventType().equals(DangerCall.class);
More information about the weld-commits
mailing list