Author: akazakov Date: 2011-05-31 15:54:14 -0400 (Tue, 31 May 2011) New Revision: 31687 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/ICDIExtension.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/IDefinitionContextExtension.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IProcessAnnotatedTypeFeature.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.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/definition/InterfaceDefinition.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanDefinitionContext.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerField.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerMethod.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericClassBean.java Log: https://issues.jboss.org/browse/JBIDE-8674 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/ICDIExtension.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/ICDIExtension.java 2011-05-31 18:48:48 UTC (rev 31686) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/ICDIExtension.java 2011-05-31 19:54:14 UTC (rev 31687) @@ -10,8 +10,6 @@ ******************************************************************************/ package org.jboss.tools.cdi.core.extension; -import org.eclipse.core.runtime.IAdaptable; - /** * This object represents CDI runtime extension in JBoss Tools CDI model. * It is not necessarily one to one mapping between CDI runtime extension implementation classes @@ -30,4 +28,4 @@ */ public interface ICDIExtension { -} +} \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/IDefinitionContextExtension.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/IDefinitionContextExtension.java 2011-05-31 18:48:48 UTC (rev 31686) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/IDefinitionContextExtension.java 2011-05-31 19:54:14 UTC (rev 31687) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.cdi.core.extension; -import org.eclipse.jdt.core.IType; import org.jboss.tools.cdi.core.IDefinitionContext; import org.jboss.tools.cdi.core.IRootDefinitionContext; import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IProcessAnnotatedTypeFeature.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IProcessAnnotatedTypeFeature.java 2011-05-31 18:48:48 UTC (rev 31686) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IProcessAnnotatedTypeFeature.java 2011-05-31 19:54:14 UTC (rev 31687) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.cdi.core.extension.feature; - import org.jboss.tools.cdi.core.IRootDefinitionContext; import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition; @@ -24,11 +23,11 @@ /** * Method is called after CDI builder loaded type definitions and before they are - * used to build beans. Client may change type definitions and there members or veto them. + * used to build beans. Client may change type definitions or their members or veto them. * * @param typeDefinition * @param context */ public void processAnnotatedType(TypeDefinition typeDefinition, IRootDefinitionContext context); -} +} \ No newline at end of file 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 2011-05-31 18:48:48 UTC (rev 31686) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2011-05-31 19:54:14 UTC (rev 31687) @@ -20,6 +20,7 @@ import org.eclipse.jdt.core.ISourceRange; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.SourceRange; +import org.jboss.tools.cdi.core.CDICorePlugin; import org.jboss.tools.cdi.core.IParametedType; import org.jboss.tools.cdi.core.IRootDefinitionContext; import org.jboss.tools.cdi.internal.core.impl.ParametedType; @@ -53,6 +54,7 @@ return isVetoed; } + @Override public AbstractTypeDefinition getTypeDefinition() { return this; } @@ -139,13 +141,11 @@ try { init(); } catch (CoreException e) { - //ignore + CDICorePlugin.getDefault().logError(e); } } - + return map.get(superTypeName); } - } - -} +} \ No newline at end of file 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-05-31 18:48:48 UTC (rev 31686) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java 2011-05-31 19:54:14 UTC (rev 31687) @@ -130,19 +130,23 @@ return copy; } + @Override protected void doApplyWorkingCopy() { messageLoggers = ((LoggerDefinitionContext)workingCopy).messageLoggers; messageBundles = ((LoggerDefinitionContext)workingCopy).messageBundles; } + @Override public void clean() { messageLoggers.clear(); messageBundles.clear(); } + @Override public void clean(IPath path) { } + @Override public void clean(String typeName) { messageLoggers.remove(typeName); messageBundles.remove(typeName); 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-05-31 18:48:48 UTC (rev 31686) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java 2011-05-31 19:54:14 UTC (rev 31687) @@ -118,17 +118,19 @@ return copy; } + @Override protected void doApplyWorkingCopy() { services = ((ServiceHandlerDefinitionContext)workingCopy).services; serviceAnnotations = ((ServiceHandlerDefinitionContext)workingCopy).serviceAnnotations; } - + @Override public void clean() { services.clear(); serviceAnnotations.clear(); } + @Override public void clean(String typeName) { services.remove(typeName); serviceAnnotations.remove(typeName); @@ -143,18 +145,17 @@ public Map<String, TypeDefinition> getServices() { return services; } - + + @Override public void computeAnnotationKind(AnnotationDefinition annotation) { if(annotation.isAnnotationPresent(CDISeamSolderConstants.SERVICE_HANDLER_TYPE_ANNOTATION_TYPE_NAME)) { annotation.setExtendedKind(CDISeamSolderConstants.SERVICE_ANNOTATION_KIND); serviceAnnotations.add(annotation.getType().getFullyQualifiedName()); } } - + public boolean isServiceAnnotation(IType type) { return (type != null && serviceAnnotations.contains(type.getFullyQualifiedName())); } - } - -} +} \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/definition/InterfaceDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/definition/InterfaceDefinition.java 2011-05-31 18:48:48 UTC (rev 31686) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/definition/InterfaceDefinition.java 2011-05-31 19:54:14 UTC (rev 31687) @@ -12,7 +12,6 @@ import org.eclipse.jdt.core.IType; import org.jboss.tools.cdi.core.extension.IDefinitionContextExtension; -import org.jboss.tools.cdi.internal.core.impl.definition.AbstractMemberDefinition; import org.jboss.tools.cdi.internal.core.impl.definition.AbstractTypeDefinition; /** Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanDefinitionContext.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanDefinitionContext.java 2011-05-31 18:48:48 UTC (rev 31686) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanDefinitionContext.java 2011-05-31 19:54:14 UTC (rev 31687) @@ -36,16 +36,19 @@ return copy; } + @Override protected void doApplyWorkingCopy() { genericConfiguartions = ((GenericBeanDefinitionContext)workingCopy).genericConfiguartions; // } + @Override public void clean() { genericConfiguartions.clear(); // } + @Override public void clean(String typeName) { genericConfiguartions.remove(typeName); for (GenericConfiguration c: genericConfiguartions.values()) { @@ -54,6 +57,7 @@ // } + @Override public void computeAnnotationKind(AnnotationDefinition annotation) { if(annotation.isAnnotationPresent(CDISeamSolderConstants.GENERIC_TYPE_ANNOTATION_TYPE_NAME)) { annotation.setExtendedKind(CDISeamSolderConstants.GENERIC_ANNOTATION_KIND); @@ -78,5 +82,4 @@ } return result; } - -} +} \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerField.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerField.java 2011-05-31 18:48:48 UTC (rev 31686) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerField.java 2011-05-31 19:54:14 UTC (rev 31687) @@ -24,6 +24,7 @@ public GenericBeanProducerField() {} + @Override public IScope getScope() { IScope result = null; if(definition.isAnnotationPresent(CDISeamSolderConstants.APPLY_SCOPE_ANNOTATION_TYPE_NAME)) { @@ -39,5 +40,4 @@ } return result; } - -} +} \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerMethod.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerMethod.java 2011-05-31 18:48:48 UTC (rev 31686) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerMethod.java 2011-05-31 19:54:14 UTC (rev 31687) @@ -24,6 +24,7 @@ public GenericBeanProducerMethod() {} + @Override public IScope getScope() { IScope result = null; if(definition.isAnnotationPresent(CDISeamSolderConstants.APPLY_SCOPE_ANNOTATION_TYPE_NAME)) { @@ -39,5 +40,4 @@ } return result; } - -} +} \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericClassBean.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericClassBean.java 2011-05-31 18:48:48 UTC (rev 31686) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericClassBean.java 2011-05-31 19:54:14 UTC (rev 31687) @@ -32,10 +32,12 @@ public GenericClassBean() {} + @Override protected ProducerMethod newProducerMethod(MethodDefinition m) { return new GenericBeanProducerMethod(); } + @Override protected ProducerField newProducerField(FieldDefinition f) { return new GenericBeanProducerField(); } @@ -56,6 +58,7 @@ return null; } + @Override protected void computeScope() { if(definition.isAnnotationPresent(CDISeamSolderConstants.APPLY_SCOPE_ANNOTATION_TYPE_NAME)) { IBean generic = getGenericProducerBean(); @@ -67,5 +70,4 @@ super.computeScope(); } } - -} +} \ No newline at end of file