[jbosstools-commits] JBoss Tools SVN: r22925 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2010-06-22 06:41:16 -0400 (Tue, 22 Jun 2010)
New Revision: 22925

Modified:
   trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java
   trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParametedType.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/ParametedType.java
Log:
https://jira.jboss.org/browse/JBIDE-6513

Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java	2010-06-22 08:39:41 UTC (rev 22924)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java	2010-06-22 10:41:16 UTC (rev 22925)
@@ -58,4 +58,6 @@
 	public String OBSERVERS_ANNOTATION_TYPE_NAME = "javax.enterprise.event.Observes";
 
 	public String INJECTIONPOINT_TYPE_NAME = "javax.enterprise.inject.spi.InjectionPoint";
+	
+	public String INSTANCE_TYPE_NAME = "javax.enterprise.inject.Instance";
 }
\ No newline at end of file

Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParametedType.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParametedType.java	2010-06-22 08:39:41 UTC (rev 22924)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParametedType.java	2010-06-22 10:41:16 UTC (rev 22925)
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.jboss.tools.cdi.core;
 
+import java.util.List;
+
 import org.eclipse.jdt.core.IType;
 
 /**
@@ -40,4 +42,11 @@
 	 * @return true if the type is a primitive type
 	 */
 	boolean isPrimitive();
+
+	/**
+	 * Returns type parameters
+	 * 
+	 * @return type parameters
+	 */
+	List<? extends IParametedType> getParameters();
 }
\ No newline at end of file

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-06-22 08:39:41 UTC (rev 22924)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java	2010-06-22 10:41:16 UTC (rev 22925)
@@ -254,6 +254,13 @@
 			return result;
 		}
 		
+		if(type.getType() != null && CDIConstants.INSTANCE_TYPE_NAME.equals(type.getType().getFullyQualifiedName())) {
+			List<? extends IParametedType> ps = type.getParameters();
+			if(ps != null && ps.size() == 1) {
+				type = ps.get(0);
+			}
+		}
+		
 		boolean isParameter = injectionPoint instanceof InjectionPointParameter;
 		boolean isNew = false;
 

Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java	2010-06-22 08:39:41 UTC (rev 22924)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java	2010-06-22 10:41:16 UTC (rev 22925)
@@ -129,6 +129,10 @@
 		parameterTypes.add(p);
 	}
 
+	public List<? extends IParametedType> getParameters() {
+		return parameterTypes;
+	}
+
 	public void setPositionProvider(PositionProvider p) {
 		provider = p;
 	}