svn commit: r1433236 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: config/BeansDeployer.java util/WebBeansUtil.java

[struberg]

Author: struberg
Date: Tue Jan 15 00:27:31 2013
New Revision: 1433236

URL: http://svn.apache.org/viewvc?rev=1433236&view=rev
Log:
OWB-344 partly cleanup the InjectionTarget mess from years back 

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.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=1433236&r1=1433235&r2=1433236&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
 Tue Jan 15 00:27:31 2013
@@ -75,7 +75,6 @@ import org.apache.webbeans.exception.Web
 import 
org.apache.webbeans.exception.inject.InconsistentSpecializationException;
 import org.apache.webbeans.logger.WebBeansLoggerFacade;
 import org.apache.webbeans.portable.AnnotatedElementFactory;
-import org.apache.webbeans.portable.creation.InjectionTargetProducerRemove;
 import org.apache.webbeans.portable.events.ProcessAnnotatedTypeImpl;
 import org.apache.webbeans.portable.events.ProcessBeanImpl;
 import org.apache.webbeans.portable.events.ProcessInjectionTargetImpl;
@@ -928,7 +927,7 @@ public class BeansDeployer
                 }
 
                 Set<ObserverMethod<?>> observerMethods = new 
HashSet<ObserverMethod<?>>();
-                
((InjectionTargetProducerRemove)processInjectionTargetEvent.getInjectionTarget()).setBean(bean);
+                //X TODO WTF??? 
((InjectionTargetProducerRemove)processInjectionTargetEvent.getInjectionTarget()).setBean(bean);
                 if(managedBeanCreator.isEnabled())
                 {
                     observerMethods = 
managedBeanCreator.defineObserverMethods(bean);
@@ -1024,12 +1023,12 @@ public class BeansDeployer
             {
                 if(processInjectionTargetEvent != null)
                 {
-                    final InjectionTarget originalInjectionTarget = 
processInjectionTargetEvent.getInjectionTarget();
+                    final InjectionTarget originalInjectionTarget = 
bean.getInjectionTarget();
                     final InjectionTarget updatedInjectionTarget = 
webBeansContext.getWebBeansUtil()
-                            
.fireProcessInjectionTargetEvent(processInjectionTarget).getInjectionTarget();
+                            
.fireProcessInjectionTargetEvent(bean).getInjectionTarget();
                     if (updatedInjectionTarget != originalInjectionTarget && 
bean != null)
                     {
-                        bean.setProducer(updatedInjectionTarget);
+                        bean.setInjectionTarget(updatedInjectionTarget);
                     }
                 }
             }

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1433236&r1=1433235&r2=1433236&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
 Tue Jan 15 00:27:31 2013
@@ -1881,8 +1881,7 @@ public final class WebBeansUtil
 
     public <T> GProcessInjectionTarget 
createProcessInjectionTargetEvent(InjectionTargetBean<T> bean)
     {
-        InjectionTargetProducerRemove<T> injectionTarget = new 
InjectionTargetProducerRemove<T>(bean);
-        return new GProcessInjectionTarget(injectionTarget, 
bean.getAnnotatedType());
+        return new GProcessInjectionTarget(bean.getInjectionTarget(), 
bean.getAnnotatedType());
     }