Author: scabanovich Date: 2010-09-10 10:17:29 -0400 (Fri, 10 Sep 2010) New Revision: 24870 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java Log: https://jira.jboss.org/browse/JBIDE-7044 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java 2010-09-10 14:06:15 UTC (rev 24869) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java 2010-09-10 14:17:29 UTC (rev 24870) @@ -190,7 +190,7 @@ * @see org.jboss.tools.cdi.core.IBean#isSelectedAlternative() */ public boolean isSelectedAlternative() { - if(getDefinition().getAlternativeAnnotation() != null && getCDIProject().isTypeAlternative(getBeanClass().getFullyQualifiedName())) { + if(getCDIProject().isTypeAlternative(getBeanClass().getFullyQualifiedName())) { return true; } Set<IStereotypeDeclaration> ds = getStereotypeDeclarations(); @@ -198,7 +198,11 @@ IStereotype s = d.getStereotype(); if(s != null && s.isAlternative() && getCDIProject().isStereotypeAlternative(s.getSourceType().getFullyQualifiedName()) ) return true; - } + } +// TODO how it can be selected in this case? +// if(getDefinition().getAlternativeAnnotation() == null) { +// return false; +// } return false; } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java 2010-09-10 14:06:15 UTC (rev 24869) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java 2010-09-10 14:17:29 UTC (rev 24870) @@ -243,7 +243,7 @@ * @see org.jboss.tools.cdi.core.IBean#isSelectedAlternative() */ public boolean isSelectedAlternative() { - if(getDefinition().getAlternativeAnnotation() != null && getCDIProject().isTypeAlternative(getBeanClass().getFullyQualifiedName())) { + if(getCDIProject().isTypeAlternative(getBeanClass().getFullyQualifiedName())) { return true; } Set<IStereotypeDeclaration> ds = getStereotypeDeclarations(); @@ -251,7 +251,12 @@ IStereotype s = d.getStereotype(); if(s != null && s.isAlternative() && getCDIProject().isStereotypeAlternative(s.getSourceType().getFullyQualifiedName()) ) return true; - } + } +// TODO how it can be selected in this case? +// if(getDefinition().getAlternativeAnnotation() == null) { +// return false; +// } return false; } + } \ No newline at end of file