[weld-commits] Weld SVN: r5434 - core/trunk/impl/src/main/java/org/jboss/weld/bean.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-01-11 18:27:46 -0500 (Mon, 11 Jan 2010)
New Revision: 5434

Modified:
   core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java
   core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractReceiverBean.java
   core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerField.java
   core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerMethod.java
Log:
remove tangle

Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java	2010-01-11 23:13:03 UTC (rev 5433)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java	2010-01-11 23:27:46 UTC (rev 5434)
@@ -178,7 +178,6 @@
       super.initialize(environment);
       checkProducerReturnType();
       initPassivationCapable();
-      initAlternative();
    }
 
    private void initPassivationCapable()
@@ -206,12 +205,6 @@
    }
 
    @Override
-   protected void initAlternative()
-   {
-      super.alternative = Beans.isAlternative(getWeldAnnotated(), getMergedStereotypes()) || getDeclaringBean().isAlternative();
-   }
-
-   @Override
    public boolean isPassivationCapableBean()
    {
       return passivationCapableBean;

Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractReceiverBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractReceiverBean.java	2010-01-11 23:13:03 UTC (rev 5433)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractReceiverBean.java	2010-01-11 23:27:46 UTC (rev 5434)
@@ -23,12 +23,12 @@
 import java.lang.reflect.Member;
 
 import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.Alternative;
 
 import org.jboss.weld.bootstrap.BeanDeployerEnvironment;
 import org.jboss.weld.context.WeldCreationalContext;
 import org.jboss.weld.introspector.WeldMember;
 import org.jboss.weld.manager.BeanManagerImpl;
+import org.jboss.weld.util.Beans;
 import org.slf4j.cal10n.LocLogger;
 
 /**
@@ -52,6 +52,7 @@
    public void initialize(BeanDeployerEnvironment environment)
    {
       super.initialize(environment);
+      initAlternative();
    }
 
    /**
@@ -97,18 +98,7 @@
    @Override
    protected void initAlternative()
    {
-      if (getDeclaringBean().isAlternative())
-      {
-         super.alternative = true;
-      }
-      else if (getWeldAnnotated().isAnnotationPresent(Alternative.class))
-      {
-         super.alternative = true;
-      }
-      else if (getMergedStereotypes().isAlternative())
-      {
-         super.alternative = true;
-      }
+      super.alternative = Beans.isAlternative(getWeldAnnotated(), getMergedStereotypes()) || getDeclaringBean().isAlternative();
    }
    
    @Override

Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerField.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerField.java	2010-01-11 23:13:03 UTC (rev 5433)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerField.java	2010-01-11 23:27:46 UTC (rev 5434)
@@ -70,7 +70,6 @@
       initTypes();
       initQualifiers();
       initStereotypes();
-      initAlternative();
    }
    
    @Override

Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerMethod.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerMethod.java	2010-01-11 23:13:03 UTC (rev 5433)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerMethod.java	2010-01-11 23:27:46 UTC (rev 5434)
@@ -81,7 +81,6 @@
       initQualifiers();
       this.id = new StringBuilder().append(BEAN_ID_PREFIX).append(getClass().getSimpleName()).append(BEAN_ID_SEPARATOR).append(declaringBean.getWeldAnnotated().getName()).append(getWeldAnnotated().getSignature().toString()).toString();
       initStereotypes();
-      initAlternative();
       initProducerMethodInjectableParameters();
    }