Author: scabanovich Date: 2009-12-18 11:34:57 -0500 (Fri, 18 Dec 2009) New Revision: 19468 Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeansXMLData.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.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/ClassBean.java 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/definition/AbstractTypeDefinition.java 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/scanner/CDIBuilderDelegate.java Log: https://jira.jboss.org/jira/browse/JBIDE-4943 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java 2009-12-18 16:24:22 UTC (rev 19467) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java 2009-12-18 16:34:57 UTC (rev 19468) @@ -53,4 +53,13 @@ * @return a set of observer methods of the bean */ Set<IObserverMethod> getObserverMethods(); + + + /** + * Returns all directly derived classes that declare annotation @Specializes + * + * @return + */ + Set<? extends IClassBean> getSpecializingBeans(); + } \ No newline at end of file Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeansXMLData.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeansXMLData.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeansXMLData.java 2009-12-18 16:34:57 UTC (rev 19468) @@ -0,0 +1,118 @@ +package org.jboss.tools.cdi.internal.core.impl; + +import java.util.HashSet; +import java.util.Set; + +import org.jboss.tools.common.text.INodeReference; + +public class BeansXMLData { + + private Set<INodeReference> interceptors = new HashSet<INodeReference>(); + private Set<INodeReference> decorators = new HashSet<INodeReference>(); + private Set<INodeReference> stereotypeAlternatives = new HashSet<INodeReference>(); + private Set<INodeReference> typeAlternatives = new HashSet<INodeReference>(); + + private Set<String> interceptorTypes = new HashSet<String>(); + private Set<String> decoratorTypes = new HashSet<String>(); + private Set<String> stereotypeAlternativeTypes = new HashSet<String>(); + private Set<String> typeAlternativeTypes = new HashSet<String>(); + + public BeansXMLData() {} + + public void clean() { + synchronized(interceptors) { + interceptors.clear(); + } + synchronized (decorators) { + decorators.clear(); + } + synchronized (stereotypeAlternatives) { + stereotypeAlternatives.clear(); + } + synchronized (typeAlternatives) { + typeAlternatives.clear(); + } + synchronized (interceptorTypes) { + interceptorTypes.clear(); + } + synchronized (decoratorTypes) { + decoratorTypes.clear(); + } + synchronized (stereotypeAlternativeTypes) { + stereotypeAlternativeTypes.clear(); + } + synchronized (typeAlternativeTypes) { + typeAlternativeTypes.clear(); + } + } + + public Set<INodeReference> getInterceptors() { + return interceptors; + } + + public Set<INodeReference> getDecorators() { + return decorators; + } + + public Set<INodeReference> getStereotypeAlternatives() { + return stereotypeAlternatives; + } + + public Set<INodeReference> getTypeAlternatives() { + return typeAlternatives; + } + + public Set<String> getInterceptorTypes() { + return interceptorTypes; + } + + public Set<String> getDecoratorTypes() { + return decoratorTypes; + } + + public Set<String> getStereotypeAlternativeTypes() { + return stereotypeAlternativeTypes; + } + + public Set<String> getTypeAlternativeTypes() { + return typeAlternativeTypes; + } + + public void addInterceptor(INodeReference r) { + synchronized (interceptors) { + interceptors.add(r); + } + if (r.getValue() != null) + synchronized (interceptorTypes) { + interceptorTypes.add(r.getValue()); + } + } + + public void addDecorator(INodeReference r) { + synchronized (decorators) { + decorators.add(r); + } + synchronized (decoratorTypes) { + decoratorTypes.add(r.getValue()); + } + } + + public void addStereotypeAlternative(INodeReference r) { + synchronized (stereotypeAlternatives) { + stereotypeAlternatives.add(r); + } + synchronized (stereotypeAlternativeTypes) { + stereotypeAlternativeTypes.add(r.getValue()); + } + } + + public void addTypeAlternative(INodeReference r) { + synchronized (typeAlternatives) { + typeAlternatives.add(r); + } + synchronized (typeAlternativeTypes) { + typeAlternativeTypes.add(r.getValue()); + } + } + +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeansXMLData.java ___________________________________________________________________ Name: svn:mime-type + text/plain 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 2009-12-18 16:24:22 UTC (rev 19467) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2009-12-18 16:34:57 UTC (rev 19468) @@ -56,12 +56,9 @@ private Map<IPath, Set<IBean>> beansByPath = new HashMap<IPath, Set<IBean>>(); private Map<String, Set<IBean>> beansByName = new HashMap<String, Set<IBean>>(); private Set<IBean> namedBeans = new HashSet<IBean>(); - - private Set<INodeReference> interceptors = new HashSet<INodeReference>(); - private Set<INodeReference> decorators = new HashSet<INodeReference>(); - private Set<INodeReference> stereotypeAlternatives = new HashSet<INodeReference>(); - private Set<INodeReference> typeAlternatives = new HashSet<INodeReference>(); + private Map<IType, ClassBean> classBeans = new HashMap<IType, ClassBean>(); + BeansXMLData beansXMLData = new BeansXMLData(); public CDIProject() {} @@ -75,6 +72,7 @@ public List<INodeReference> getAlternativeClasses() { List<INodeReference> result = new ArrayList<INodeReference>(); + Set<INodeReference> typeAlternatives = beansXMLData.getTypeAlternatives(); synchronized (typeAlternatives) { result.addAll(typeAlternatives); } @@ -83,19 +81,26 @@ public List<INodeReference> getAlternativeStereotypes() { List<INodeReference> result = new ArrayList<INodeReference>(); + Set<INodeReference> stereotypeAlternatives = beansXMLData.getStereotypeAlternatives(); synchronized (stereotypeAlternatives) { result.addAll(stereotypeAlternatives); } return result; } + public boolean isClassAlternativeActivated(String fullQualifiedTypeName) { + return beansXMLData.getTypeAlternativeTypes().contains(fullQualifiedTypeName); + } + public List<INodeReference> getAlternatives(String fullQualifiedTypeName) { List<INodeReference> result = new ArrayList<INodeReference>(); + Set<INodeReference> typeAlternatives = beansXMLData.getTypeAlternatives(); synchronized (typeAlternatives) { for (INodeReference r: typeAlternatives) { if(fullQualifiedTypeName.equals(r.getValue())) result.add(r); } } + Set<INodeReference> stereotypeAlternatives = beansXMLData.getStereotypeAlternatives(); synchronized (stereotypeAlternatives) { for (INodeReference r: stereotypeAlternatives) { if(fullQualifiedTypeName.equals(r.getValue())) result.add(r); @@ -166,6 +171,7 @@ public List<INodeReference> getDecoratorClasses() { List<INodeReference> result = new ArrayList<INodeReference>(); + Set<INodeReference> decorators = beansXMLData.getDecorators(); synchronized (decorators) { result.addAll(decorators); } @@ -174,6 +180,7 @@ public List<INodeReference> getDecoratorClasses(String fullQualifiedTypeName) { List<INodeReference> result = new ArrayList<INodeReference>(); + Set<INodeReference> decorators = beansXMLData.getDecorators(); synchronized (decorators) { for (INodeReference r: decorators) { if(fullQualifiedTypeName.equals(r.getValue())) result.add(r); @@ -184,6 +191,7 @@ public List<INodeReference> getInterceptorClasses() { List<INodeReference> result = new ArrayList<INodeReference>(); + Set<INodeReference> interceptors = beansXMLData.getInterceptors(); synchronized (interceptors) { result.addAll(interceptors); } @@ -193,6 +201,7 @@ public List<INodeReference> getInterceptorClasses( String fullQualifiedTypeName) { List<INodeReference> result = new ArrayList<INodeReference>(); + Set<INodeReference> interceptors = beansXMLData.getInterceptors(); synchronized (interceptors) { for (INodeReference r: interceptors) { if(fullQualifiedTypeName.equals(r.getValue())) result.add(r); @@ -351,9 +360,9 @@ } public void update() { + rebuildXML(); rebuildAnnotationTypes(); rebuildBeans(); - rebuildXML(); } void rebuildAnnotationTypes() { @@ -393,16 +402,10 @@ } void rebuildBeans() { - synchronized (beansByPath) { - beansByPath.clear(); - } - synchronized (beansByName) { - beansByName.clear(); - } - synchronized (namedBeans) { - namedBeans.clear(); - } List<TypeDefinition> typeDefinitions = n.getDefinitions().getTypeDefinitions(); + List<IBean> beans = new ArrayList<IBean>(); + Map<IType, ClassBean> newClassBeans = new HashMap<IType, ClassBean>(); + for (TypeDefinition typeDefinition : typeDefinitions) { ClassBean bean = null; if(typeDefinition.getInterceptorAnnotation() != null) { @@ -416,12 +419,41 @@ } bean.setParent(this); bean.setDefinition(typeDefinition); - addBean(bean); + + beans.add(bean); + newClassBeans.put(typeDefinition.getType(), bean); + Set<IProducer> ps = bean.getProducers(); for (IProducer producer: ps) { - addBean(producer); + beans.add(producer); } } + + for (ClassBean bean: newClassBeans.values()) { + ParametedType s = bean.getDefinition().getSuperType(); + if(s != null && s.getType() != null) { + ClassBean superClassBean = newClassBeans.get(s.getType()); + if(superClassBean != null) { + bean.setSuperClassBean(superClassBean); + } + } + } + + + synchronized (beansByPath) { + beansByPath.clear(); + } + synchronized (beansByName) { + beansByName.clear(); + } + synchronized (namedBeans) { + namedBeans.clear(); + } + classBeans = newClassBeans; + for (IBean bean: beans) { + addBean(bean); + } + System.out.println("Project=" + getNature().getProject()); System.out.println("Qualifiers=" + qualifiers.size()); System.out.println("Stereotypes=" + stereotypes.size()); @@ -461,31 +493,20 @@ } void rebuildXML() { - synchronized (interceptors) { - interceptors.clear(); - } - synchronized (decorators) { - decorators.clear(); - } - synchronized (stereotypeAlternatives) { - stereotypeAlternatives.clear(); - } - synchronized (typeAlternatives) { - typeAlternatives.clear(); - } + beansXMLData.clean(); Set<BeansXMLDefinition> beanXMLs = n.getDefinitions().getBeansXMLDefinitions(); for (BeansXMLDefinition b: beanXMLs) { - synchronized (interceptors) { - interceptors.addAll(b.getInterceptors()); + for (INodeReference r: b.getInterceptors()) { + beansXMLData.addInterceptor(r); } - synchronized (decorators) { - decorators.addAll(b.getDecorators()); + for (INodeReference r: b.getDecorators()) { + beansXMLData.addDecorator(r); } - synchronized (stereotypeAlternatives) { - stereotypeAlternatives.addAll(b.getStereotypeAlternatives()); + for (INodeReference r: b.getStereotypeAlternatives()) { + beansXMLData.addStereotypeAlternative(r); } - synchronized (typeAlternatives) { - typeAlternatives.addAll(b.getTypeAlternatives()); + for (INodeReference r: b.getTypeAlternatives()) { + beansXMLData.addTypeAlternative(r); } } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2009-12-18 16:24:22 UTC (rev 19467) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2009-12-18 16:34:57 UTC (rev 19468) @@ -45,6 +45,9 @@ * */ public class ClassBean extends AbstractBeanElement implements IClassBean { + protected ClassBean superClassBean = null; + protected Set<ClassBean> specializingClassBeans = new HashSet<ClassBean>(); + protected List<BeanField> fields = new ArrayList<BeanField>(); protected List<BeanMethod> methods = new ArrayList<BeanMethod>(); @@ -99,6 +102,17 @@ return result; } + public void setSuperClassBean(ClassBean bean) { + superClassBean = bean; + if(superClassBean != null && isSpecializing()) { + superClassBean.specializingClassBeans.add(this); + } + } + + public ClassBean getSuperClassBean() { + return superClassBean; + } + public Set<IBeanMethod> getDisposers() { // TODO return new HashSet<IBeanMethod>(); @@ -174,6 +188,10 @@ } public String getName() { + ClassBean specialized = getSpecializedBean(); + if(specialized != null) { + return specialized.getName(); + } AnnotationDeclaration named = findNamedAnnotation(); if(named == null) return null; @@ -205,14 +223,17 @@ return null; } - public IBean getSpecializedBean() { + public ClassBean getSpecializedBean() { if(getDefinition().getSpecializesAnnotation() == null) { return null; } - // TODO Auto-generated method stub - return null; + return superClassBean; } + public Set<ClassBean> getSpecializingBeans() { + return specializingClassBeans; + } + public IAnnotationDeclaration getSpecializesAnnotationDeclaration() { return getDefinition().getSpecializesAnnotation(); } @@ -233,8 +254,16 @@ } public boolean isEnabled() { + if(!specializingClassBeans.isEmpty()) { + return false; + } + if(getDefinition().getAlternativeAnnotation() != null) { + if(!getCDIProject().isClassAlternativeActivated(getDefinition().getQualifiedName())) { + return false; + } + } // TODO - return false; + return true; } public boolean isSpecializing() { 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 2009-12-18 16:24:22 UTC (rev 19467) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java 2009-12-18 16:34:57 UTC (rev 19468) @@ -10,6 +10,9 @@ ******************************************************************************/ package org.jboss.tools.cdi.internal.core.impl; +import java.util.ArrayList; +import java.util.List; + import org.eclipse.jdt.core.IType; import org.jboss.tools.cdi.core.IParametedType; @@ -21,6 +24,7 @@ public class ParametedType implements IParametedType { protected IType type; protected String signature; + protected List<ParametedType> parameterTypes = new ArrayList<ParametedType>(); public ParametedType() {} @@ -32,8 +36,16 @@ return signature; } + public void setType(IType type) { + this.type = type; + } + public void setSignature(String signature) { this.signature = signature; } + public void addParameter(ParametedType p) { + parameterTypes.add(p); + } + } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2009-12-18 16:24:22 UTC (rev 19467) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2009-12-18 16:34:57 UTC (rev 19468) @@ -16,6 +16,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.IType; import org.jboss.tools.cdi.core.IParametedType; +import org.jboss.tools.cdi.internal.core.impl.ParametedType; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector; import org.jboss.tools.common.model.util.EclipseJavaUtil; @@ -27,6 +28,7 @@ public class AbstractTypeDefinition extends AbstractMemberDefinition { protected String qualifiedName; protected IType type; + protected ParametedType superType = null; protected Set<IParametedType> inheritedTypes = new HashSet<IParametedType>(); public AbstractTypeDefinition() {} @@ -48,24 +50,15 @@ this.type = contextType; super.init(contextType, context); qualifiedName = getType().getFullyQualifiedName(); - String sc = type.getSuperclassTypeSignature(); - if(sc != null) { - //TODO process parameter types correctly!!! - sc = EclipseJavaUtil.resolveTypeAsString(contextType, sc); - if(sc != null && sc.length() > 0) { - IType t = EclipseJavaUtil.findType(contextType.getJavaProject(), sc); -//TODO -// if(t != null) inheritedTypes.add(t); - } + if(!type.isInterface() && !type.isAnnotation()) { + String sc = type.getSuperclassTypeSignature(); + superType = ParametedTypeFactory.getParametedType(type, sc); + if(superType != null) inheritedTypes.add(superType); } String[] is = type.getSuperInterfaceTypeSignatures(); if(is != null) for (int i = 0; i < is.length; i++) { - String c = EclipseJavaUtil.resolveTypeAsString(contextType, is[i]); - if(c != null && c.length() > 0) { - IType t = EclipseJavaUtil.findType(contextType.getJavaProject(), c); -//TODO -// if(t != null) inheritedTypes.add(t); - } + ParametedType t = ParametedTypeFactory.getParametedType(type, is[i]); + if(t != null) inheritedTypes.add(t); } } Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java 2009-12-18 16:34:57 UTC (rev 19468) @@ -0,0 +1,52 @@ +package org.jboss.tools.cdi.internal.core.impl.definition; + +import java.util.StringTokenizer; + +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.JavaModelException; +import org.jboss.tools.cdi.internal.core.impl.ParametedType; +import org.jboss.tools.common.model.util.EclipseJavaUtil; + +public class ParametedTypeFactory { + + public static ParametedType getParametedType(IType context, String typeSignature) throws JavaModelException { + if(typeSignature == null) return null; + ParametedType result = new ParametedType(); + result.setSignature(typeSignature); + int startToken = typeSignature.indexOf('<'); + if(startToken < 0) { + String resovedTypeName = EclipseJavaUtil.resolveTypeAsString(context, typeSignature); + if(resovedTypeName == null) return null; + result.setSignature(resovedTypeName); + IType type = EclipseJavaUtil.findType(context.getJavaProject(), resovedTypeName); + if(type != null) { + result.setType(type); + return result; + } + } else { + int endToken = typeSignature.lastIndexOf('>'); + if(endToken < startToken) return null; + String typeName = typeSignature.substring(0, startToken) + typeSignature.substring(endToken + 1); + String params = typeSignature.substring(startToken + 1, endToken); + String resovedTypeName = EclipseJavaUtil.resolveTypeAsString(context, typeName); + if(resovedTypeName == null) return null; + IType type = EclipseJavaUtil.findType(context.getJavaProject(), resovedTypeName); + if(type != null) { + result.setType(type); + result.setSignature(resovedTypeName + '<' + params + '>'); + StringTokenizer st = new StringTokenizer(params, ","); + while(st.hasMoreTokens()) { + String paramSignature = st.nextToken(); + ParametedType param = getParametedType(context, paramSignature); + if(param == null) { + param = new ParametedType(); + param.setSignature(paramSignature); + } + result.addParameter(param); + } + return result; + } + } + return null; + } +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain 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 2009-12-18 16:24:22 UTC (rev 19467) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java 2009-12-18 16:34:57 UTC (rev 19468) @@ -20,6 +20,7 @@ import org.eclipse.jdt.core.IType; import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.internal.core.impl.AnnotationDeclaration; +import org.jboss.tools.cdi.internal.core.impl.ParametedType; /** * @@ -30,10 +31,6 @@ boolean isAbstract; List<FieldDefinition> fields = new ArrayList<FieldDefinition>(); List<MethodDefinition> methods = new ArrayList<MethodDefinition>(); - AnnotationDeclaration decoratorAnnotation; - AnnotationDeclaration interceptorAnnotation; - AnnotationDeclaration statefulAnnotation; - AnnotationDeclaration statelessAnnotation; public TypeDefinition() { } @@ -64,6 +61,10 @@ } } + public ParametedType getSuperType() { + return superType; + } + public List<FieldDefinition> getFields() { return fields; } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/CDIBuilderDelegate.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/CDIBuilderDelegate.java 2009-12-18 16:24:22 UTC (rev 19467) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/CDIBuilderDelegate.java 2009-12-18 16:34:57 UTC (rev 19468) @@ -3,16 +3,10 @@ import java.util.Map; import java.util.Set; -import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; -import org.eclipse.jdt.core.IAnnotation; -import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IType; -import org.eclipse.jdt.core.JavaModelException; import org.jboss.tools.cdi.core.CDICoreNature; -import org.jboss.tools.cdi.core.CDICorePlugin; import org.jboss.tools.cdi.core.ICDIBuilderDelegate; import org.jboss.tools.cdi.core.ICDIProject; import org.jboss.tools.cdi.internal.core.impl.CDIProject;