[320325] [validation] JSP source validators running even when respective batch validators have been turned off
diff --git a/bundles/org.eclipse.jst.jsp.core/plugin.xml b/bundles/org.eclipse.jst.jsp.core/plugin.xml
index ad4f647..be0b012 100644
--- a/bundles/org.eclipse.jst.jsp.core/plugin.xml
+++ b/bundles/org.eclipse.jst.jsp.core/plugin.xml
@@ -192,7 +192,8 @@
class="org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator"
manual="true"
version="1"
- markerId="org.eclipse.jst.jsp.core.validationMarker">
+ markerId="org.eclipse.jst.jsp.core.validationMarker"
+ sourceid="org.eclipse.jst.jsp.jspelsourcevalidator, org.eclipse.jst.jsp.ui.internal.validation.jspactionvalidator, org.eclipse.jst.jsp.tldsourcevalidator, org.eclipse.jst.jsp.jspsourcevalidator">
<include>
<rules>
<projectNature id="org.eclipse.jdt.core.javanature"/>
@@ -244,7 +245,8 @@
class="org.eclipse.jst.jsp.core.internal.validation.JSPContentValidator"
manual="true"
version="1"
- markerId="org.eclipse.jst.jsp.core.validationMarker">
+ markerId="org.eclipse.jst.jsp.core.validationMarker"
+ sourceid="org.eclipse.jst.jsp.ui.internal.validation.markupvalidator, org.eclipse.jst.jsp.ui.internal.validation.htmlsyntaxvalidator">
<include>
<rules>
<contentType id="org.eclipse.jst.jsp.core.jspsource"/>
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/validator/ValidatorStrategy.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/validator/ValidatorStrategy.java
index 129e4b3..e0f20a9 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/validator/ValidatorStrategy.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/validator/ValidatorStrategy.java
@@ -219,8 +219,11 @@
if (v1 != null)
disabledValsByClass.add(v1.getId());
// not a V1 validator
- else if (v.getSourceId() != null)
- disabledValsBySourceId.add(v.getSourceId());
+ else if (v.getSourceId() != null) {
+ //could be more then one sourceid per batch validator
+ String[] sourceIDs = StringUtils.unpack(v.getSourceId());
+ disabledValsBySourceId.addAll(Arrays.asList(sourceIDs));
+ }
}
}
}
