Author: scabanovich Date: 2011-08-08 20:32:39 -0400 (Mon, 08 Aug 2011) New Revision: 33705 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionManager.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IBuildParticipantFeature.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/scanner/ImplementationCollector.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib/ClassPathMonitor.java Log: JBIDE-9484 https://issues.jboss.org/browse/JBIDE-9484 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionManager.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionManager.java 2011-08-09 00:07:34 UTC (rev 33704) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionManager.java 2011-08-09 00:32:39 UTC (rev 33705) @@ -146,12 +146,6 @@ } public Set<IBuildParticipantFeature> getBuildParticipantFeatures() { - if(!featureStorage.containsKey(IBuildParticipantFeature.class)) { - Set<IBuildParticipantFeature> result = getFeatures(IBuildParticipantFeature.class); - for (IBuildParticipantFeature f: result) { - f.setProject(n); - } - } return getFeatures(IBuildParticipantFeature.class); } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IBuildParticipantFeature.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IBuildParticipantFeature.java 2011-08-09 00:07:34 UTC (rev 33704) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IBuildParticipantFeature.java 2011-08-09 00:32:39 UTC (rev 33705) @@ -15,6 +15,7 @@ import org.eclipse.jdt.core.IPackageFragmentRoot; import org.jboss.tools.cdi.core.CDICoreNature; import org.jboss.tools.cdi.core.extension.IDefinitionContextExtension; +import org.jboss.tools.cdi.internal.core.impl.CDIProject; import org.jboss.tools.cdi.internal.core.scanner.FileSet; import org.jboss.tools.common.model.XModelObject; @@ -32,12 +33,6 @@ public interface IBuildParticipantFeature extends ICDIFeature { /** - * Sets CDI project access object once per lifetime of this object. - * @param n - */ - public void setProject(CDICoreNature n); - - /** * Implementation should create and keep one instance of IDefinitionContextExtension. * * @return @@ -85,6 +80,6 @@ * * This method corresponds to AfterBeanDiscovery event. */ - public void buildBeans(); + public void buildBeans(CDIProject target); } 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-08-09 00:07:34 UTC (rev 33704) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-08-09 00:32:39 UTC (rev 33705) @@ -1043,7 +1043,15 @@ rebuildBeans(); Set<IBuildParticipantFeature> buildParticipants = n.getExtensionManager().getBuildParticipantFeatures(); - for (IBuildParticipantFeature p: buildParticipants) p.buildBeans(); + for (IBuildParticipantFeature p: buildParticipants) p.buildBeans(this); + + Set<CDICoreNature> ds = n.getCDIProjects(true); + for (CDICoreNature c: ds) { + Set<IBuildParticipantFeature> bs = c.getExtensionManager().getBuildParticipantFeatures(); + for (IBuildParticipantFeature bp: bs) { + bp.buildBeans(this); + } + } CDICoreNature[] ps = n.getDependentProjects().toArray(new CDICoreNature[0]); for (CDICoreNature p: ps) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/ImplementationCollector.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/ImplementationCollector.java 2011-08-09 00:07:34 UTC (rev 33704) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/ImplementationCollector.java 2011-08-09 00:32:39 UTC (rev 33705) @@ -41,7 +41,7 @@ void process() throws JavaModelException { for (TypeDefinition typeDef: typeDefinitions) { IType type = typeDef.getType(); - if(type == null || type.isInterface()) continue; + if(type == null || !type.exists() || type.isInterface()) continue; if(!mayBeRelevant(type)) continue; Set<IParametedType> types = typeDef.getInheritedTypes(); for (IParametedType t: types) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib/ClassPathMonitor.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib/ClassPathMonitor.java 2011-08-09 00:07:34 UTC (rev 33704) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib/ClassPathMonitor.java 2011-08-09 00:32:39 UTC (rev 33705) @@ -97,7 +97,6 @@ for (FileAnyImpl s: servicesInSrc.keySet()) { IResource r = (IResource)s.getAdapter(IResource.class); if(r != null && r.exists()) { - System.out.println(project.getProject() + ":" + r); project.getExtensionManager().setRuntimes(r.getFullPath().toString(), readRuntimesInService(s)); } }