Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 320322 | Differences between
and this patch

Collapse All | Expand All

(-)plugin.xml (-2 / +4 lines)
Lines 186-192 Link Here
186 
            class="org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator"
 186 
            class="org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator"
187 
            manual="true"
 187 
            manual="true"
188 
            version="1"
 188 
            version="1"
189 
            markerId="org.eclipse.jst.jsp.core.validationMarker">
 189 
            markerId="org.eclipse.jst.jsp.core.validationMarker"
190 
            sourceid="org.eclipse.jst.jsp.jspelsourcevalidator, org.eclipse.jst.jsp.ui.internal.validation.jspactionvalidator, org.eclipse.jst.jsp.tldsourcevalidator, org.eclipse.jst.jsp.jspsourcevalidator">
190 
         <include>
 191 
         <include>
191 
            <rules>
 192 
            <rules>
192 
	           <projectNature id="org.eclipse.jdt.core.javanature"/>
 193 
	           <projectNature id="org.eclipse.jdt.core.javanature"/>
Lines 238-244 Link Here
238 
            class="org.eclipse.jst.jsp.core.internal.validation.JSPContentValidator"
 239 
            class="org.eclipse.jst.jsp.core.internal.validation.JSPContentValidator"
239 
            manual="true"
 240 
            manual="true"
240 
            version="1"
 241 
            version="1"
241 
            markerId="org.eclipse.jst.jsp.core.validationMarker">
 242 
            markerId="org.eclipse.jst.jsp.core.validationMarker"
243 
            sourceid="org.eclipse.jst.jsp.ui.internal.validation.markupvalidator, org.eclipse.jst.jsp.ui.internal.validation.htmlsyntaxvalidator">
242 
         <include>
 244 
         <include>
243 
            <rules>
 245 
            <rules>
244 
				<contentType id="org.eclipse.jst.jsp.core.jspsource"/>
 246 
				<contentType id="org.eclipse.jst.jsp.core.jspsource"/>
(-)src/org/eclipse/wst/sse/ui/internal/reconcile/validator/ValidatorStrategy.java (-2 / +6 lines)
Lines 35-40 Link Here
35 
import org.eclipse.jface.text.source.ISourceViewer;
 35 
import org.eclipse.jface.text.source.ISourceViewer;
36 
import org.eclipse.wst.sse.core.StructuredModelManager;
 36 
import org.eclipse.wst.sse.core.StructuredModelManager;
37 
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
 37 
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
38 
import org.eclipse.wst.sse.core.utils.StringUtils;
38 
import org.eclipse.wst.sse.ui.internal.IReleasable;
 39 
import org.eclipse.wst.sse.ui.internal.IReleasable;
39 
import org.eclipse.wst.sse.ui.internal.reconcile.DocumentAdapter;
 40 
import org.eclipse.wst.sse.ui.internal.reconcile.DocumentAdapter;
40 
import org.eclipse.wst.sse.ui.internal.reconcile.ReconcileAnnotationKey;
 41 
import org.eclipse.wst.sse.ui.internal.reconcile.ReconcileAnnotationKey;
Lines 191-198 Link Here
191 
				if (v1 != null)
 192 
				if (v1 != null)
192 
					disabledValsByClass.add(v1.getId());
 193 
					disabledValsByClass.add(v1.getId());
193 
				// not a V1 validator
 194 
				// not a V1 validator
194 
				else if (v.getSourceId() != null)
 195 
				else if (v.getSourceId() != null) {
195 
					disabledValsBySourceId.add(v.getSourceId());
 196 
					//could be more then one sourceid per batch validator
197 
					String[] sourceIDs = StringUtils.unpack(v.getSourceId());
198 
					disabledValsBySourceId.addAll(Arrays.asList(sourceIDs));
199 
				}
196 
			}
 200 
			}
197 
		}
 201 
		}
198
202

Return to bug 320322