Author: scabanovich Date: 2011-08-08 20:33:42 -0400 (Mon, 08 Aug 2011) New Revision: 33709 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java Log: JBIDE-9484 https://issues.jboss.org/browse/JBIDE-9484 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java 2011-08-09 00:33:22 UTC (rev 33708) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java 2011-08-09 00:33:42 UTC (rev 33709) @@ -39,13 +39,8 @@ * */ public class CDISeamSolderLoggerExtension implements ICDIExtension, IBuildParticipantFeature { - CDICoreNature project; LoggerDefinitionContext context = new LoggerDefinitionContext(); - public void setProject(CDICoreNature n) { - project = n; - } - public IDefinitionContextExtension getContext() { return context; } @@ -94,8 +89,8 @@ } } - public void buildBeans() { - CDIProject p = ((CDIProject)project.getDelegate()); + public void buildBeans(CDIProject target) { + CDIProject p = target; Map<String, TypeDefinition> loggers = context.getMessageLoggers(); for (TypeDefinition d: loggers.values()) { ClassBean b = new ClassBean(); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java 2011-08-09 00:33:22 UTC (rev 33708) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java 2011-08-09 00:33:42 UTC (rev 33709) @@ -47,13 +47,8 @@ * */ public class CDISeamSolderServiceHandlerExtension implements ICDIExtension, IBuildParticipantFeature { - CDICoreNature project; ServiceHandlerDefinitionContext context = new ServiceHandlerDefinitionContext(); - public void setProject(CDICoreNature n) { - project = n; - } - public IDefinitionContextExtension getContext() { return context; } @@ -90,8 +85,8 @@ } } - public void buildBeans() { - CDIProject p = ((CDIProject)project.getDelegate()); + public void buildBeans(CDIProject target) { + CDIProject p = target; Map<String, TypeDefinition> services = context.getServices(); for (TypeDefinition d: services.values()) { ClassBean b = new ClassBean(); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java 2011-08-09 00:33:22 UTC (rev 33708) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java 2011-08-09 00:33:42 UTC (rev 33709) @@ -11,7 +11,6 @@ package org.jboss.tools.cdi.seam.solder.core.generic; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; @@ -58,13 +57,8 @@ * */ public class CDISeamSolderGenericBeanExtension implements ICDIExtension, IBuildParticipantFeature, IProcessAnnotatedTypeFeature, IValidatorFeature, CDISeamSolderConstants { - CDICoreNature project; GenericBeanDefinitionContext context = new GenericBeanDefinitionContext(); - public void setProject(CDICoreNature n) { - project = n; - } - public IDefinitionContextExtension getContext() { return context; } @@ -84,8 +78,8 @@ public void buildDefinitions(FileSet fileSet) { } - public void buildBeans() { - CDIProject p = ((CDIProject)project.getDelegate()); + public void buildBeans(CDIProject target) { + CDIProject p = target; for (GenericConfiguration c: context.getGenericConfigurations().values()) { //Create fake bean for injection of generic type annotation. @@ -154,7 +148,7 @@ } AnnotationDeclaration gd = f.getAnnotation(GENERIC_QUALIFIER_TYPE_NAME); f.removeAnnotation(gd); - f.addAnnotation(createInjectGenericAnnotation(gd), context.getRootContext()); + f.addAnnotation(createInjectGenericAnnotation(gd, context.getRootContext().getProject()), context.getRootContext()); } } @@ -173,7 +167,7 @@ AnnotationDeclaration gd = p.getAnnotation(GENERIC_QUALIFIER_TYPE_NAME); if(gd != null) { p.removeAnnotation(gd); - p.addAnnotation(createInjectGenericAnnotation(gd), context.getRootContext()); + p.addAnnotation(createInjectGenericAnnotation(gd, context.getRootContext().getProject()), context.getRootContext()); } } } @@ -181,7 +175,7 @@ } } - private IJavaAnnotation createInjectGenericAnnotation(AnnotationDeclaration genericAnnotation) { + private IJavaAnnotation createInjectGenericAnnotation(AnnotationDeclaration genericAnnotation, CDICoreNature project) { IType type = project.getType(INJECT_GENERIC_ANNOTATION_TYPE_NAME); return (type != null) ? new AnnotationLiteral(genericAnnotation.getResource(), genericAnnotation.getStartPosition(), genericAnnotation.getLength(), null, 0, type) @@ -274,7 +268,7 @@ } public void validateResource(IFile file, CDICoreValidator validator) { - new GenericBeanValidator().validateResource(file, validator, project, context); + new GenericBeanValidator().validateResource(file, validator, context.getRootContext().getProject(), context); } public SeverityPreferences getSeverityPreferences() {