Author: struberg
Date: Mon Nov 26 12:30:20 2012
New Revision: 1413575
URL: http://svn.apache.org/viewvc?rev=1413575&view=rev
Log:
OWB-730 remove InjectionTargetWrapper pt3
rename methods in the BeanManager
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatUtil.java
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatUtil.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=1413575&r1=1413574&r2=1413575&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
Mon Nov 26 12:30:20 2012
@@ -789,7 +789,7 @@ public class BeansDeployer
if(processInjectionTargetEvent.isSet())
{
//Adding injection target
- manager.putInjectionTargetWrapperForJavaEeComponents(clazz,
processInjectionTargetEvent.getInjectionTarget());
+ manager.putProducerForJavaEeComponent(clazz,
processInjectionTargetEvent.getInjectionTarget());
}
//Checks that not contains @Inject InjectionPoint
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?rev=1413575&r1=1413574&r2=1413575&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
Mon Nov 26 12:30:20 2012
@@ -187,7 +187,7 @@ public class BeanManagerImpl implements
Collections.synchronizedMap(new IdentityHashMap<Contextual<?>,
Producer<?>>());
/**InjectionTargets for Java EE component instances that supports
injections*/
- private Map<Class<?>, Producer<?>> injectionTargetForJavaEeComponents =
+ private Map<Class<?>, Producer<?>> producersForJavaEeComponents =
new ConcurrentHashMap<Class<?>, Producer<?>>();
private AnnotatedElementFactory annotatedElementFactory;
@@ -229,18 +229,18 @@ public class BeanManagerImpl implements
return (Producer<T>) producers.get(contextual);
}
- public <T> void putInjectionTargetWrapperForJavaEeComponents(Class<T>
javaEeComponentClass, Producer<T> wrapper)
+ public <T> void putProducerForJavaEeComponent(Class<T>
javaEeComponentClass, Producer<T> wrapper)
{
Asserts.assertNotNull(javaEeComponentClass);
Asserts.assertNotNull(wrapper);
- injectionTargetForJavaEeComponents.put(javaEeComponentClass, wrapper);
+ producersForJavaEeComponents.put(javaEeComponentClass, wrapper);
}
- public <T> Producer<T> getInjectionTargetWrapper(Class<T>
javaEeComponentClass)
+ public <T> Producer<T> getProducerForJavaEeComponent(Class<T>
javaEeComponentClass)
{
Asserts.assertNotNull(javaEeComponentClass);
- return (Producer<T>)
injectionTargetForJavaEeComponents.get(javaEeComponentClass);
+ return (Producer<T>)
producersForJavaEeComponents.get(javaEeComponentClass);
}
public ErrorStack getErrorStack()
@@ -1110,7 +1110,7 @@ public class BeanManagerImpl implements
contextMap.clear();
deploymentBeans.clear();
errorStack.clear();
- injectionTargetForJavaEeComponents.clear();
+ producersForJavaEeComponents.clear();
producers.clear();
passivationBeans.clear();
webBeansDecorators.clear();
Modified:
openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatUtil.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatUtil.java?rev=1413575&r1=1413574&r2=1413575&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatUtil.java
(original)
+++
openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatUtil.java
Mon Nov 26 12:30:20 2012
@@ -54,7 +54,7 @@ public class TomcatUtil
try
{
final BeanManagerImpl beanManager =
WebBeansContext.currentInstance().getBeanManagerImpl();
- final Producer producer =
beanManager.getInjectionTargetWrapper(instance.object.getClass());
+ final Producer producer =
beanManager.getProducerForJavaEeComponent(instance.object.getClass());
if (producer != null)
{
producer.dispose(instance.object);
Modified:
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatUtil.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatUtil.java?rev=1413575&r1=1413574&r2=1413575&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatUtil.java
(original)
+++
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatUtil.java
Mon Nov 26 12:30:20 2012
@@ -54,7 +54,7 @@ public class TomcatUtil
try
{
final BeanManagerImpl beanManager =
WebBeansContext.currentInstance().getBeanManagerImpl();
- final Producer producer =
beanManager.getInjectionTargetWrapper(instance.object.getClass());
+ final Producer producer =
beanManager.getProducerForJavaEeComponent(instance.object.getClass());
if (producer != null)
{
producer.dispose(instance.object);
