Attachment 149689 Details for Bug 292471 – Fix Patch

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

[patch] Fix Patch

292471_XMLSourceParser.txt (text/plain), 2.54 KB, created by Ian Tewksbury

on 2009-10-15 17:46:29 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Tewksbury

Created: 2009-10-15 17:46:29 EDT

Size: 2.54 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.xml.core
>Index: src/org/eclipse/wst/xml/core/internal/parser/XMLSourceParser.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLSourceParser.java,v
>retrieving revision 1.19
>diff -u -r1.19 XMLSourceParser.java
>--- src/org/eclipse/wst/xml/core/internal/parser/XMLSourceParser.java	12 Mar 2009 05:14:12 -0000	1.19
>+++ src/org/eclipse/wst/xml/core/internal/parser/XMLSourceParser.java	15 Oct 2009 21:49:15 -0000
>@@ -483,18 +483,19 @@
> 		if (stringToCompare == null)
> 			return false;
> 
>+		int ajustedOffset = fOffset + offset;
> 		boolean result = false;
> 		if (fCharSequenceSource != null && fCharSequenceSource instanceof IRegionComparible) {
>-			result = ((IRegionComparible) fCharSequenceSource).regionMatches(offset, length, stringToCompare);
>+			result = ((IRegionComparible) fCharSequenceSource).regionMatches(ajustedOffset, length, stringToCompare);
> 		}
> 		else {
> 			// old fashioned ways
> 			String test = null;
> 			if (fCharSequenceSource != null) {
>-				test = fCharSequenceSource.subSequence(offset, offset + length).toString();
>+				test = fCharSequenceSource.subSequence(ajustedOffset, ajustedOffset + length).toString();
> 			}
> 			else if (fStringInput != null) {
>-				test = fStringInput.substring(offset, offset + length);
>+				test = fStringInput.substring(ajustedOffset, ajustedOffset + length);
> 			}
> 			result = stringToCompare.equals(test);
> 		}
>@@ -506,18 +507,19 @@
> 		if (stringToCompare == null)
> 			return false;
> 
>+		int ajustedOffset = fOffset + offset;
> 		boolean result = false;
> 		if (fCharSequenceSource != null && fCharSequenceSource instanceof IRegionComparible) {
>-			result = ((IRegionComparible) fCharSequenceSource).regionMatchesIgnoreCase(offset, length, stringToCompare);
>+			result = ((IRegionComparible) fCharSequenceSource).regionMatchesIgnoreCase(ajustedOffset, length, stringToCompare);
> 		}
> 		else {
> 			// old fashioned ways
> 			String test = null;
> 			if (fCharSequenceSource != null) {
>-				test = fCharSequenceSource.subSequence(offset, offset + length).toString();
>+				test = fCharSequenceSource.subSequence(ajustedOffset, ajustedOffset + length).toString();
> 			}
> 			else if (fStringInput != null) {
>-				test = fStringInput.substring(offset, offset + length);
>+				test = fStringInput.substring(ajustedOffset, ajustedOffset + length);
> 			}
> 			result = stringToCompare.equalsIgnoreCase(test);
> 		}

Actions: View | Diff

Attachments on bug 292471: 149689