[jbosstools-commits] JBoss Tools SVN: r22273 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2010-05-24 06:43:14 -0400 (Mon, 24 May 2010)
New Revision: 22273

Modified:
   trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
Log:
https://jira.jboss.org/browse/JBIDE-6311

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-05-24 08:33:04 UTC (rev 22272)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java	2010-05-24 10:43:14 UTC (rev 22273)
@@ -248,6 +248,7 @@
 		}
 		
 		boolean isParameter = injectionPoints instanceof InjectionPointParameter;
+		boolean isNew = false;
 
 		Set<IQualifierDeclaration> qs = injectionPoints.getQualifierDeclarations();
 		List<IType> qs2 = null;
@@ -256,8 +257,21 @@
 			Set<IQualifier> qs_ = ((InjectionPointParameter)injectionPoints).getQualifiers();
 			for (IQualifier q: qs_) {
 				IType t = q.getSourceType();
-				if(t != null) qs2.add(t);
+				if(t != null) {
+					if(CDIConstants.NEW_QUALIFIER_TYPE_NAME.equals(t.getFullyQualifiedName())) {
+						isNew = true;
+					} else {
+						qs2.add(t);
+					}
+				}
 			}
+		} else {
+			for (IQualifierDeclaration d: qs) {
+				if(CDIConstants.NEW_QUALIFIER_TYPE_NAME.equals(d.getType().getFullyQualifiedName())) {
+					isNew = true;
+					break;
+				}				
+			}
 		}
 		
 		Set<IBean> beans = new HashSet<IBean>();
@@ -265,6 +279,14 @@
 			beans.addAll(allBeans);
 		}
 		for (IBean b: beans) {
+			if(isNew) {
+				//TODO improve
+				IType bType = b.getBeanClass();
+				if(type.equals(bType)) {
+					result.add(b);
+				}
+				continue;
+			}
 			Set<IParametedType> types = b.getLegalTypes();
 			if(containsType(types, type)) {
 				try {