### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core.tests
Index: Eclipse Java Tests Compiler/org/eclipse/jdt/tests/compiler/regression/NegativeTest.java
===================================================================
RCS file: /home/cvs/numbat/org.eclipse.jdt.core.tests/Eclipse Java Tests Compiler/org/eclipse/jdt/tests/compiler/regression/NegativeTest.java,v
retrieving revision 1.315
diff -u -r1.315 NegativeTest.java
--- Eclipse Java Tests Compiler/org/eclipse/jdt/tests/compiler/regression/NegativeTest.java	17 Oct 2008 18:07:29 -0000	1.315
+++ Eclipse Java Tests Compiler/org/eclipse/jdt/tests/compiler/regression/NegativeTest.java	21 Oct 2008 17:48:12 -0000
@@ -2380,12 +2380,17 @@
 		"	       ^^^^\n" +
 		"void[] is an invalid type\n" +
 		"----------\n" +
-		"2. ERROR in p\\X.java (at line 5)\n" +
+		"2. ERROR in p\\X.java (at line 3)\n" +
+		"	public void method1()[] {\n" +
+		"	            ^^^^^^^^^^^\n" +
+		"Duplicate method method1() in type X\n" +
+		"----------\n" +
+		"3. ERROR in p\\X.java (at line 5)\n" +
 		"	public void[] method1() {\n" +
 		"	       ^^^^^^\n" +
 		"void[] is an invalid type\n" +
 		"----------\n" +
-		"3. ERROR in p\\X.java (at line 5)\n" +
+		"4. ERROR in p\\X.java (at line 5)\n" +
 		"	public void[] method1() {\n" +
 		"	              ^^^^^^^^^\n" +
 		"Duplicate method method1() in type X\n" +
@@ -3680,7 +3685,12 @@
 			"}",
 		},
 		"----------\n" +
-		"1. ERROR in p\\Toplevel12.java (at line 17)\n" +
+		"1. ERROR in p\\Toplevel12.java (at line 4)\n" +
+		"	Object local(){\n" +
+		"	       ^^^^^^^\n" +
+		"Duplicate method local() in type Toplevel12\n" +
+		"----------\n" +
+		"2. ERROR in p\\Toplevel12.java (at line 17)\n" +
 		"	void local(){\n" +
 		"	     ^^^^^^^\n" +
 		"Duplicate method local() in type Toplevel12\n" +
@@ -6668,10 +6678,15 @@
 			"}",
 		},
 		"----------\n" +
-		"1. ERROR in p\\AX.java (at line 11)\n" +
-		"	public AX() {\n" +
-		"	       ^^^^\n" +
-		"Duplicate method AX() in type AX\n" +
+		"1. ERROR in p\\AX.java (at line 6)\n" + 
+		"	public AX() {\n" + 
+		"	       ^^^^\n" + 
+		"Duplicate method AX() in type AX\n" + 
+		"----------\n" + 
+		"2. ERROR in p\\AX.java (at line 11)\n" + 
+		"	public AX() {\n" + 
+		"	       ^^^^\n" + 
+		"Duplicate method AX() in type AX\n" + 
 		"----------\n"
 	);
 }
#P org.eclipse.jdt.core.tests.model
Index: src/org/eclipse/jdt/core/tests/dom/ASTConverterTestAST3_2.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTConverterTestAST3_2.java,v
retrieving revision 1.151
diff -u -r1.151 ASTConverterTestAST3_2.java
--- src/org/eclipse/jdt/core/tests/dom/ASTConverterTestAST3_2.java	17 Oct 2008 18:07:32 -0000	1.151
+++ src/org/eclipse/jdt/core/tests/dom/ASTConverterTestAST3_2.java	21 Oct 2008 17:48:16 -0000
@@ -1316,7 +1316,7 @@
 		ASTNode result = runConversion(AST.JLS3, sourceUnit, true);
 		assertTrue("not a compilation unit", result.getNodeType() == ASTNode.COMPILATION_UNIT); //$NON-NLS-1$
 		CompilationUnit unit = (CompilationUnit) result;
-		assertEquals("Wrong number of problems", 1, unit.getProblems().length); //$NON-NLS-1$<
+		assertEquals("Wrong number of problems", 2, unit.getProblems().length); //$NON-NLS-1$<
 		ASTNode node = getASTNode(unit, 0);
 		assertEquals("Wrong type", ASTNode.TYPE_DECLARATION, node.getNodeType());
 		TypeDeclaration typeDeclaration = (TypeDeclaration) node;
Index: src/org/eclipse/jdt/core/tests/dom/ASTConverterTest2.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTConverterTest2.java,v
retrieving revision 1.189
diff -u -r1.189 ASTConverterTest2.java
--- src/org/eclipse/jdt/core/tests/dom/ASTConverterTest2.java	17 Oct 2008 18:07:32 -0000	1.189
+++ src/org/eclipse/jdt/core/tests/dom/ASTConverterTest2.java	21 Oct 2008 17:48:14 -0000
@@ -1233,7 +1233,7 @@
 		ASTNode result = runConversion(sourceUnit, true);
 		assertTrue("not a compilation unit", result.getNodeType() == ASTNode.COMPILATION_UNIT); //$NON-NLS-1$
 		CompilationUnit unit = (CompilationUnit) result;
-		assertEquals("Wrong number of problems", 1, unit.getProblems().length); //$NON-NLS-1$<
+		assertEquals("Wrong number of problems", 2, unit.getProblems().length); //$NON-NLS-1$<
 		ASTNode node = getASTNode(unit, 0);
 		assertEquals("Wrong type", ASTNode.TYPE_DECLARATION, node.getNodeType());
 		TypeDeclaration typeDeclaration = (TypeDeclaration) node;
#P org.eclipse.jdt.core
Index: compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java,v
retrieving revision 1.166
diff -u -r1.166 SourceTypeBinding.java
--- compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java	17 Oct 2008 18:07:19 -0000	1.166
+++ compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java	21 Oct 2008 17:48:18 -0000
@@ -1165,13 +1165,21 @@
 				}
 				boolean isEnumSpecialMethod = isEnum() && (CharOperation.equals(selector,TypeConstants.VALUEOF) || CharOperation.equals(selector,TypeConstants.VALUES));
 				// report duplicate
+				if (methodDecl == null) {
+					methodDecl = method.sourceMethod(); // cannot be retrieved after binding is lost & may still be null if method is special
+					if (methodDecl != null && methodDecl.binding != null) { // ensure its a valid user defined method
+						if (isEnumSpecialMethod)
+							this.scope.problemReporter().duplicateEnumSpecialMethod(this, methodDecl);
+						else
+							this.scope.problemReporter().duplicateMethodInType(this, methodDecl, method.areParametersEqual(method2));
+					}
+				}
 				AbstractMethodDeclaration method2Decl = method2.sourceMethod();
 				if (method2Decl != null && method2Decl.binding != null) { // ensure its a valid user defined method
-					if (isEnumSpecialMethod) {
+					if (isEnumSpecialMethod)
 						this.scope.problemReporter().duplicateEnumSpecialMethod(this, method2Decl);
-					} else {
+					else
 						this.scope.problemReporter().duplicateMethodInType(this, method2Decl, method.areParametersEqual(method2));
-					}
 					method2Decl.binding = null;
 					// do not alter original method array until resolution is over, due to reentrance (143259)
 					if (resolvedMethods == this.methods)
Index: compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java,v
retrieving revision 1.163
diff -u -r1.163 ClassScope.java
--- compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java	17 Oct 2008 18:07:19 -0000	1.163
+++ compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java	21 Oct 2008 17:48:18 -0000
@@ -91,6 +91,7 @@
 		// iterate the field declarations to create the bindings, lose all duplicates
 		FieldBinding[] fieldBindings = new FieldBinding[count];
 		HashtableOfObject knownFieldNames = new HashtableOfObject(count);
+		boolean duplicate = false;
 		count = 0;
 		for (int i = 0; i < size; i++) {
 			FieldDeclaration field = fields[i];
@@ -104,6 +105,18 @@
 				checkAndSetModifiersForField(fieldBinding, field);
 
 				if (knownFieldNames.containsKey(field.name)) {
+					duplicate = true;
+					FieldBinding previousBinding = (FieldBinding) knownFieldNames.get(field.name);
+					if (previousBinding != null) {
+						for (int f = 0; f < i; f++) {
+							FieldDeclaration previousField = fields[f];
+							if (previousField.binding == previousBinding) {
+								problemReporter().duplicateFieldInType(sourceType, previousField);
+								break;
+							}
+						}
+					}
+					knownFieldNames.put(field.name, null); // ensure that the duplicate field is found & removed
 					problemReporter().duplicateFieldInType(sourceType, field);
 					field.binding = null;
 				} else {
#P org.eclipse.jdt.core.tests.compiler
Index: src/org/eclipse/jdt/core/tests/compiler/regression/MethodVerifyTest.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/MethodVerifyTest.java,v
retrieving revision 1.164
diff -u -r1.164 MethodVerifyTest.java
--- src/org/eclipse/jdt/core/tests/compiler/regression/MethodVerifyTest.java	17 Oct 2008 18:07:28 -0000	1.164
+++ src/org/eclipse/jdt/core/tests/compiler/regression/MethodVerifyTest.java	21 Oct 2008 17:48:26 -0000
@@ -3382,9 +3382,14 @@
 			"1. ERROR in X.java (at line 6)\n" +
 			"	@Override T id(T x) { return x; }\n" +
 			"	            ^^^^^^^\n" +
+			"Method id(T) has the same erasure id(A) as another method in type Y<T>\n" +
+			"----------\n" +
+			"2. ERROR in X.java (at line 6)\n" +
+			"	@Override T id(T x) { return x; }\n" +
+			"	            ^^^^^^^\n" +
 			"Name clash: The method id(T) of type Y<T> has the same erasure as id(A) of type X<T> but does not override it\n" +
 			"----------\n" +
-			"2. ERROR in X.java (at line 7)\n" +
+			"3. ERROR in X.java (at line 7)\n" +
 			"	@Override A id(A x) { return x; }\n" +
 			"	            ^^^^^^^\n" +
 			"Method id(A) has the same erasure id(A) as another method in type Y<T>\n" +
@@ -3495,17 +3500,32 @@
 				"class Z {}"
 			},
 			"----------\n" +
-			"1. ERROR in X.java (at line 4)\n" +
+			"1. ERROR in X.java (at line 3)\n" +
+			"	Y foo(Object o) {  return null; } // duplicate\n" +
+			"	  ^^^^^^^^^^^^^\n" +
+			"Duplicate method foo(Object) in type X.C1\n" +
+			"----------\n" +
+			"2. ERROR in X.java (at line 4)\n" +
 			"	Z foo(Object o) {  return null; } // duplicate\n" +
 			"	  ^^^^^^^^^^^^^\n" +
 			"Duplicate method foo(Object) in type X.C1\n" +
 			"----------\n" +
-			"2. ERROR in X.java (at line 12)\n" +
+			"3. ERROR in X.java (at line 11)\n" +
+			"	A<Y> foo(Object o) {  return null; } // duplicate\n" +
+			"	     ^^^^^^^^^^^^^\n" +
+			"Duplicate method foo(Object) in type X.C3\n" +
+			"----------\n" +
+			"4. ERROR in X.java (at line 12)\n" +
 			"	A<Z> foo(Object o) {  return null; } // duplicate\n" +
 			"	     ^^^^^^^^^^^^^\n" +
 			"Duplicate method foo(Object) in type X.C3\n" +
 			"----------\n" +
-			"3. ERROR in X.java (at line 16)\n" +
+			"5. ERROR in X.java (at line 15)\n" +
+			"	Y foo(Object o) {  return null; } // duplicate\n" +
+			"	  ^^^^^^^^^^^^^\n" +
+			"Duplicate method foo(Object) in type X.C4\n" +
+			"----------\n" +
+			"6. ERROR in X.java (at line 16)\n" +
 			"	<T extends Z> T foo(Object o) {  return null; } // duplicate\n" +
 			"	                ^^^^^^^^^^^^^\n" +
 			"Duplicate method foo(Object) in type X.C4\n" +
@@ -3535,7 +3555,12 @@
 				"class Z {}"
 			},
 			"----------\n" +
-			"1. ERROR in X.java (at line 4)\n" +
+			"1. ERROR in X.java (at line 3)\n" +
+			"	A<Y> foo(A<Y> o) {  return null; } // duplicate\n" +
+			"	     ^^^^^^^^^^^\n" +
+			"Method foo(A<Y>) has the same erasure foo(A<T>) as another method in type X.C5\n" +
+			"----------\n" +
+			"2. ERROR in X.java (at line 4)\n" +
 			"	A<Z> foo(A<Z> o) {  return null; } // duplicate\n" +
 			"	     ^^^^^^^^^^^\n" +
 			"Method foo(A<Z>) has the same erasure foo(A<T>) as another method in type X.C5\n" +
@@ -3594,7 +3619,12 @@
 				"class B {}\n"
 			},
 			"----------\n" +
-			"1. ERROR in X.java (at line 3)\n" +
+			"1. ERROR in X.java (at line 2)\n" +
+			"	<N extends B> N a(A<String> s) { return null; }\n" +
+			"	                ^^^^^^^^^^^^^^\n" +
+			"Method a(A<String>) has the same erasure a(A<T>) as another method in type X\n" +
+			"----------\n" +
+			"2. ERROR in X.java (at line 3)\n" +
 			"	<N> B a(A<Number> n) { return null; }\n" +
 			"	      ^^^^^^^^^^^^^^\n" +
 			"Method a(A<Number>) has the same erasure a(A<T>) as another method in type X\n" +
@@ -3615,7 +3645,12 @@
 				"class B {}\n"
 			},
 			"----------\n" +
-			"1. ERROR in X.java (at line 3)\n" +
+			"1. ERROR in X.java (at line 2)\n" +
+			"	<N extends B> N b(A<String> s) { return null; }\n" +
+			"	                ^^^^^^^^^^^^^^\n" +
+			"Method b(A<String>) has the same erasure b(A<T>) as another method in type X\n" +
+			"----------\n" +
+			"2. ERROR in X.java (at line 3)\n" +
 			"	<N extends B> B b(A<Number> n) { return null; }\n" +
 			"	                ^^^^^^^^^^^^^^\n" +
 			"Method b(A<Number>) has the same erasure b(A<T>) as another method in type X\n" +
@@ -3636,7 +3671,12 @@
 				"class B {}\n"
 			},
 			"----------\n" +
-			"1. ERROR in X.java (at line 3)\n" +
+			"1. ERROR in X.java (at line 2)\n" +
+			"	B c(A<String> s) { return null; }\n" +
+			"	  ^^^^^^^^^^^^^^\n" +
+			"Method c(A<String>) has the same erasure c(A<T>) as another method in type X\n" +
+			"----------\n" +
+			"2. ERROR in X.java (at line 3)\n" +
 			"	B c(A<Number> n) { return null; }\n" +
 			"	  ^^^^^^^^^^^^^^\n" +
 			"Method c(A<Number>) has the same erasure c(A<T>) as another method in type X\n" +
@@ -3677,12 +3717,22 @@
 				"class B {}\n"
 			},
 			"----------\n" +
-			"1. ERROR in X.java (at line 3)\n" +
+			"1. ERROR in X.java (at line 2)\n" +
+			"	<N extends B> N a(A<Number> s) { return null; }\n" +
+			"	                ^^^^^^^^^^^^^^\n" +
+			"Duplicate method a(A<Number>) in type X\n" +
+			"----------\n" +
+			"2. ERROR in X.java (at line 3)\n" +
 			"	<N> B a(A<Number> n) { return null; }\n" +
 			"	      ^^^^^^^^^^^^^^\n" +
 			"Duplicate method a(A<Number>) in type X\n" +
 			"----------\n" +
-			"2. ERROR in X.java (at line 5)\n" +
+			"3. ERROR in X.java (at line 4)\n" +
+			"	<N extends B> N b(A<Number> s) { return null; }\n" +
+			"	                ^^^^^^^^^^^^^^\n" +
+			"Method b(A<Number>) has the same erasure b(A<T>) as another method in type X\n" +
+			"----------\n" +
+			"4. ERROR in X.java (at line 5)\n" +
 			"	<N> B b(A<String> n) { return null; }\n" +
 			"	      ^^^^^^^^^^^^^^\n" +
 			"Method b(A<String>) has the same erasure b(A<T>) as another method in type X\n" +
@@ -3706,12 +3756,22 @@
 				"class B {}\n"
 			},
 			"----------\n" +
-			"1. ERROR in X.java (at line 3)\n" +
+			"1. ERROR in X.java (at line 2)\n" +
+			"	<N extends B> void a(A<Number> s) {}\n" +
+			"	                   ^^^^^^^^^^^^^^\n" +
+			"Duplicate method a(A<Number>) in type X\n" +
+			"----------\n" +
+			"2. ERROR in X.java (at line 3)\n" +
 			"	<N extends B> B a(A<Number> n) { return null; }\n" +
 			"	                ^^^^^^^^^^^^^^\n" +
 			"Duplicate method a(A<Number>) in type X\n" +
 			"----------\n" +
-			"2. ERROR in X.java (at line 5)\n" +
+			"3. ERROR in X.java (at line 4)\n" +
+			"	<N extends B> Object b(A<Number> s) { return null; }\n" +
+			"	                     ^^^^^^^^^^^^^^\n" +
+			"Duplicate method b(A<Number>) in type X\n" +
+			"----------\n" +
+			"4. ERROR in X.java (at line 5)\n" +
 			"	<N extends B> B b(A<Number> n) { return null; }\n" +
 			"	                ^^^^^^^^^^^^^^\n" +
 			"Duplicate method b(A<Number>) in type X\n" +
@@ -3735,12 +3795,22 @@
 				"class B {}\n"
 			},
 			"----------\n" +
-			"1. ERROR in X.java (at line 3)\r\n" +
+			"1. ERROR in X.java (at line 2)\r\n" +
+			"	void a(A<Number> s) {}\r\n" +
+			"	     ^^^^^^^^^^^^^^\n" +
+			"Duplicate method a(A<Number>) in type X\n" +
+			"----------\n" +
+			"2. ERROR in X.java (at line 3)\r\n" +
 			"	B a(A<Number> n) { return null; }\r\n" +
 			"	  ^^^^^^^^^^^^^^\n" +
 			"Duplicate method a(A<Number>) in type X\n" +
 			"----------\n" +
-			"2. ERROR in X.java (at line 5)\r\n" +
+			"3. ERROR in X.java (at line 4)\r\n" +
+			"	Object b(A<Number> s) {}\r\n" +
+			"	       ^^^^^^^^^^^^^^\n" +
+			"Duplicate method b(A<Number>) in type X\n" +
+			"----------\n" +
+			"4. ERROR in X.java (at line 5)\r\n" +
 			"	B b(A<Number> n) { return null; }\r\n" +
 			"	  ^^^^^^^^^^^^^^\n" +
 			"Duplicate method b(A<Number>) in type X\n" +
@@ -3783,7 +3853,12 @@
 				"class A<T> {}\n",
 			},
 			"----------\n" +
-			"1. ERROR in X.java (at line 3)\n" +
+			"1. ERROR in X.java (at line 2)\n" +
+			"	void foo(A<String> a) {}\n" +
+			"	     ^^^^^^^^^^^^^^^^\n" +
+			"Method foo(A<String>) has the same erasure foo(A<T>) as another method in type X\n" +
+			"----------\n" +
+			"2. ERROR in X.java (at line 3)\n" +
 			"	void foo(A<Integer> a) {}\n" +
 			"	     ^^^^^^^^^^^^^^^^^\n" +
 			"Method foo(A<Integer>) has the same erasure foo(A<T>) as another method in type X\n" +
@@ -3928,7 +4003,12 @@
 				"}\n"
 			},
 			"----------\n" +
-			"1. ERROR in X.java (at line 3)\n" +
+			"1. ERROR in X.java (at line 2)\n" +
+			"	void a(Object x) {}\n" +
+			"	     ^^^^^^^^^^^\n" +
+			"Method a(Object) has the same erasure a(Object) as another method in type X\n" +
+			"----------\n" +
+			"2. ERROR in X.java (at line 3)\n" +
 			"	<T> T a(T x) {  return null; }\n" +
 			"	      ^^^^^^\n" +
 			"Method a(T) has the same erasure a(Object) as another method in type X\n" +
@@ -3954,7 +4034,12 @@
 				"}\n"
 			},
 			"----------\n" +
-			"1. ERROR in X.java (at line 7)\n" +
+			"1. ERROR in X.java (at line 6)\n" +
+			"	String a(X x) {  return null; }\n" +
+			"	       ^^^^^^\n" +
+			"Method a(X) has the same erasure a(X) as another method in type X\n" +
+			"----------\n" +
+			"2. ERROR in X.java (at line 7)\n" +
 			"	<T extends X> T a(T x) {  return null; }\n" +
 			"	                ^^^^^^\n" +
 			"Method a(T) has the same erasure a(X) as another method in type X\n" +
@@ -3986,7 +4071,12 @@
 				"}\n"
 			},
 			"----------\n" +
-			"1. ERROR in X.java (at line 3)\r\n" +
+			"1. ERROR in X.java (at line 2)\r\n" +
+			"	<T1 extends X<T1>> void dupT() {}\r\n" +
+			"	                        ^^^^^^\n" +
+			"Duplicate method dupT() in type X<T>\n" +
+			"----------\n" +
+			"2. ERROR in X.java (at line 3)\r\n" +
 			"	<T2 extends X<T2>> Object dupT() {return null;}\r\n" +
 			"	                          ^^^^^^\n" +
 			"Duplicate method dupT() in type X<T>\n" +
@@ -4936,7 +5026,12 @@
 				"interface J {}\n"
 			},
 			"----------\n" +
-			"1. ERROR in A.java (at line 3)\r\n" +
+			"1. ERROR in A.java (at line 2)\r\n" +
+			"	<T, S extends J & I<T>> void foo() { }\r\n" +
+			"	                             ^^^^^\n" +
+			"Duplicate method foo() in type A\n" +
+			"----------\n" +
+			"2. ERROR in A.java (at line 3)\r\n" +
 			"	<T, S extends I<T> & J> void foo() { }\r\n" +
 			"	                             ^^^^^\n" +
 			"Duplicate method foo() in type A\n" +
@@ -4957,7 +5052,12 @@
 				"interface K extends J {}"
 			},
 			"----------\n" +
-			"1. ERROR in A.java (at line 3)\r\n" +
+			"1. ERROR in A.java (at line 2)\r\n" +
+			"	<T, S extends J & I<T>> void foo() { }\r\n" +
+			"	                             ^^^^^\n" +
+			"Duplicate method foo() in type A\n" +
+			"----------\n" +
+			"2. ERROR in A.java (at line 3)\r\n" +
 			"	<T, S extends I<T> & K> void foo() { }\r\n" +
 			"	                             ^^^^^\n" +
 			"Duplicate method foo() in type A\n" +
@@ -5878,59 +5978,64 @@
 			"5. ERROR in DataSet.java (at line 6)\n" +
 			"	public <S> S[] toArray(S[] s) {\n" +
 			"	               ^^^^^^^^^^^^^^\n" +
-			"Name clash: The method toArray(S[]) of type DataSet<T> has the same erasure as toArray(Object[]) of type List but does not override it\n" +
+			"Method toArray(S[]) has the same erasure toArray(Object[]) as another method in type DataSet<T>\n" +
 			"----------\n" +
 			"6. ERROR in DataSet.java (at line 6)\n" +
 			"	public <S> S[] toArray(S[] s) {\n" +
 			"	               ^^^^^^^^^^^^^^\n" +
+			"Name clash: The method toArray(S[]) of type DataSet<T> has the same erasure as toArray(Object[]) of type List but does not override it\n" +
+			"----------\n" +
+			"7. ERROR in DataSet.java (at line 6)\n" +
+			"	public <S> S[] toArray(S[] s) {\n" +
+			"	               ^^^^^^^^^^^^^^\n" +
 			"Name clash: The method toArray(S[]) of type DataSet<T> has the same erasure as toArray(Object[]) of type Collection but does not override it\n" +
 			"----------\n" +
-			"7. ERROR in DataSet.java (at line 9)\n" +
+			"8. ERROR in DataSet.java (at line 9)\n" +
 			"	public Object[] toArray(Object[] o) {\n" +
 			"	                ^^^^^^^^^^^^^^^^^^^\n" +
 			"Method toArray(Object[]) has the same erasure toArray(Object[]) as another method in type DataSet<T>\n" +
 			"----------\n" +
-			"8. WARNING in DataSet.java (at line 14)\n" +
+			"9. WARNING in DataSet.java (at line 14)\n" +
 			"	public boolean addAll(Collection c) {	return false; }\n" +
 			"	                      ^^^^^^^^^^\n" +
 			"Collection is a raw type. References to generic type Collection<E> should be parameterized\n" +
 			"----------\n" +
-			"9. WARNING in DataSet.java (at line 15)\n" +
+			"10. WARNING in DataSet.java (at line 15)\n" +
 			"	public boolean addAll(int index, Collection c) {	return false; }\n" +
 			"	                                 ^^^^^^^^^^\n" +
 			"Collection is a raw type. References to generic type Collection<E> should be parameterized\n" +
 			"----------\n" +
-			"10. WARNING in DataSet.java (at line 18)\n" +
+			"11. WARNING in DataSet.java (at line 18)\n" +
 			"	public boolean containsAll(Collection c) { return false; }\n" +
 			"	                           ^^^^^^^^^^\n" +
 			"Collection is a raw type. References to generic type Collection<E> should be parameterized\n" +
 			"----------\n" +
-			"11. WARNING in DataSet.java (at line 22)\n" +
+			"12. WARNING in DataSet.java (at line 22)\n" +
 			"	public Iterator iterator() {	return null; }\n" +
 			"	       ^^^^^^^^\n" +
 			"Iterator is a raw type. References to generic type Iterator<E> should be parameterized\n" +
 			"----------\n" +
-			"12. WARNING in DataSet.java (at line 24)\n" +
+			"13. WARNING in DataSet.java (at line 24)\n" +
 			"	public ListIterator listIterator() {	return null; }\n" +
 			"	       ^^^^^^^^^^^^\n" +
 			"ListIterator is a raw type. References to generic type ListIterator<E> should be parameterized\n" +
 			"----------\n" +
-			"13. WARNING in DataSet.java (at line 25)\n" +
+			"14. WARNING in DataSet.java (at line 25)\n" +
 			"	public ListIterator listIterator(int index) {	return null; }\n" +
 			"	       ^^^^^^^^^^^^\n" +
 			"ListIterator is a raw type. References to generic type ListIterator<E> should be parameterized\n" +
 			"----------\n" +
-			"14. WARNING in DataSet.java (at line 28)\n" +
+			"15. WARNING in DataSet.java (at line 28)\n" +
 			"	public boolean removeAll(Collection c) {	return false; }\n" +
 			"	                         ^^^^^^^^^^\n" +
 			"Collection is a raw type. References to generic type Collection<E> should be parameterized\n" +
 			"----------\n" +
-			"15. WARNING in DataSet.java (at line 29)\n" +
+			"16. WARNING in DataSet.java (at line 29)\n" +
 			"	public boolean retainAll(Collection c) {	return false; }\n" +
 			"	                         ^^^^^^^^^^\n" +
 			"Collection is a raw type. References to generic type Collection<E> should be parameterized\n" +
 			"----------\n" +
-			"16. WARNING in DataSet.java (at line 32)\n" +
+			"17. WARNING in DataSet.java (at line 32)\n" +
 			"	public List subList(int fromIndex, int toIndex) {	return null; }\n" +
 			"	       ^^^^\n" +
 			"List is a raw type. References to generic type List<E> should be parameterized\n" +
@@ -6124,7 +6229,12 @@
 			"}"
 		},
 		"----------\n" +
-		"1. ERROR in X.java (at line 14)\n" +
+		"1. ERROR in X.java (at line 11)\n" +
+		"	Integer getX(List<Integer> l) {\n" +
+		"	        ^^^^^^^^^^^^^^^^^^^^^\n" +
+		"Duplicate method getX(List<Integer>) in type Y\n" +
+		"----------\n" +
+		"2. ERROR in X.java (at line 14)\n" +
 		"	String getX(List<Integer> l) {\n" +
 		"	       ^^^^^^^^^^^^^^^^^^^^^\n" +
 		"Duplicate method getX(List<Integer>) in type Y\n" +
@@ -8076,22 +8186,26 @@
 			"}\n"
 		},
 		"----------\n" +
-		"1. ERROR in X.java (at line 7)\n" +
+		"1. ERROR in X.java (at line 3)\n" +
+		"	public MyT<Void> method3(D1<String> harg, D1<String> oarg, D1<java.util.Date> date){\n" +
+		"	                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" +
+		"Method method3(X.D1<String>, X.D1<String>, X.D1<Date>) has the same erasure method3(X.D1<T>, X.D1<T>, X.D1<T>) as another method in type X\n" +
+		"----------\n" +
+		"2. ERROR in X.java (at line 7)\n" +
 		"	public MyT<Void> method3(D1<String> harg, D1<String> oarg, D1<String> date){\n" +
 		"	                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" +
 		"Method method3(X.D1<String>, X.D1<String>, X.D1<String>) has the same erasure method3(X.D1<T>, X.D1<T>, X.D1<T>) as another method in type X\n" +
 		"----------\n" +
-		"2. WARNING in X.java (at line 11)\n" +
+		"3. WARNING in X.java (at line 11)\n" +
 		"	public MyT<Void> method3(D1<String> harg, D1<String> oarg, D1<java.util.Date> date, D1 ... notUsed){\n" +
 		"	                                                                                    ^^\n" +
 		"X.D1 is a raw type. References to generic type X.D1<T> should be parameterized\n" +
 		"----------\n" +
-		"3. WARNING in X.java (at line 15)\n" +
+		"4. WARNING in X.java (at line 15)\n" +
 		"	public MyT<Void> method3(D1<String> harg, D1<String> oarg, D1<String> date, D2 ... notUsed){\n" +
 		"	                                                                            ^^\n" +
 		"X.D2 is a raw type. References to generic type X.D2<T> should be parameterized\n" +
-		"----------\n"
-	);
+		"----------\n");
 }
 public void test151() {
 	this.runConformTest(
Index: src/org/eclipse/jdt/core/tests/compiler/regression/EnumTest.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/EnumTest.java,v
retrieving revision 1.131
diff -u -r1.131 EnumTest.java
--- src/org/eclipse/jdt/core/tests/compiler/regression/EnumTest.java	17 Oct 2008 18:07:27 -0000	1.131
+++ src/org/eclipse/jdt/core/tests/compiler/regression/EnumTest.java	21 Oct 2008 17:48:20 -0000
@@ -176,7 +176,12 @@
 			"}"
 		},
 		"----------\n" +
-		"1. ERROR in X.java (at line 6)\n" +
+		"1. ERROR in X.java (at line 3)\n" +
+		"	BLEU, \n" +
+		"	^^^^\n" +
+		"Duplicate field X.BLEU\n" +
+		"----------\n" +
+		"2. ERROR in X.java (at line 6)\n" +
 		"	BLEU;\n" +
 		"	^^^^\n" +
 		"Duplicate field X.BLEU\n" +
@@ -323,27 +328,32 @@
 			"}\n"
 		},
 		"----------\n" +
-		"1. ERROR in X.java (at line 8)\n" +
+		"1. ERROR in X.java (at line 7)\n" +
+		"	void dup() {} \n" +
+		"	     ^^^^^\n" +
+		"Duplicate method dup() in type X\n" +
+		"----------\n" +
+		"2. ERROR in X.java (at line 8)\n" +
 		"	void values() {} \n" +
 		"	     ^^^^^^^^\n" +
 		"The enum X already defines the method values() implicitly\n" +
 		"----------\n" +
-		"2. ERROR in X.java (at line 9)\n" +
+		"3. ERROR in X.java (at line 9)\n" +
 		"	void dup() {} \n" +
 		"	     ^^^^^\n" +
 		"Duplicate method dup() in type X\n" +
 		"----------\n" +
-		"3. ERROR in X.java (at line 10)\n" +
+		"4. ERROR in X.java (at line 10)\n" +
 		"	void values() {} \n" +
 		"	     ^^^^^^^^\n" +
 		"The enum X already defines the method values() implicitly\n" +
 		"----------\n" +
-		"4. ERROR in X.java (at line 11)\n" +
+		"5. ERROR in X.java (at line 11)\n" +
 		"	Missing dup() {} \n" +
 		"	^^^^^^^\n" +
 		"Missing cannot be resolved to a type\n" +
 		"----------\n" +
-		"5. ERROR in X.java (at line 11)\n" +
+		"6. ERROR in X.java (at line 11)\n" +
 		"	Missing dup() {} \n" +
 		"	        ^^^^^\n" +
 		"Duplicate method dup() in type X\n" +
@@ -1962,12 +1972,16 @@
 		"	          ^^^^^\n" +
 		"The enum constant THREE must define the abstract method getSquare()\n" +
 		"----------\n" +
-		"4. ERROR in X.java (at line 4)\n" +
+		"4. ERROR in X.java (at line 3)\n" +
 		"	abstract int getSquare();\n" +
 		"	             ^^^^^^^^^^^\n" +
 		"Duplicate method getSquare() in type X\n" +
-		"----------\n"
-	);
+		"----------\n" +
+		"5. ERROR in X.java (at line 4)\n" +
+		"	abstract int getSquare();\n" +
+		"	             ^^^^^^^^^^^\n" +
+		"Duplicate method getSquare() in type X\n" +
+		"----------\n");
 }
 
 /**
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.759
diff -u -r1.759 GenericTypeTest.java
--- src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java	17 Oct 2008 18:07:27 -0000	1.759
+++ src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java	21 Oct 2008 17:48:25 -0000
@@ -867,7 +867,12 @@
 				"}\n" ,
 			},
 			"----------\n" +
-			"1. ERROR in X.java (at line 3)\n" +
+			"1. ERROR in X.java (at line 2)\n" +
+			"	void foo(E e){}\n" +
+			"	     ^^^^^^^^\n" +
+			"Method foo(E) has the same erasure foo(Object) as another method in type X<E,T>\n" +
+			"----------\n" +
+			"2. ERROR in X.java (at line 3)\n" +
 			"	void foo(T t){}\n" +
 			"	     ^^^^^^^^\n" +
 			"Method foo(T) has the same erasure foo(Object) as another method in type X<E,T>\n" +
@@ -884,7 +889,12 @@
 				"}\n" ,
 			},
 			"----------\n" +
-			"1. ERROR in X.java (at line 3)\n" +
+			"1. ERROR in X.java (at line 2)\n" +
+			"	void foo(E e){}\n" +
+			"	     ^^^^^^^^\n" +
+			"Method foo(E) has the same erasure foo(Exception) as another method in type X<E,T>\n" +
+			"----------\n" +
+			"2. ERROR in X.java (at line 3)\n" +
 			"	void foo(T t){}\n" +
 			"	     ^^^^^^^^\n" +
 			"Method foo(T) has the same erasure foo(Exception) as another method in type X<E,T>\n" +
@@ -901,7 +911,12 @@
 				"}\n" ,
 			},
 			"----------\n" +
-			"1. ERROR in X.java (at line 3)\n" +
+			"1. ERROR in X.java (at line 2)\n" +
+			"	void foo(E e, Thread t){}\n" +
+			"	     ^^^^^^^^^^^^^^^^^^\n" +
+			"Method foo(E, Thread) has the same erasure foo(Exception, Thread) as another method in type X<E,T>\n" +
+			"----------\n" +
+			"2. ERROR in X.java (at line 3)\n" +
 			"	void foo(Exception e, T t){}\n" +
 			"	     ^^^^^^^^^^^^^^^^^^^^^\n" +
 			"Method foo(Exception, T) has the same erasure foo(Exception, Thread) as another method in type X<E,T>\n" +
@@ -974,17 +989,22 @@
 				"}\n",
 			},
 			"----------\n" +
-			"1. ERROR in X.java (at line 3)\n" +
+			"1. ERROR in X.java (at line 2)\n" +
+			"	void foo(L<E> l1){}\n" +
+			"	     ^^^^^^^^^^^^\n" +
+			"Method foo(L<E>) has the same erasure foo(L<E>) as another method in type X<E,T>\n" +
+			"----------\n" +
+			"2. ERROR in X.java (at line 3)\n" +
 			"	void foo(L<T> l2){}\n" +
 			"	     ^^^^^^^^^^^^\n" +
 			"Method foo(L<T>) has the same erasure foo(L<E>) as another method in type X<E,T>\n" +
 			"----------\n" +
-			"2. ERROR in X.java (at line 4)\n" +
+			"3. ERROR in X.java (at line 4)\n" +
 			"	void foo(L l){}\n" +
 			"	     ^^^^^^^^\n" +
 			"Method foo(L) has the same erasure foo(L<E>) as another method in type X<E,T>\n" +
 			"----------\n" +
-			"3. WARNING in X.java (at line 4)\n" +
+			"4. WARNING in X.java (at line 4)\n" +
 			"	void foo(L l){}\n" +
 			"	         ^\n" +
 			"L is a raw type. References to generic type L<E> should be parameterized\n" +
@@ -7293,12 +7313,17 @@
 				"}\n"
 			},
 			"----------\n" +
-			"1. ERROR in SubTypes.java (at line 6)\n" +
+			"1. ERROR in SubTypes.java (at line 5)\n" +
+			"	@Override public X foo() { return new X(); }\n" +
+			"	                   ^^^^^\n" +
+			"Duplicate method foo() in type B\n" +
+			"----------\n" +
+			"2. ERROR in SubTypes.java (at line 6)\n" +
 			"	@Override public B foo() { return this; }\n" +
 			"	                   ^^^^^\n" +
 			"Duplicate method foo() in type B\n" +
 			"----------\n" +
-			"2. ERROR in SubTypes.java (at line 9)\n" +
+			"3. ERROR in SubTypes.java (at line 9)\n" +
 			"	@Override public X foo() { return new X(); }\n" +
 			"	                 ^\n" +
 			"The return type is incompatible with A.foo()\n" +
@@ -39759,27 +39784,32 @@
 		"	                                                         ^\n" +
 		"Cannot specify any additional bound T when first bound is a type parameter\n" +
 		"----------\n" +
-		"2. WARNING in X.java (at line 3)\n" +
+		"2. ERROR in X.java (at line 2)\n" +
+		"	public static <S, T extends Comparable<S>, R extends S & T> R max(T arg1, S arg2) {\n" +
+		"	                                                              ^^^^^^^^^^^^^^^^^^^\n" +
+		"Method max(T, S) has the same erasure max(Comparable<T>, Object) as another method in type X\n" +
+		"----------\n" +
+		"3. WARNING in X.java (at line 3)\n" +
 		"	return (R) ((arg1.compareTo(arg2) > 0) ? arg1 : arg2);\n" +
 		"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" +
 		"Type safety: Unchecked cast from Object to R\n" +
 		"----------\n" +
-		"3. ERROR in X.java (at line 6)\n" +
+		"4. ERROR in X.java (at line 6)\n" +
 		"	public static <T extends Comparable<S>, S, R extends S & Comparable<S>> R max(T arg1, S arg2) {\n" +
 		"	                                                         ^^^^^^^^^^\n" +
 		"Cannot specify any additional bound Comparable<S> when first bound is a type parameter\n" +
 		"----------\n" +
-		"4. ERROR in X.java (at line 6)\n" +
+		"5. ERROR in X.java (at line 6)\n" +
 		"	public static <T extends Comparable<S>, S, R extends S & Comparable<S>> R max(T arg1, S arg2) {\n" +
 		"	                                                                          ^^^^^^^^^^^^^^^^^^^\n" +
 		"Method max(T, S) has the same erasure max(Comparable<T>, Object) as another method in type X\n" +
 		"----------\n" +
-		"5. WARNING in X.java (at line 7)\n" +
+		"6. WARNING in X.java (at line 7)\n" +
 		"	return (R) ((arg1.compareTo(arg2) > 0) ? arg1 : arg2);\n" +
 		"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" +
 		"Type safety: Unchecked cast from Object to R\n" +
 		"----------\n" +
-		"6. WARNING in X.java (at line 11)\n" +
+		"7. WARNING in X.java (at line 11)\n" +
 		"	return (R) ((arg1.compareTo(arg2) > 0) ? arg1 : arg2);\n" +
 		"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" +
 		"Type safety: Unchecked cast from Object to R\n" +
@@ -39873,17 +39903,27 @@
 			"}"
 		},
 		"----------\n" +
-		"1. WARNING in X.java (at line 2)\n" +
+		"1. ERROR in X.java (at line 2)\n" +
+		"	<T> void foo(Class<X> c) {};\n" +
+		"	         ^^^^^^^^^^^^^^^\n" +
+		"Method foo(Class<X>) has the same erasure foo(Class<T>) as another method in type X<U,V>\n" +
+		"----------\n" +
+		"2. WARNING in X.java (at line 2)\n" +
 		"	<T> void foo(Class<X> c) {};\n" +
 		"	                   ^\n" +
 		"X is a raw type. References to generic type X<U,V> should be parameterized\n" +
 		"----------\n" +
-		"2. ERROR in X.java (at line 3)\n" +
+		"3. ERROR in X.java (at line 3)\n" +
 		"	<A, B> void foo(Class<X<A, B>> c) {}\n" +
 		"	            ^^^^^^^^^^^^^^^^^^^^^\n" +
 		"Method foo(Class<X<A,B>>) has the same erasure foo(Class<T>) as another method in type X<U,V>\n" +
 		"----------\n" +
-		"3. ERROR in X.java (at line 5)\n" +
+		"4. ERROR in X.java (at line 4)\n" +
+		"	void foo2(Class<X<U, V>> c) {};\n" +
+		"	     ^^^^^^^^^^^^^^^^^^^^^^\n" +
+		"Duplicate method foo2(Class<X<U,V>>) in type X<U,V>\n" +
+		"----------\n" +
+		"5. ERROR in X.java (at line 5)\n" +
 		"	<A, B> void foo2(Class<X<U, V>> c) {}\n" +
 		"	            ^^^^^^^^^^^^^^^^^^^^^^\n" +
 		"Duplicate method foo2(Class<X<U,V>>) in type X<U,V>\n" +
Index: src/org/eclipse/jdt/core/tests/compiler/regression/AmbiguousMethodTest.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AmbiguousMethodTest.java,v
retrieving revision 1.55
diff -u -r1.55 AmbiguousMethodTest.java
--- src/org/eclipse/jdt/core/tests/compiler/regression/AmbiguousMethodTest.java	17 Oct 2008 18:07:28 -0000	1.55
+++ src/org/eclipse/jdt/core/tests/compiler/regression/AmbiguousMethodTest.java	21 Oct 2008 17:48:20 -0000
@@ -391,8 +391,13 @@
 			"}"
 		},
 		"----------\n" +
-		"1. ERROR in X.java (at line 5)\r\n" +
-		"	static <L2 extends ErrorListener & Listener> Object createParser(L2 l) { return null; }\r\n" +
+		"1. ERROR in X.java (at line 4)\n" +
+		"	static <L1 extends Listener & ErrorListener> Object createParser(L1 l) { return null; }\n" +
+		"	                                                    ^^^^^^^^^^^^^^^^^^\n" +
+		"Method createParser(L1) has the same erasure createParser(X.Listener) as another method in type X\n" +
+		"----------\n" +
+		"2. ERROR in X.java (at line 5)\n" +
+		"	static <L2 extends ErrorListener & Listener> Object createParser(L2 l) { return null; }\n" +
 		"	                                                    ^^^^^^^^^^^^^^^^^^\n" +
 		"Method createParser(L2) has the same erasure createParser(X.ErrorListener) as another method in type X\n" +
 		"----------\n"
@@ -1345,7 +1350,12 @@
 			"}",
 		},
 		"----------\n" +
-		"1. ERROR in J.java (at line 3)\n" +
+		"1. ERROR in J.java (at line 2)\n" +
+		"	<T extends Number> T foo(final Number p);\n" +
+		"	                     ^^^^^^^^^^^^^^^^^^^\n" +
+		"Duplicate method foo(Number) in type J\n" +
+		"----------\n" +
+		"2. ERROR in J.java (at line 3)\n" +
 		"	Float foo(final Number p);\n" +
 		"	      ^^^^^^^^^^^^^^^^^^^\n" +
 		"Duplicate method foo(Number) in type J\n" +