Author: scabanovich Date: 2011-04-21 15:37:35 -0400 (Thu, 21 Apr 2011) New Revision: 30719 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/internal/core/impl/CDIProject.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java Log: JBIDE-8017 https://issues.jboss.org/browse/JBIDE-8017 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 2011-04-21 19:30:38 UTC (rev 30718) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java 2011-04-21 19:37:35 UTC (rev 30719) @@ -87,6 +87,7 @@ public String PRINCIPAL_TYPE_NAME = "java.security.Principal"; public String VALIDATION_FACTORY_TYPE_NAME = "javax.validation.ValidatorFactory"; public String VALIDATOR_TYPE_NAME = "javax.validation.Validator"; + public String BEAN_MANAGER_TYPE_NAME = "javax.enterprise.inject.spi.BeanManager"; public String ANNOTATION_LITERAL_TYPE_NAME = "javax.enterprise.util.AnnotationLiteral"; 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-04-21 19:30:38 UTC (rev 30718) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-04-21 19:37:35 UTC (rev 30719) @@ -412,6 +412,7 @@ BUILT_IN.add(CDIConstants.PRINCIPAL_TYPE_NAME); BUILT_IN.add(CDIConstants.VALIDATION_FACTORY_TYPE_NAME); BUILT_IN.add(CDIConstants.VALIDATOR_TYPE_NAME); + BUILT_IN.add(CDIConstants.BEAN_MANAGER_TYPE_NAME); } static boolean isBuiltIn(IType type) { return type != null && BUILT_IN.contains(type.getFullyQualifiedName()); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java 2011-04-21 19:30:38 UTC (rev 30718) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java 2011-04-21 19:37:35 UTC (rev 30719) @@ -83,9 +83,9 @@ if(!hasConstructor) { hasBeanConstructor = true; } - if(!hasBeanConstructor && getType().getFullyQualifiedName().equals(CDIConstants.WELD_BEAN_MANAGER_TYPE_NAME)) { - hasBeanConstructor = true; - } +// if(!hasBeanConstructor && getType().getFullyQualifiedName().equals(CDIConstants.WELD_BEAN_MANAGER_TYPE_NAME)) { +// hasBeanConstructor = true; +// } } public ParametedType getSuperType() { Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java 2011-04-21 19:30:38 UTC (rev 30718) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java 2011-04-21 19:37:35 UTC (rev 30719) @@ -13,6 +13,7 @@ import java.util.Set; import org.eclipse.jdt.core.IType; +import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.IInjectionPointField; import org.jboss.tools.cdi.internal.core.impl.BuiltInBean; @@ -72,7 +73,18 @@ t = b.getBeanClass(); assertEquals("java.security.Principal", t.getFullyQualifiedName()); - + //javax.enterprise.inject.spi.BeanManager + field = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/context/conversation/BuiltInConversation.java", "manager"); + assertNotNull(field); + + beans = field.getCDIProject().getBeans(false, field); + assertFalse(beans.isEmpty()); + + b = beans.iterator().next(); + assertTrue(b instanceof BuiltInBean); + t = b.getBeanClass(); + assertEquals(CDIConstants.BEAN_MANAGER_TYPE_NAME, t.getFullyQualifiedName()); + } } \ No newline at end of file