remove tangle

weld · Jan 11, 2010 · c179c08 · c179c08
1 parent 13f1af4
commit c179c08
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 22 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java b/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java
@@ -178,7 +178,6 @@ public void initialize(BeanDeployerEnvironment environment)
       super.initialize(environment);
       checkProducerReturnType();
       initPassivationCapable();
-      initAlternative();
    }
 
    private void initPassivationCapable()
@@ -205,12 +204,6 @@ else if (getScope().equals(Dependent.class) && passivationCapableBean)
       }
    }
 
-   @Override
-   protected void initAlternative()
-   {
-      super.alternative = Beans.isAlternative(getWeldAnnotated(), getMergedStereotypes()) || getDeclaringBean().isAlternative();
-   }
-
    @Override
    public boolean isPassivationCapableBean()
    {

diff --git a/impl/src/main/java/org/jboss/weld/bean/AbstractReceiverBean.java b/impl/src/main/java/org/jboss/weld/bean/AbstractReceiverBean.java
@@ -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 AbstractReceiverBean(String idSuffix, AbstractClassBean<X> declaringBean,
    public void initialize(BeanDeployerEnvironment environment)
    {
       super.initialize(environment);
+      initAlternative();
    }
 
    /**
@@ -97,18 +98,7 @@ public AbstractClassBean<X> getDeclaringBean()
    @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

diff --git a/impl/src/main/java/org/jboss/weld/bean/ProducerField.java b/impl/src/main/java/org/jboss/weld/bean/ProducerField.java
@@ -70,7 +70,6 @@ protected ProducerField(WeldField<T, X> field, AbstractClassBean<X> declaringBea
       initTypes();
       initQualifiers();
       initStereotypes();
-      initAlternative();
    }
 
    @Override

diff --git a/impl/src/main/java/org/jboss/weld/bean/ProducerMethod.java b/impl/src/main/java/org/jboss/weld/bean/ProducerMethod.java
@@ -81,7 +81,6 @@ protected ProducerMethod(WeldMethod<T, X> method, AbstractClassBean<X> declaring
       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();
    }