View | Details | Raw Unified | Return to bug 324109 | Differences between
and this patch

Collapse All | Expand All

(-)search/org/eclipse/jdt/internal/core/search/matching/MethodLocator.java (-2 / +2 lines)
Lines 616-622 Link Here
616
	int declaringLevel = subType
616
	int declaringLevel = subType
617
		? resolveLevelAsSubtype(qualifiedPattern, method.declaringClass, null)
617
		? resolveLevelAsSubtype(qualifiedPattern, method.declaringClass, null)
618
		: resolveLevelForType(qualifiedPattern, method.declaringClass);
618
		: resolveLevelForType(qualifiedPattern, method.declaringClass);
619
	return methodLevel > declaringLevel ? declaringLevel : methodLevel; // return the weaker match
619
	return methodLevel > (declaringLevel & MATCH_LEVEL_MASK) ? declaringLevel : methodLevel; // return the weaker match
620
}
620
}
621
protected int resolveLevel(MessageSend messageSend) {
621
protected int resolveLevel(MessageSend messageSend) {
622
	MethodBinding method = messageSend.binding;
622
	MethodBinding method = messageSend.binding;
Lines 666-672 Link Here
666
	} else {
666
	} else {
667
		declaringLevel = resolveLevelForType(qualifiedPattern, method.declaringClass);
667
		declaringLevel = resolveLevelForType(qualifiedPattern, method.declaringClass);
668
	}
668
	}
669
	return methodLevel > declaringLevel ? declaringLevel : methodLevel; // return the weaker match
669
	return methodLevel > (declaringLevel & MATCH_LEVEL_MASK) ? declaringLevel : methodLevel; // return the weaker match
670
}
670
}
671
671
672
/**
672
/**
(-)src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests.java (-1 / +15 lines)
Lines 61-67 Link Here
61
// Debug
61
// Debug
62
static {
62
static {
63
//	 org.eclipse.jdt.internal.core.search.BasicSearchEngine.VERBOSE = true;
63
//	 org.eclipse.jdt.internal.core.search.BasicSearchEngine.VERBOSE = true;
64
//	TESTS_NAMES = new String[] {"testBug306223"};
64
	TESTS_NAMES = new String[] {"testBug324109"};
65
}
65
}
66
66
67
public JavaSearchBugsTests(String name) {
67
public JavaSearchBugsTests(String name) {
Lines 12071-12074 Link Here
12071
		deleteProject("P");
12071
		deleteProject("P");
12072
	}
12072
	}
12073
}
12073
}
12074
12075
public void testBug324109() throws CoreException {
12076
	this.workingCopies = new ICompilationUnit[1];
12077
	this.workingCopies[0] = getWorkingCopy("/JavaSearchBugs/src/b324109/X.java",
12078
		"package b324109;\n" +
12079
		"public class X extends A {\n" +
12080
		" public void run() {}\n" +
12081
		"}"
12082
	);
12083
	search("Worker.run()", METHOD, DECLARATIONS);
12084
	assertSearchResults(
12085
		""
12086
	);
12087
}
12074
}
12088
}

Return to bug 324109