Author: scabanovich Date: 2011-06-03 19:01:36 -0400 (Fri, 03 Jun 2011) New Revision: 31830 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/GenericBeanDefinitionContext.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericConfiguration.java Log: JBIDE-9065 https://issues.jboss.org/browse/JBIDE-9065 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-06-03 21:51:16 UTC (rev 31829) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java 2011-06-03 23:01:36 UTC (rev 31830) @@ -98,6 +98,10 @@ Set<TypeDefinition> ts = c.getGenericConfigurationBeans(); for (AbstractMemberDefinition gp: ms.keySet()) { + //check veto + if(gp.getTypeDefinition().isVetoed()) { + continue; + } List<IAnnotationDeclaration> list = ms.get(gp); for (TypeDefinition t: ts) { TypeDefinition ti = new TypeDefinition(); 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-06-03 21:51:16 UTC (rev 31829) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanDefinitionContext.java 2011-06-03 23:01:36 UTC (rev 31830) @@ -13,6 +13,7 @@ import java.util.HashMap; import java.util.Map; +import org.eclipse.core.runtime.IPath; import org.eclipse.jdt.core.IType; import org.jboss.tools.cdi.core.extension.AbstractDefinitionContextExtension; import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition; @@ -49,6 +50,13 @@ } @Override + public void clean(IPath path) { + for (GenericConfiguration c: genericConfiguartions.values()) { + c.clear(path); + } + } + + @Override public void clean(String typeName) { genericConfiguartions.remove(typeName); for (GenericConfiguration c: genericConfiguartions.values()) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericConfiguration.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericConfiguration.java 2011-06-03 21:51:16 UTC (rev 31829) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericConfiguration.java 2011-06-03 23:01:36 UTC (rev 31830) @@ -45,6 +45,10 @@ this.genericType = genericType; } + public void clear(IPath path) { + involvedResources.remove(path); + } + public void clear(String typeName) { Iterator<AbstractMemberDefinition> it = genericProducerBeans.keySet().iterator(); while(it.hasNext()) {