[jbosstools-commits] JBoss Tools SVN: r31894 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.
Author: scabanovich
Date: 2011-06-07 18:42:58 -0400 (Tue, 07 Jun 2011)
New Revision: 31894
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
Log:
JBIDE-8695
https://issues.jboss.org/browse/JBIDE-8695
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 2011-06-07
22:27:12 UTC (rev 31893)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-06-07
22:42:58 UTC (rev 31894)
@@ -12,6 +12,7 @@
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -414,7 +415,7 @@
return false;
}
- public static boolean areMatchingQualifiers(Set<IQualifierDeclaration>
beanQualifiers, Set<IQualifierDeclaration> injectionQualifiers) throws CoreException
{
+ public static boolean areMatchingQualifiers(Collection<IQualifierDeclaration>
beanQualifiers, Collection<IQualifierDeclaration> injectionQualifiers) throws
CoreException {
if(beanQualifiers.isEmpty()) {
if(injectionQualifiers.isEmpty()) {
return true;
@@ -899,17 +900,8 @@
if(!p.isAnnotationPresent(CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME)) continue;
IParametedType type = p.getType();
if(!containsType(types, type)) continue;
- Set<IType> qts = new HashSet<IType>();
- Set<String> ts = ((Parameter)p).getAnnotationTypes();
- for (String t: ts) {
- QualifierElement q = getQualifier(t);
- if(q != null && q.getSourceType() != null) {
- qts.add(q.getSourceType());
- }
- }
- IType[] qtsa = qts.toArray(new IType[0]);
try {
- if(areMatchingQualifiers(qs, qtsa)) {
+ if(areMatchingQualifiers(qs, p.getQualifierDeclarations())) {
match = p;
break;
}