[jbosstools-commits] JBoss Tools SVN: r31765 - in trunk/cdi/plugins/org.jboss.tools.cdi.core: src/org/jboss/tools/cdi/internal/core/validation and 1 other directory.

Author: scabanovich Date: 2011-06-01 21:26:16 -0400 (Wed, 01 Jun 2011) New Revision: 31765 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/plugin.properties trunk/cdi/plugins/org.jboss.tools.cdi.core/plugin.xml trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIELValidationDelegate.java Log: JBIDE-9028 https://issues.jboss.org/browse/JBIDE-9028 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/plugin.properties =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/plugin.properties 2011-06-02 01:22:37 UTC (rev 31764) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/plugin.properties 2011-06-02 01:26:16 UTC (rev 31765) @@ -1,3 +1,5 @@ KBProblemName=CDI Problem -KB_REQUIRED_FOR_CDI=CDI \ No newline at end of file +KB_REQUIRED_FOR_CDI=CDI +CDICoreValidator=CDI Core Validator +CDIELValidationDelegate=CDI EL Validator \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/plugin.xml =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/plugin.xml 2011-06-02 01:22:37 UTC (rev 31764) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/plugin.xml 2011-06-02 01:26:16 UTC (rev 31765) @@ -138,16 +138,20 @@ </extension> <extension + id="CoreValidator" point="org.jboss.tools.jst.web.kb.validator"> <validator class="org.jboss.tools.cdi.internal.core.validation.CDICoreValidator" + name="%CDICoreValidator" id="org.jboss.tools.cdi.core.CoreValidator"> </validator> </extension> <extension + id="CDIELValidationDelegate" point="org.jboss.tools.jst.web.kb.elValidationDelegate"> <delegate + name="%CDIELValidationDelegate" class="org.jboss.tools.cdi.internal.core.validation.CDIELValidationDelegate"> </delegate> </extension> Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-06-02 01:22:37 UTC (rev 31764) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-06-02 01:26:16 UTC (rev 31765) @@ -183,7 +183,7 @@ } private boolean validateBuilderOrder(IProject project) throws CoreException { - return ValidatorManager.validateBuilderOrder(project, getBuilderId(), CDIPreferences.getInstance()); + return ValidatorManager.validateBuilderOrder(project, getBuilderId(), getId(), CDIPreferences.getInstance()); } /* Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIELValidationDelegate.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIELValidationDelegate.java 2011-06-02 01:22:37 UTC (rev 31764) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIELValidationDelegate.java 2011-06-02 01:26:16 UTC (rev 31765) @@ -15,6 +15,7 @@ import org.jboss.tools.cdi.core.CDICoreBuilder; import org.jboss.tools.cdi.core.CDICoreNature; import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.jst.web.kb.internal.validation.ELValidator; import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager; import org.jboss.tools.jst.web.kb.preferences.ELSeverityPreferences; import org.jboss.tools.jst.web.kb.validation.IELValidationDelegate; @@ -24,6 +25,7 @@ * @author Alexey Kazakov */ public class CDIELValidationDelegate implements IELValidationDelegate { + public static final String ID = "org.jboss.tools.cdi.core.CDIELValidationDelegate"; /* (non-Javadoc) * @see org.jboss.tools.jst.web.kb.validation.IELValidationDelegate#getValidatingProjects(org.eclipse.core.resources.IProject) @@ -49,10 +51,15 @@ private boolean validateBuilderOrder(IProject project) throws CoreException { //It's EL, hence EL preferences, not CDI preferences. - return ValidatorManager.validateBuilderOrder(project, getBuilderId(), ELSeverityPreferences.getInstance()); + return ValidatorManager.validateBuilderOrder(project, getBuilderId(), getID(), ELSeverityPreferences.getInstance()); //$NON-NLS-1$ } + public String getID() { + return ID; + } + public String getBuilderId() { return CDICoreBuilder.BUILDER_ID; } + } \ No newline at end of file