Attachment #22912 for bug #97614

Lines 342-352 Link Here

(-)search/org/eclipse/jdt/internal/core/search/matching/FieldLocator.java (-1 / +5 lines)
342	*/	342	*/
343	protected int resolveLevelForType(TypeBinding typeBinding) {	343	protected int resolveLevelForType(TypeBinding typeBinding) {
344	FieldPattern fieldPattern = (FieldPattern) this.pattern;	344	FieldPattern fieldPattern = (FieldPattern) this.pattern;
		345	TypeBinding fieldTypeBinding = typeBinding;
		346	if (fieldTypeBinding != null && fieldTypeBinding.isParameterizedType()) {
		347	fieldTypeBinding = typeBinding.erasure();
		348	}
345	return resolveLevelForType(	349	return resolveLevelForType(
346	fieldPattern.typeSimpleName,	350	fieldPattern.typeSimpleName,
347	fieldPattern.typeQualification,	351	fieldPattern.typeQualification,
348	fieldPattern.getTypeArguments(),	352	fieldPattern.getTypeArguments(),
349	0,	353	0,
350	typeBinding);	354	fieldTypeBinding);
351	}	355	}
352	}	356	}

Lines 1904-1909 Link Here

(-)search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java (+8 lines)
1904	*/	1904	*/
1905	protected void reportMatching(CompilationUnitDeclaration unit, boolean mustResolve) throws CoreException {	1905	protected void reportMatching(CompilationUnitDeclaration unit, boolean mustResolve) throws CoreException {
1906	MatchingNodeSet nodeSet = this.currentPossibleMatch.nodeSet;	1906	MatchingNodeSet nodeSet = this.currentPossibleMatch.nodeSet;
		1907	if (BasicSearchEngine.VERBOSE) {
		1908	System.out.println("Report matching: "); //$NON-NLS-1$
		1909	System.out.println(" - node set:\n"+nodeSet); //$NON-NLS-1$
		1910	System.out.println(" - must resolve: "+mustResolve); //$NON-NLS-1$
		1911	}
1907	boolean locatorMustResolve = this.patternLocator.mustResolve;	1912	boolean locatorMustResolve = this.patternLocator.mustResolve;
1908	if (nodeSet.mustResolve) this.patternLocator.mustResolve = true;	1913	if (nodeSet.mustResolve) this.patternLocator.mustResolve = true;
1909	if (mustResolve) {	1914	if (mustResolve) {
Lines 1927-1932 Link Here
1927	nodeSet.addMatch(node, this.patternLocator.resolveLevel(node));	1932	nodeSet.addMatch(node, this.patternLocator.resolveLevel(node));
1928	}	1933	}
1929	nodeSet.possibleMatchingNodesSet = new SimpleSet(3);	1934	nodeSet.possibleMatchingNodesSet = new SimpleSet(3);
		1935	if (BasicSearchEngine.VERBOSE) {
		1936	System.out.println(" - resolved node set:\n"+nodeSet); //$NON-NLS-1$
		1937	}
1930	} else {	1938	} else {
1931	this.unitScope = null;	1939	this.unitScope = null;
1932	}	1940	}

Return to bug 97614