Author: scabanovich
Date: 2010-12-27 08:41:52 -0500 (Mon, 27 Dec 2010)
New Revision: 27749
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java
Log:
JBIDE-7946
https://issues.jboss.org/browse/JBIDE-7946
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2010-12-27
12:10:44 UTC (rev 27748)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2010-12-27
13:41:52 UTC (rev 27749)
@@ -145,14 +145,8 @@
if(ps == null || ps.isEmpty()) {
return getDefinitions().getAllAnnotations();
}
- List<AnnotationDefinition> ds = getDefinitions().getAllAnnotations();
List<AnnotationDefinition> result = new ArrayList<AnnotationDefinition>();
- result.addAll(ds);
Set<IType> types = new HashSet<IType>();
- for (AnnotationDefinition d: ds) {
- IType t = d.getType();
- if(t != null) types.add(t);
- }
for (CDICoreNature p: ps) {
List<AnnotationDefinition> ds2 = p.getDefinitions().getAllAnnotations();
for (AnnotationDefinition d: ds2) {
@@ -163,6 +157,16 @@
}
}
}
+
+ List<AnnotationDefinition> ds = getDefinitions().getAllAnnotations();
+ for (AnnotationDefinition d: ds) {
+ IType t = d.getType();
+ if(t != null && !types.contains(t)) {
+ types.add(t);
+ result.add(d);
+ }
+ }
+
return result;
}