Attachment 174673 Details for Bug 320322 – Fix Patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix Patch

320322_source_val_enablment.txt (text/plain), 3.04 KB, created by Ian Tewksbury

on 2010-07-19 16:46:20 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Tewksbury

Created: 2010-07-19 16:46:20 EDT

Size: 3.04 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.jsp.core
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.jst.jsp.core/plugin.xml,v
>retrieving revision 1.46
>diff -u -r1.46 plugin.xml
>--- plugin.xml	29 May 2008 00:07:03 -0000	1.46
>+++ plugin.xml	19 Jul 2010 20:45:38 -0000
>@@ -186,7 +186,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"/>
>@@ -238,7 +239,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"/>
>#P org.eclipse.wst.sse.ui
>Index: src/org/eclipse/wst/sse/ui/internal/reconcile/validator/ValidatorStrategy.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/validator/ValidatorStrategy.java,v
>retrieving revision 1.31.6.2
>diff -u -r1.31.6.2 ValidatorStrategy.java
>--- src/org/eclipse/wst/sse/ui/internal/reconcile/validator/ValidatorStrategy.java	4 Jun 2010 03:46:27 -0000	1.31.6.2
>+++ src/org/eclipse/wst/sse/ui/internal/reconcile/validator/ValidatorStrategy.java	19 Jul 2010 20:45:38 -0000
>@@ -35,6 +35,7 @@
> import org.eclipse.jface.text.source.ISourceViewer;
> import org.eclipse.wst.sse.core.StructuredModelManager;
> import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
>+import org.eclipse.wst.sse.core.utils.StringUtils;
> import org.eclipse.wst.sse.ui.internal.IReleasable;
> import org.eclipse.wst.sse.ui.internal.reconcile.DocumentAdapter;
> import org.eclipse.wst.sse.ui.internal.reconcile.ReconcileAnnotationKey;
>@@ -191,8 +192,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));
>+				}
> 			}
> 		}
>

Actions: View | Diff

Attachments on bug 320322: 174673 | 174685 | 174938