Attachment 114182 Details for Bug 193816 – updated patch

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

[patch] updated patch

193816.patch (text/plain), 2.13 KB, created by Gary Karasiuk

on 2008-10-03 08:02:46 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Gary Karasiuk

Created: 2008-10-03 08:02:46 EDT

Size: 2.13 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.validation
>Index: validate/org/eclipse/wst/validation/internal/ValidatorMetaData.java
>===================================================================
>RCS file: /cvsroot/webtools/common/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorMetaData.java,v
>retrieving revision 1.36
>diff -u -r1.36 ValidatorMetaData.java
>--- validate/org/eclipse/wst/validation/internal/ValidatorMetaData.java	22 Apr 2008 22:58:55 -0000	1.36
>+++ validate/org/eclipse/wst/validation/internal/ValidatorMetaData.java	3 Oct 2008 11:58:52 -0000
>@@ -297,8 +297,9 @@
> 	 */
> 	public boolean isApplicableTo(IResource resource, int resourceDelta) {
> 		// If no filters are specified, then every type of resource should be validated/trigger a
>-		// rebuild of the model cache
>-		if (_filters == null)return true;
>+		// rebuild of the model cache.
>+		// Also make sure no content type id is specified (BUG 193816)
>+		if (_filters == null  && getContentTypeIds() == null)return true;
> 
> 		return isApplicableTo(resource, resourceDelta, _filters);
> 	}
>@@ -308,15 +309,14 @@
> 	 */
> 	boolean isApplicableTo(IResource resource, int resourceDelta, ValidatorFilter[] filters) {
> 		// Are any of the filters satisfied? (i.e., OR them, not AND them.)
>-		if (checkIfValidSourceFile(resource)) {
>-			for (int i = 0; i < filters.length; i++) {
>-				ValidatorFilter filter = filters[i];
>+		// make sure filters is not null (BUG 193816)
>+		if (filters != null && checkIfValidSourceFile(resource)) {
>+			for (ValidatorFilter filter : filters) {
> 				if (filter.isApplicableType(resource)
> 						&& filter.isApplicableName(resource)
> 						&& filter.isApplicableAction(resourceDelta)) {
> 					return true;
> 				}
>-
> 			}
> 		}
> 		if (getContentTypeIds() != null) {
>@@ -327,10 +327,8 @@
> 			} catch (CoreException e) {
> 				//Resource exceptions
> 			}
>-			if (description == null)
>-				return false;
>-			if (isApplicableContentType(description))
>-				return true;
>+			if (description == null)return false;
>+			if (isApplicableContentType(description))return true;
> 		}
> 		return false;
> 	}

Actions: View | Diff

Attachments on bug 193816: 72088 | 114182