Author: scabanovich Date: 2011-08-08 20:33:22 -0400 (Mon, 08 Aug 2011) New Revision: 33708 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/CDISeamInternationalExtension.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDISeamPersistenceExtension.java Log: JBIDE-9484 https://issues.jboss.org/browse/JBIDE-9484 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/CDISeamInternationalExtension.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/CDISeamInternationalExtension.java 2011-08-09 00:33:04 UTC (rev 33707) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/CDISeamInternationalExtension.java 2011-08-09 00:33:22 UTC (rev 33708) @@ -20,6 +20,7 @@ import org.jboss.tools.cdi.core.extension.ICDIExtension; import org.jboss.tools.cdi.core.extension.feature.IBuildParticipant2Feature; import org.jboss.tools.cdi.core.extension.feature.IBuildParticipantFeature; +import org.jboss.tools.cdi.internal.core.impl.CDIProject; import org.jboss.tools.cdi.internal.core.scanner.FileSet; import org.jboss.tools.cdi.seam.core.international.impl.BundleModel; import org.jboss.tools.cdi.seam.core.international.scanner.BundleFileSet; @@ -32,7 +33,6 @@ * */ public class CDISeamInternationalExtension implements ICDIExtension, IBuildParticipant2Feature { - CDICoreNature project; CDISeamInternationalDefinitionContext context = new CDISeamInternationalDefinitionContext(); BundleFileSet fileSet = new BundleFileSet(); @@ -46,10 +46,6 @@ return null; } - public void setProject(CDICoreNature n) { - project = n; - } - public BundleModel getBundleModel() { return model; } @@ -100,7 +96,7 @@ } @Override - public void buildBeans() { + public void buildBeans(CDIProject target) { model.rebuild(context.getAllBundles()); } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDISeamPersistenceExtension.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDISeamPersistenceExtension.java 2011-08-09 00:33:04 UTC (rev 33707) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDISeamPersistenceExtension.java 2011-08-09 00:33:22 UTC (rev 33708) @@ -44,15 +44,9 @@ * */ public class CDISeamPersistenceExtension implements ICDIExtension, IBuildParticipantFeature { - CDICoreNature project; CDISeamPersistenceDefinitionContext context = new CDISeamPersistenceDefinitionContext(); @Override - public void setProject(CDICoreNature n) { - project = n; - } - - @Override public IDefinitionContextExtension getContext() { return context; } @@ -79,21 +73,21 @@ } @Override - public void buildBeans() { - List<TypeDefinition> definitions = project.getAllTypeDefinitions(); + public void buildBeans(CDIProject target) { + List<TypeDefinition> definitions = target.getNature().getAllTypeDefinitions(); if(definitions.isEmpty()) { //no beans to build return; } - ParametedType entityManager = getType(CDIPersistenceConstants.ENTITY_MANAGER_TYPE_NAME); - ParametedType entityManagerFactory = getType(CDIPersistenceConstants.ENTITY_MANAGER_FACTORY_TYPE_NAME); - ParametedType session = getType(CDIPersistenceConstants.SESSION_TYPE_NAME); - ParametedType sessionFactory = getType(CDIPersistenceConstants.SESSION_FACTORY_TYPE_NAME); + ParametedType entityManager = getType(CDIPersistenceConstants.ENTITY_MANAGER_TYPE_NAME, target); + ParametedType entityManagerFactory = getType(CDIPersistenceConstants.ENTITY_MANAGER_FACTORY_TYPE_NAME, target); + ParametedType session = getType(CDIPersistenceConstants.SESSION_TYPE_NAME, target); + ParametedType sessionFactory = getType(CDIPersistenceConstants.SESSION_FACTORY_TYPE_NAME, target); if(entityManager == null && session == null) { return; } - CDIProject cdi = (CDIProject)project.getDelegate(); + CDIProject cdi = target; for (TypeDefinition def: definitions) { if(def.isVetoed() || !isArtifact(def)) { @@ -147,13 +141,13 @@ && m.isAnnotationPresent(CDIPersistenceConstants.EXTENSION_MANAGED_ANNOTATION_TYPE_NAME); } - private ParametedType getType(String name) { - IType t = project.getType(name); + private ParametedType getType(String name, CDIProject project) { + IType t = project.getNature().getType(name); if(t == null) { return null; } try { - return project.getTypeFactory().getParametedType(t, "L" + name + ";"); + return project.getNature().getTypeFactory().getParametedType(t, "L" + name + ";"); } catch (JavaModelException e) { CDISeamCorePlugin.getDefault().logError(e); return null;