Author: scabanovich
Date: 2010-08-30 09:55:09 -0400 (Mon, 30 Aug 2010)
New Revision: 24548
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java
Log:
https://jira.jboss.org/browse/JBIDE-6935
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2010-08-30
13:48:15 UTC (rev 24547)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2010-08-30
13:55:09 UTC (rev 24548)
@@ -170,7 +170,7 @@
Set<IQualifier> qs = new HashSet<IQualifier>();
for(IAnnotationDeclaration a: definition.getAnnotations()) {
int k = getCDIProject().getNature().getDefinitions().getAnnotationKind(a.getType());
- if(k > 0 && (k & AnnotationDefinition.QUALIFIER) > 0) {
+ if(k > 0 && (k & AnnotationDefinition.QUALIFIER) > 0 && a
instanceof IQualifierDeclaration) {
IQualifierDeclaration q = (IQualifierDeclaration)a;
result.add(q);
if(q.getQualifier() != null) qs.add(q.getQualifier());
@@ -250,7 +250,7 @@
Set<IScopeDeclaration> result = new HashSet<IScopeDeclaration>();
for (IAnnotationDeclaration d: ds) {
int k = n.getDefinitions().getAnnotationKind(d.getType());
- if(k > 0 && (k & AnnotationDefinition.SCOPE) > 0) {
+ if(k > 0 && (k & AnnotationDefinition.SCOPE) > 0 && d
instanceof IScopeDeclaration) {
result.add((IScopeDeclaration)d);
}
}