Author: dazarov Date: 2011-08-30 15:32:07 -0400 (Tue, 30 Aug 2011) New Revision: 34419 Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/IGenericBean.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/META-INF/MANIFEST.MF trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/plugin.xml trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/marker/CDIMarkerResolutionGeneratorExtension.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 trunk/cdi/plugins/org.jboss.tools.cdi.ui/schema/quickFixExtension.exsd trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIQuickFixExtensionManager.java Log: Disabled quick fixes for case of generic beans Quick fix for "Multiple beans are eligible for injection point" problem markers works wrong in case of working with generic beans. https://issues.jboss.org/browse/JBIDE-9115 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/META-INF/MANIFEST.MF 2011-08-30 19:29:15 UTC (rev 34418) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/META-INF/MANIFEST.MF 2011-08-30 19:32:07 UTC (rev 34419) @@ -21,6 +21,7 @@ org.jboss.tools.cdi.seam.solder.core, org.jboss.tools.jst.web.kb, org.jboss.tools.jst.web, - org.eclipse.ui.ide;bundle-version="3.7.0" + org.eclipse.ui.ide;bundle-version="3.7.0", + org.jboss.tools.common.el.core Bundle-Version: 1.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/plugin.xml =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/plugin.xml 2011-08-30 19:29:15 UTC (rev 34418) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/plugin.xml 2011-08-30 19:32:07 UTC (rev 34419) @@ -34,9 +34,9 @@ </extension> <extension point="org.jboss.tools.cdi.ui.quickFixExtension"> - <resolution_generator_extension - generator-extension-class="org.jboss.tools.cdi.seam.config.ui.marker.CDIMarkerResolutionGeneratorExtension" - id="org.jboss.tools.cdi.seam.config.ui.resolution_generator_extension"> - </resolution_generator_extension> + <resolution-generator + class="org.jboss.tools.cdi.seam.config.ui.marker.CDIMarkerResolutionGeneratorExtension" + id="org.jboss.tools.cdi.seam.config.ui.resolution-generator"> + </resolution-generator> </extension> </plugin> Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/marker/CDIMarkerResolutionGeneratorExtension.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/marker/CDIMarkerResolutionGeneratorExtension.java 2011-08-30 19:29:15 UTC (rev 34418) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/marker/CDIMarkerResolutionGeneratorExtension.java 2011-08-30 19:32:07 UTC (rev 34419) @@ -16,24 +16,16 @@ import org.eclipse.ui.IMarkerResolution; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.internal.core.validation.CDIValidationErrorManager; -import org.jboss.tools.cdi.seam.solder.core.generic.GenericBeanProducerField; -import org.jboss.tools.cdi.seam.solder.core.generic.GenericBeanProducerMethod; -import org.jboss.tools.cdi.seam.solder.core.generic.GenericClassBean; +import org.jboss.tools.cdi.seam.solder.core.generic.IGenericBean; import org.jboss.tools.cdi.ui.marker.ICDIMarkerResolutionGeneratorExtension; public class CDIMarkerResolutionGeneratorExtension implements ICDIMarkerResolutionGeneratorExtension { - private boolean isBeanGeneric(IBean bean){ - return (bean instanceof GenericClassBean || - bean instanceof GenericBeanProducerField || - bean instanceof GenericBeanProducerMethod); - } - @Override public boolean shouldBeExtended(int id, IBean bean) { return (id == CDIValidationErrorManager.AMBIGUOUS_INJECTION_POINTS_ID || id == CDIValidationErrorManager.UNSATISFIED_INJECTION_POINTS_ID) && - isBeanGeneric(bean); + bean instanceof IGenericBean; } @Override 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-08-30 19:29:15 UTC (rev 34418) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerField.java 2011-08-30 19:32:07 UTC (rev 34419) @@ -20,7 +20,7 @@ * @author Viacheslav Kabanovich * */ -public class GenericBeanProducerField extends ProducerField { +public class GenericBeanProducerField extends ProducerField implements IGenericBean { public GenericBeanProducerField() {} 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-08-30 19:29:15 UTC (rev 34418) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerMethod.java 2011-08-30 19:32:07 UTC (rev 34419) @@ -20,7 +20,7 @@ * @author Viacheslav Kabanovich * */ -public class GenericBeanProducerMethod extends ProducerMethod { +public class GenericBeanProducerMethod extends ProducerMethod implements IGenericBean { public GenericBeanProducerMethod() {} 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-08-30 19:29:15 UTC (rev 34418) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericClassBean.java 2011-08-30 19:32:07 UTC (rev 34419) @@ -27,7 +27,7 @@ * @author Viacheslav Kabanovich * */ -public class GenericClassBean extends ClassBean { +public class GenericClassBean extends ClassBean implements IGenericBean { protected AbstractMemberDefinition genericProducerBean; public GenericClassBean() {} Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/IGenericBean.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/IGenericBean.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/IGenericBean.java 2011-08-30 19:32:07 UTC (rev 34419) @@ -0,0 +1,22 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.cdi.seam.solder.core.generic; + +/** + * + * Common interface for generic beans + * + * @author daniel + * + */ +public interface IGenericBean { + +} \ No newline at end of file Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/IGenericBean.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/schema/quickFixExtension.exsd =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/schema/quickFixExtension.exsd 2011-08-30 19:29:15 UTC (rev 34418) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/schema/quickFixExtension.exsd 2011-08-30 19:32:07 UTC (rev 34419) @@ -18,7 +18,7 @@ </annotation> <complexType> <sequence> - <element ref="resolution_generator_extension" minOccurs="1" maxOccurs="unbounded"/> + <element ref="resolution-generator" minOccurs="1" maxOccurs="unbounded"/> </sequence> <attribute name="point" type="string" use="required"> <annotation> @@ -47,7 +47,7 @@ </complexType> </element> - <element name="resolution_generator_extension"> + <element name="resolution-generator"> <complexType> <attribute name="id" type="string" use="required"> <annotation> @@ -59,7 +59,7 @@ </appInfo> </annotation> </attribute> - <attribute name="generator-extension-class" type="string" use="required"> + <attribute name="class" type="string" use="required"> <annotation> <documentation> @@ -86,13 +86,13 @@ <meta.section type="examples"/> </appInfo> <documentation> - &lt;extension point=&quot;org.jboss.tools.cdi.ui.quickFixExtension&quot;&gt; - &lt;resolution_generator_extension - generator-extension-class = &quot;org.jboss.tools.cdi.seam.config.ui.marker.CDIMarkerResolutionGeneratorExtension&quot; - id=&quot;org.jboss.tools.cdi.seam.config.ui.resolution_generator_extension&quot;&gt; - &lt;/resolution_generator_extension&gt; + &lt;extension + point=&quot;org.jboss.tools.cdi.ui.quickFixExtension&quot;&gt; + &lt;resolution-generator + class=&quot;org.jboss.tools.cdi.seam.config.ui.marker.CDIMarkerResolutionGeneratorExtension&quot; + id=&quot;org.jboss.tools.cdi.seam.config.ui.resolution-generator&quot;&gt; + &lt;/resolution-generator&gt; &lt;/extension&gt; - </documentation> </annotation> Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIQuickFixExtensionManager.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIQuickFixExtensionManager.java 2011-08-30 19:29:15 UTC (rev 34418) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIQuickFixExtensionManager.java 2011-08-30 19:32:07 UTC (rev 34419) @@ -42,7 +42,7 @@ CDIQuickFixExtensionManager n = new CDIQuickFixExtensionManager(); n.id = e.getAttribute("id"); //$NON-NLS-1$ try{ - n.extension = (ICDIMarkerResolutionGeneratorExtension)e.createExecutableExtension("generator-extension-class"); //$NON-NLS-1$ + n.extension = (ICDIMarkerResolutionGeneratorExtension)e.createExecutableExtension("class"); //$NON-NLS-1$ list.add(n.extension); }catch(CoreException ex){ ELCorePlugin.getDefault().logError(ex);