Attachment 22912 Details for Bug 97614 – Patch to fix this issue

[patch] Patch to fix this issue

v00.txt (text/plain), 2.45 KB, created by Frederic Fusier

on 2005-06-13 08:36:19 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Fusier

Created: 2005-06-13 08:36:19 EDT

Size: 2.45 KB

patch

obsolete

>Index: search/org/eclipse/jdt/internal/core/search/matching/FieldLocator.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/FieldLocator.java,v
>retrieving revision 1.38
>diff -u -r1.38 FieldLocator.java
>--- search/org/eclipse/jdt/internal/core/search/matching/FieldLocator.java	11 Apr 2005 09:58:00 -0000	1.38
>+++ search/org/eclipse/jdt/internal/core/search/matching/FieldLocator.java	13 Jun 2005 12:33:27 -0000
>@@ -342,11 +342,15 @@
>  */
> protected int resolveLevelForType(TypeBinding typeBinding) {
> 	FieldPattern fieldPattern = (FieldPattern) this.pattern;
>+	TypeBinding fieldTypeBinding = typeBinding;
>+	if (fieldTypeBinding != null && fieldTypeBinding.isParameterizedType()) {
>+		fieldTypeBinding = typeBinding.erasure();
>+	}
> 	return resolveLevelForType(
> 			fieldPattern.typeSimpleName,
> 			fieldPattern.typeQualification,
> 			fieldPattern.getTypeArguments(),
> 			0,
>-			typeBinding);
>+			fieldTypeBinding);
> }
> }
>Index: search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java,v
>retrieving revision 1.247
>diff -u -r1.247 MatchLocator.java
>--- search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java	8 Jun 2005 16:53:08 -0000	1.247
>+++ search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java	13 Jun 2005 12:33:29 -0000
>@@ -1904,6 +1904,11 @@
>  */
> protected void reportMatching(CompilationUnitDeclaration unit, boolean mustResolve) throws CoreException {
> 	MatchingNodeSet nodeSet = this.currentPossibleMatch.nodeSet;
>+	if (BasicSearchEngine.VERBOSE) {
>+		System.out.println("Report matching: "); //$NON-NLS-1$
>+		System.out.println("	- node set:\n"+nodeSet); //$NON-NLS-1$
>+		System.out.println("	- must resolve: "+mustResolve); //$NON-NLS-1$
>+	}
> 	boolean locatorMustResolve = this.patternLocator.mustResolve;
> 	if (nodeSet.mustResolve) this.patternLocator.mustResolve = true;
> 	if (mustResolve) {
>@@ -1927,6 +1932,9 @@
> 			nodeSet.addMatch(node, this.patternLocator.resolveLevel(node));
> 		}
> 		nodeSet.possibleMatchingNodesSet = new SimpleSet(3);
>+		if (BasicSearchEngine.VERBOSE) {
>+			System.out.println("	- resolved node set:\n"+nodeSet); //$NON-NLS-1$
>+		}
> 	} else {
> 		this.unitScope = null;
> 	}

Actions: View | Diff

Attachments on bug 97614: 22912 | 22913