Author: scabanovich
Date: 2010-08-30 09:47:14 -0400 (Mon, 30 Aug 2010)
New Revision: 24546
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/CDIProject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.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:40:45 UTC (rev 24545)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2010-08-30
13:47:14 UTC (rev 24546)
@@ -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 & AnnotationDefinition.QUALIFIER) > 0) {
+ if(k > 0 && (k & AnnotationDefinition.QUALIFIER) > 0) {
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 & AnnotationDefinition.SCOPE) > 0) {
+ if(k > 0 && (k & AnnotationDefinition.SCOPE) > 0) {
result.add((IScopeDeclaration)d);
}
}
@@ -344,5 +344,5 @@
}
return result;
}
-
+
}
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-08-30
13:40:45 UTC (rev 24545)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-08-30
13:47:14 UTC (rev 24546)
@@ -683,7 +683,7 @@
}
int k = n.getDefinitions().getAnnotationKind(annotationType);
- return (k & AnnotationDefinition.QUALIFIER) > 0;
+ return k > 0 && (k & AnnotationDefinition.QUALIFIER) > 0;
}
public boolean isScope(IType annotationType) {
@@ -695,7 +695,7 @@
}
int k = n.getDefinitions().getAnnotationKind(annotationType);
- return (k & AnnotationDefinition.SCOPE) > 0;
+ return k > 0 && (k & AnnotationDefinition.SCOPE) > 0;
}
public boolean isStereotype(IType annotationType) {
@@ -707,7 +707,7 @@
}
int k = n.getDefinitions().getAnnotationKind(annotationType);
- return (k & AnnotationDefinition.STEREOTYPE) > 0;
+ return k > 0 && (k & AnnotationDefinition.STEREOTYPE) > 0;
}
public Set<IBean> resolve(Set<IBean> beans) {
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java 2010-08-30
13:40:45 UTC (rev 24545)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java 2010-08-30
13:47:14 UTC (rev 24546)
@@ -70,19 +70,19 @@
a.setDeclaration(ts[i], contextType);
AnnotationDeclaration b = null;
int kind = context.getAnnotationKind(a.getType());
- if((kind & AnnotationDefinition.STEREOTYPE) > 0) {
+ if(kind > 0 && (kind & AnnotationDefinition.STEREOTYPE) > 0) {
b = new StereotypeDeclaration(a);
annotations.add(b);
}
- if((kind & AnnotationDefinition.INTERCEPTOR_BINDING) > 0) {
+ if(kind > 0 && (kind & AnnotationDefinition.INTERCEPTOR_BINDING) >
0) {
b = new InterceptorBindingDeclaration(a);
annotations.add(b);
}
- if((kind & AnnotationDefinition.QUALIFIER) > 0) {
+ if(kind > 0 && (kind & AnnotationDefinition.QUALIFIER) > 0) {
b = new QualifierDeclaration(a);
annotations.add(b);
}
- if((kind & AnnotationDefinition.SCOPE) > 0) {
+ if(kind > 0 && (kind & AnnotationDefinition.SCOPE) > 0) {
b = new ScopeDeclaration(a);
annotations.add(b);
}