[jbosstools-commits] JBoss Tools SVN: r30493 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: core/extension/feature and 1 other directories.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2011-04-11 17:57:01 -0400 (Mon, 11 Apr 2011)
New Revision: 30493

Modified:
   trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.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/ClassBean.java
Log:
JBIDE-8712
https://issues.jboss.org/browse/JBIDE-8712

Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java	2011-04-11 21:55:54 UTC (rev 30492)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java	2011-04-11 21:57:01 UTC (rev 30493)
@@ -219,7 +219,7 @@
 			rv.incremental = false;
 			getProject().accept(rv);
 			FileSet fs = rv.fileSet;
-			builderDelegate.build(fs, getCDICoreNature());
+			invokeBuilderDelegates(fs, getCDICoreNature());
 			
 		} catch (CoreException e) {
 			CDICorePlugin.getDefault().logError(e);
@@ -233,7 +233,7 @@
 		delta.accept(new SampleDeltaVisitor());
 		FileSet fs = rv.fileSet;
 //		fs.getPackages().
-		builderDelegate.build(fs, getCDICoreNature());
+		invokeBuilderDelegates(fs, getCDICoreNature());
 	}
 
 	protected void buildJars(Map<String, XModelObject> newJars) throws CoreException {
@@ -274,9 +274,14 @@
 			for (IBuildParticipantFeature p: buildParticipants) p.visitJar(path, root, beansXML);
 		}
 		addBasicTypes(fileSet);
-		builderDelegate.build(fileSet, getCDICoreNature());
+		invokeBuilderDelegates(fileSet, getCDICoreNature());
 	}
 
+	void invokeBuilderDelegates(FileSet fileSet, CDICoreNature n) {
+		builderDelegate.build(fileSet, n);
+		for (IBuildParticipantFeature p: buildParticipants) p.buildDefinitions(fileSet);
+	}
+
 	void addBasicTypes(FileSet fs) throws CoreException {
 		IJavaProject jp = EclipseResourceUtil.getJavaProject(getProject());
 		if(jp == null) return;

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-04-11 21:55:54 UTC (rev 30492)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IBuildParticipantFeature.java	2011-04-11 21:57:01 UTC (rev 30493)
@@ -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.scanner.FileSet;
 import org.jboss.tools.common.model.XModelObject;
 
 /**
@@ -72,6 +73,14 @@
 	public void buildDefinitions();
 
 	/**
+	 * Build specific models for default bean sources.
+	 * That may allow to go without implementing visitor methods 
+	 * 
+	 * @param fileSet
+	 */
+	public void buildDefinitions(FileSet fileSet);
+
+	/**
 	 * Builds CDI artifacts by definitions and already existing CDI model.
 	 * 
 	 * This method corresponds to AfterBeanDiscovery event.

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	2011-04-11 21:55:54 UTC (rev 30492)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java	2011-04-11 21:57:01 UTC (rev 30493)
@@ -39,6 +39,7 @@
 import org.jboss.tools.cdi.core.IStereotypeDeclaration;
 import org.jboss.tools.cdi.core.ITypeDeclaration;
 import org.jboss.tools.cdi.internal.core.impl.definition.AbstractMemberDefinition;
+import org.jboss.tools.cdi.internal.core.impl.definition.AbstractTypeDefinition;
 import org.jboss.tools.cdi.internal.core.impl.definition.FieldDefinition;
 import org.jboss.tools.cdi.internal.core.impl.definition.MethodDefinition;
 import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
@@ -315,7 +316,7 @@
 		AnnotationDeclaration named = findNamedAnnotation();
 		if(named == null) return null;
 
-		String name = ((TypeDefinition)definition).getType().getElementName();
+		String name = ((AbstractTypeDefinition)definition).getType().getElementName();
 		if(name.length() > 0) {
 			name = name.substring(0, 1).toLowerCase() + name.substring(1);
 		}