View | Details | Raw Unified | Return to bug 170318
Collapse All | Expand All

(-)compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier15.java (-1 / +2 lines)
Lines 516-522 Link Here
516
	MethodBinding original = inherited.original(); // can be the same as inherited
516
	MethodBinding original = inherited.original(); // can be the same as inherited
517
	if (!current.areParameterErasuresEqual(original) || current.returnType.erasure() != original.returnType.erasure()) return false;
517
	if (!current.areParameterErasuresEqual(original) || current.returnType.erasure() != original.returnType.erasure()) return false;
518
518
519
	problemReporter(current).methodNameClash(current, original);
519
	problemReporter(current).methodNameClash(current, 
520
			inherited.declaringClass.isRawType() ? inherited : original);
520
	return true;
521
	return true;
521
}
522
}
522
public boolean doesMethodOverride(MethodBinding method, MethodBinding inheritedMethod) {
523
public boolean doesMethodOverride(MethodBinding method, MethodBinding inheritedMethod) {
(-)src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java (-1 / +1 lines)
Lines 36394-36400 Link Here
36394
		"2. ERROR in X.java (at line 8)\n" + 
36394
		"2. ERROR in X.java (at line 8)\n" + 
36395
		"	public void foo(final X<?> x) {\n" + 
36395
		"	public void foo(final X<?> x) {\n" + 
36396
		"	            ^^^^^^^^^^^^^^^^^\n" + 
36396
		"	            ^^^^^^^^^^^^^^^^^\n" + 
36397
		"Name clash: The method foo(X<?>) of type Z has the same erasure as foo(X<?>) of type Y<T> but does not override it\n" + 
36397
		"Name clash: The method foo(X<?>) of type Z has the same erasure as foo(X) of type Y but does not override it\n" + 
36398
		"----------\n" + 
36398
		"----------\n" + 
36399
		"3. WARNING in X.java (at line 9)\n" + 
36399
		"3. WARNING in X.java (at line 9)\n" + 
36400
		"	super.foo(x);\n" + 
36400
		"	super.foo(x);\n" + 

Return to bug 170318