### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core
Index: compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier15.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier15.java,v
retrieving revision 1.65
diff -u -r1.65 MethodVerifier15.java
--- compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier15.java	15 Jan 2007 12:04:28 -0000	1.65
+++ compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier15.java	23 Jan 2007 09:31:16 -0000
@@ -516,7 +516,8 @@
 	MethodBinding original = inherited.original(); // can be the same as inherited
 	if (!current.areParameterErasuresEqual(original) || current.returnType.erasure() != original.returnType.erasure()) return false;
 
-	problemReporter(current).methodNameClash(current, original);
+	problemReporter(current).methodNameClash(current, 
+			inherited.declaringClass.isRawType() ? inherited : original);
 	return true;
 }
 public boolean doesMethodOverride(MethodBinding method, MethodBinding inheritedMethod) {
#P org.eclipse.jdt.core.tests.compiler
Index: src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java,v
retrieving revision 1.585
diff -u -r1.585 GenericTypeTest.java
--- src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java	15 Jan 2007 12:16:57 -0000	1.585
+++ src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java	23 Jan 2007 09:32:52 -0000
@@ -36394,7 +36394,7 @@
 		"2. ERROR in X.java (at line 8)\n" + 
 		"	public void foo(final X<?> x) {\n" + 
 		"	            ^^^^^^^^^^^^^^^^^\n" + 
-		"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" + 
+		"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" + 
 		"----------\n" + 
 		"3. WARNING in X.java (at line 9)\n" + 
 		"	super.foo(x);\n" +