Author: akazakov Date: 2011-06-01 19:08:45 -0400 (Wed, 01 Jun 2011) New Revision: 31763 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/CDIELValidationDelegate.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidatorManager.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidationDelegate.java Log: https://issues.jboss.org/browse/JBIDE-9028 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-01 23:01:32 UTC (rev 31762) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-06-01 23:08:45 UTC (rev 31763) @@ -183,7 +183,7 @@ } private boolean validateBuilderOrder(IProject project) throws CoreException { - return ValidatorManager.validateBuilderOrder(project, getBuilderId(), getId(), CDIPreferences.getInstance()); + return ValidatorManager.validateBuilderOrder(project, getBuilderId(), 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-01 23:01:32 UTC (rev 31762) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIELValidationDelegate.java 2011-06-01 23:08:45 UTC (rev 31763) @@ -15,7 +15,6 @@ 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; @@ -50,11 +49,10 @@ private boolean validateBuilderOrder(IProject project) throws CoreException { //It's EL, hence EL preferences, not CDI preferences. - return ValidatorManager.validateBuilderOrder(project, getBuilderId(), ELValidator.ID + "-CDI", ELSeverityPreferences.getInstance()); + return ValidatorManager.validateBuilderOrder(project, getBuilderId(), ELSeverityPreferences.getInstance()); } public String getBuilderId() { return CDICoreBuilder.BUILDER_ID; } - } \ No newline at end of file Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2011-06-01 23:01:32 UTC (rev 31762) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2011-06-01 23:08:45 UTC (rev 31763) @@ -550,7 +550,6 @@ } private boolean validateBuilderOrder(IProject project) throws CoreException { - return ValidatorManager.validateBuilderOrder(project, getBuilderId(), getId(), ELSeverityPreferences.getInstance()); + return ValidatorManager.validateBuilderOrder(project, getBuilderId(), ELSeverityPreferences.getInstance()); } - -} +} \ No newline at end of file Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidatorManager.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidatorManager.java 2011-06-01 23:01:32 UTC (rev 31762) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidatorManager.java 2011-06-01 23:08:45 UTC (rev 31763) @@ -124,12 +124,11 @@ * * @param project * @param builderId - * @param validatorId * @param preferences * @return * @throws CoreException */ - public static boolean validateBuilderOrder(IProject project, String builderId, String validatorId, SeverityPreferences preferences) throws CoreException { + public static boolean validateBuilderOrder(IProject project, String builderId, SeverityPreferences preferences) throws CoreException { int severity = getSeverity(preferences.getBuilderOrderPreference(project)); boolean isCorrect = isCorrectOrder(project, builderId); IMarker marker = findBuilderOrderMarker(project, builderId); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2011-06-01 23:01:32 UTC (rev 31762) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2011-06-01 23:08:45 UTC (rev 31763) @@ -46,7 +46,6 @@ import org.jboss.tools.jst.web.kb.internal.validation.SimpleValidatingProjectTree; import org.jboss.tools.jst.web.kb.internal.validation.ValidatingProjectSet; 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.IProjectValidationContext; import org.jboss.tools.jst.web.kb.validation.IValidatingProjectSet; import org.jboss.tools.jst.web.kb.validation.IValidatingProjectTree; @@ -202,7 +201,7 @@ } private boolean validateBuilderOrder(IProject project) throws CoreException { - return ValidatorManager.validateBuilderOrder(project, getBuilderId(), getId(), SeamPreferences.getInstance()); + return ValidatorManager.validateBuilderOrder(project, getBuilderId(), SeamPreferences.getInstance()); } /* Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidationDelegate.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidationDelegate.java 2011-06-01 23:01:32 UTC (rev 31762) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidationDelegate.java 2011-06-01 23:08:45 UTC (rev 31763) @@ -12,7 +12,6 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; -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; @@ -50,11 +49,10 @@ private boolean validateBuilderOrder(IProject project) throws CoreException { //It's EL, hence EL preferences, not Seam preferences. - return ValidatorManager.validateBuilderOrder(project, getBuilderId(), ELValidator.ID + "-Seam", ELSeverityPreferences.getInstance()); + return ValidatorManager.validateBuilderOrder(project, getBuilderId(), ELSeverityPreferences.getInstance()); } public String getBuilderId() { return SeamCoreBuilder.BUILDER_ID; } - } \ No newline at end of file