Attachment #200641 for bug #317719

Lines 196-202 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier15.java (-2 / +11 lines)
196	final MethodBinding thisMethod = current[i];	196	final MethodBinding thisMethod = current[i];
197	if (thisMethod.areParameterErasuresEqual(bridge) && thisMethod.returnType.erasure() == bridge.returnType.erasure()) {	197	if (thisMethod.areParameterErasuresEqual(bridge) && thisMethod.returnType.erasure() == bridge.returnType.erasure()) {
198	// use inherited method for problem reporting.	198	// use inherited method for problem reporting.
199	problemReporter(thisMethod).methodNameClash(thisMethod, inheritedMethod.declaringClass.isRawType() ? inheritedMethod : inheritedMethod.original());	199	problemReporter(thisMethod).methodNameClash(thisMethod, inheritedMethod.declaringClass.isRawType() ? inheritedMethod : inheritedMethod.original(), ProblemSeverities.Error);
200	return;	200	return;
201	}	201	}
202	}	202	}
Lines 725-730 Link Here
725	MethodBinding original = methodToCheck.original(); // can be the same as inherited	725	MethodBinding original = methodToCheck.original(); // can be the same as inherited
726	if (!current.areParameterErasuresEqual(original))	726	if (!current.areParameterErasuresEqual(original))
727	return false;	727	return false;
		728	int severity = ProblemSeverities.Error;
		729	if (this.environment.globalOptions.complianceLevel == ClassFileConstants.JDK1_6) {
		730	// with fix for http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6182950
		731	// we now ignore return types when detecting name clashes
		732	// FYI for now we will only make this change when compliance is set to 1.7 or higher
		733	if (current.returnType.erasure() != original.returnType.erasure())
		734	severity = ProblemSeverities.Warning;
		735	}
728	if (!treatAsSynthetic) {	736	if (!treatAsSynthetic) {
729	// For a user method, see if current class overrides the inherited method. If it does,	737	// For a user method, see if current class overrides the inherited method. If it does,
730	// then any grievance we may have ought to be against the current class's method and	738	// then any grievance we may have ought to be against the current class's method and
Lines 748-754 Link Here
748	if (!current.areParameterErasuresEqual(original))	756	if (!current.areParameterErasuresEqual(original))
749	return false;	757	return false;
750	original = inherited.original(); // For error reporting use, inherited.original()	758	original = inherited.original(); // For error reporting use, inherited.original()
751	problemReporter(current).methodNameClash(current, inherited.declaringClass.isRawType() ? inherited : original);	759	problemReporter(current).methodNameClash(current, inherited.declaringClass.isRawType() ? inherited : original, severity);
		760	if (severity == ProblemSeverities.Warning) return false;
752	return true;	761	return true;
753	}	762	}
754	public boolean doesMethodOverride(MethodBinding method, MethodBinding inheritedMethod) {	763	public boolean doesMethodOverride(MethodBinding method, MethodBinding inheritedMethod) {

Lines 30-35 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java (-6 / +73 lines)
30	import org.eclipse.jdt.internal.compiler.ast.TypeReference;	30	import org.eclipse.jdt.internal.compiler.ast.TypeReference;
31	import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;	31	import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
32	import org.eclipse.jdt.internal.compiler.impl.Constant;	32	import org.eclipse.jdt.internal.compiler.impl.Constant;
		33	import org.eclipse.jdt.internal.compiler.problem.ProblemSeverities;
33	import org.eclipse.jdt.internal.compiler.util.SimpleLookupTable;	34	import org.eclipse.jdt.internal.compiler.util.SimpleLookupTable;
34	import org.eclipse.jdt.internal.compiler.util.Util;	35	import org.eclipse.jdt.internal.compiler.util.Util;
35		36
Lines 1187-1192 Link Here
1187		1188
1188	// find & report collision cases	1189	// find & report collision cases
1189	boolean complyTo15 = this.scope.compilerOptions().sourceLevel >= ClassFileConstants.JDK1_5;	1190	boolean complyTo15 = this.scope.compilerOptions().sourceLevel >= ClassFileConstants.JDK1_5;
		1191	boolean compliance16 = this.scope.compilerOptions().complianceLevel == ClassFileConstants.JDK1_6;
		1192	int severity = ProblemSeverities.Error;
1190	for (int i = 0, length = this.methods.length; i < length; i++) {	1193	for (int i = 0, length = this.methods.length; i < length; i++) {
1191	MethodBinding method = resolvedMethods[i];	1194	MethodBinding method = resolvedMethods[i];
1192	if (method == null)	1195	if (method == null)
Lines 1199-1210 Link Here
1199	continue nextSibling;	1202	continue nextSibling;
1200	if (!CharOperation.equals(selector, method2.selector))	1203	if (!CharOperation.equals(selector, method2.selector))
1201	break nextSibling; // methods with same selector are contiguous	1204	break nextSibling; // methods with same selector are contiguous
1202		1205
1203	if (complyTo15 ? !method.areParameterErasuresEqual(method2) : !method.areParametersEqual(method2))	1206	// if (compliance16 && method.returnType != null && method2.returnType != null) {
1204	continue nextSibling; // otherwise duplicates / name clash	1207	// // 8.4.2, for collision to be detected between m1 and m2:
		1208	// // signature(m1) == signature(m2) i.e. same arity, same type parameter count, can be substituted
		1209	// // signature(m1) == erasure(signature(m2)) or erasure(signature(m1)) == signature(m2)
		1210	// TypeBinding[] params1 = method.parameters;
		1211	// TypeBinding[] params2 = method2.parameters;
		1212	// int pLength = params1.length;
		1213	// if (pLength != params2.length)
		1214	// continue nextSibling;
		1215	// if (pLength > 0) {
		1216	// // check to see if the erasure of either method is equal to the other
		1217	// int index = pLength;
		1218	// for (; --index >= 0;) {
		1219	// if (params1[index] != params2[index].erasure())
		1220	// break;
		1221	// if (params1[index] == params2[index]) {
		1222	// TypeBinding type = params1[index].leafComponentType();
		1223	// if (type instanceof SourceTypeBinding && type.typeVariables() != Binding.NO_TYPE_VARIABLES) {
		1224	// index = pLength; // handle comparing identical source types like X<T>... its erasure is itself BUT we need to answer false
		1225	// break;
		1226	// }
		1227	// }
		1228	// }
		1229	// if (index >= 0 && index < pLength) {
		1230	// for (index = pLength; --index >= 0;)
		1231	// if (params1[index].erasure() != params2[index])
		1232	// break;
		1233	// }
		1234	// if (index >= 0)
		1235	// continue nextSibling;
		1236	// }
		1237	// boolean equalParams = method.areParametersEqual(method2);
		1238	// boolean equalParamsErasure = method.areParameterErasuresEqual(method2);
		1239	// if (equalParams) {
		1240	// // duplicates regardless of return types
		1241	// } else if (equalParamsErasure){
		1242	// // with fix for http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6182950
		1243	// // we now ignore return types in 1.7 when detecting duplicates, just as we did before 1.5
		1244	// // name clash for sure if not duplicates, report as duplicates
		1245	// // Only in 1.6, we have to make sure even return types are same
		1246	// if (compliance16) {
		1247	// if (method.returnType.erasure() != method2.returnType.erasure()) {
		1248	// severity = ProblemSeverities.Warning;
		1249	// }
		1250	// // else return types also equal. All conditions satisfied
		1251	// // to give error in 1.6 compliance as well.
		1252	// }
		1253	// }
		1254	// }
		1255
		1256	if (complyTo15 && method.areParameterErasuresEqual(method2)) {
		1257	// we now ignore return types in 1.7 when detecting duplicates, just as we did before 1.5
		1258	// name clash for sure if not duplicates, report as duplicates
		1259	// Only in 1.6, we have to make sure even return types are same
		1260	if (compliance16 && method.returnType != null && method2.returnType != null) {
		1261	if (!method.areParametersEqual(method2) && method.returnType.erasure() != method2.returnType.erasure()) {
		1262	severity = ProblemSeverities.Warning;
		1263	}
		1264	// else return types also equal. All conditions satisfied
		1265	// to give error in 1.6 compliance as well.
		1266	}
		1267	} else if (!method.areParametersEqual(method2)) {
		1268	// prior to 1.5, parameters identical meant a collision case
		1269	continue nextSibling;
		1270	}
		1271	// otherwise duplicates / name clash
1205	boolean isEnumSpecialMethod = isEnum() && (CharOperation.equals(selector,TypeConstants.VALUEOF) \|\| CharOperation.equals(selector,TypeConstants.VALUES));	1272	boolean isEnumSpecialMethod = isEnum() && (CharOperation.equals(selector,TypeConstants.VALUEOF) \|\| CharOperation.equals(selector,TypeConstants.VALUES));
1206	// report duplicate	1273	// report duplicate
1207	boolean removeMethod2 = true;	1274	boolean removeMethod2 = (severity == ProblemSeverities.Error) ? true : false; // do not remove if in 1.6 and just a warning given
1208	if (methodDecl == null) {	1275	if (methodDecl == null) {
1209	methodDecl = method.sourceMethod(); // cannot be retrieved after binding is lost & may still be null if method is special	1276	methodDecl = method.sourceMethod(); // cannot be retrieved after binding is lost & may still be null if method is special
1210	if (methodDecl != null && methodDecl.binding != null) { // ensure its a valid user defined method	1277	if (methodDecl != null && methodDecl.binding != null) { // ensure its a valid user defined method
Lines 1214-1220 Link Here
1214	// remove user defined methods & keep the synthetic	1281	// remove user defined methods & keep the synthetic
1215	removeMethod = true;	1282	removeMethod = true;
1216	} else {	1283	} else {
1217	this.scope.problemReporter().duplicateMethodInType(this, methodDecl, method.areParametersEqual(method2));	1284	this.scope.problemReporter().duplicateMethodInType(this, methodDecl, method.areParametersEqual(method2), severity);
1218	}	1285	}
1219	if (removeMethod) {	1286	if (removeMethod) {
1220	removeMethod2 = false;	1287	removeMethod2 = false;
Lines 1233-1239 Link Here
1233	this.scope.problemReporter().duplicateEnumSpecialMethod(this, method2Decl);	1300	this.scope.problemReporter().duplicateEnumSpecialMethod(this, method2Decl);
1234	removeMethod2 = true;	1301	removeMethod2 = true;
1235	} else {	1302	} else {
1236	this.scope.problemReporter().duplicateMethodInType(this, method2Decl, method.areParametersEqual(method2));	1303	this.scope.problemReporter().duplicateMethodInType(this, method2Decl, method.areParametersEqual(method2), severity);
1237	}	1304	}
1238	if (removeMethod2) {	1305	if (removeMethod2) {
1239	method2Decl.binding = null;	1306	method2Decl.binding = null;




		nodeSourceStart(local, location),
		nodeSourceEnd(local, location));
}
public void duplicateMethodInType(SourceTypeBinding type, AbstractMethodDeclaration methodDecl, boolean equalParameters, int severity) {
    MethodBinding method = methodDecl.binding;
    if (equalParameters) {
		this.handle(

				new String(methodDecl.selector),
				new String(method.declaringClass.shortReadableName()),
				typesAsString(method, true)},
			severity,
			methodDecl.sourceStart,
			methodDecl.sourceEnd);
    } else {

				new String(method.declaringClass.shortReadableName()),
				typesAsString(method, true),
				typesAsString(method, erasures, true) },
			severity,
			methodDecl.sourceStart,
			methodDecl.sourceEnd);
    }

		method.sourceEnd);
}

public void methodNameClash(MethodBinding currentMethod, MethodBinding inheritedMethod, int severity) {
	this.handle(
		IProblem.MethodNameClash,
		new String[] {

			typesAsString(inheritedMethod, true),
			new String(inheritedMethod.declaringClass.shortReadableName()),
		 },
		severity,
		currentMethod.sourceStart(),
		currentMethod.sourceEnd());
}





public class NegativeTest extends AbstractRegressionTest {
static {
	TESTS_NUMBERS = new int[] { 92 };
}
public NegativeTest(String name) {
	super(name);

			"  }\n" +
			"}",
		},
		"----------\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 15)\n" + 
		"	return new Package2.Sub();\n" + 
		"	       ^^^^^^^^^^^^^^^^^^\n" + 
		"No enclosing instance of type Package2 is accessible. Must qualify the allocation with an enclosing instance of type Package2 (e.g. x.new A() where x is an instance of Package2).\n" + 
		"----------\n" + 
		"3. ERROR in p\\Toplevel12.java (at line 17)\n" + 
		"	void local(){\n" + 
		"	     ^^^^^^^\n" + 
		"Duplicate method local() in type Toplevel12\n" + 
		"----------\n"
	);
}





import java.util.Map;

import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;

import junit.framework.*;

public class AmbiguousMethodTest extends AbstractComparableTest {

	static {
//		TESTS_NAMES = new String [] { "test010a" };
	}
	public AmbiguousMethodTest(String name) {
		super(name);

	}
	public void test006() {
		// http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6182950
		String expectedCompilerLog = (this.complianceLevel == ClassFileConstants.JDK1_6)?
		"----------\n" + 
		"1. ERROR in X.java (at line 3)\n" + 
		"	new Y<Object>().foo(\"X\");\n" + 
		"	                ^^^\n" + 
		"The method foo(Object) is ambiguous for the type Y<Object>\n" + 
		"----------\n" + 
		"2. ERROR in X.java (at line 4)\n" + 
		"	new Y<Object>().foo2(\"X\");\n" + 
		"	                ^^^^\n" + 
		"The method foo2(Object) is ambiguous for the type Y<Object>\n" + 
		"----------\n" + 
		"3. WARNING in X.java (at line 10)\n" + 
		"	void foo(T2 t) {}\n" + 
		"	     ^^^^^^^^^\n" + 
		"Name clash: The method foo(T2) of type Y<T2> has the same erasure as foo(U1) of type X<T> but does not override it\n" + 
		"----------\n" + 
		"4. WARNING in X.java (at line 11)\n" + 
		"	<U3> void foo2(T2 t) {}\n" + 
		"	          ^^^^^^^^^^\n" + 
		"Name clash: The method foo2(T2) of type Y<T2> has the same erasure as foo2(U2) of type X<T> but does not override it\n" + 
		"----------\n":
			"----------\n" + 
			"1. ERROR in X.java (at line 3)\n" + 
			"	new Y<Object>().foo(\"X\");\n" + 
			"	                ^^^\n" + 

			"	<U3> void foo2(T2 t) {}\n" + 
			"	          ^^^^^^^^^^\n" + 
			"Name clash: The method foo2(T2) of type Y<T2> has the same erasure as foo2(U2) of type X<T> but does not override it\n" + 
			"----------\n";
		this.runNegativeTest(
			new String[] {
				"X.java",
				"public class X<T> {\n" +
				"   void test() {\n" +
				"   	new Y<Object>().foo(\"X\");\n" +
				"   	new Y<Object>().foo2(\"X\");\n" +
				"   }\n" +
				"	<U1> U1 foo(U1 t) {return null;}\n" +
				"	<U2> U2 foo2(U2 t) {return null;}\n" +
				"}\n" +
				"class Y<T2> extends X<T2> {\n" +
				"	void foo(T2 t) {}\n" +
				"	<U3> void foo2(T2 t) {}\n" +
				"}\n"
			},
			expectedCompilerLog
		);
/* javac 7
X.java:3: reference to foo is ambiguous, both method <U1>foo(U1) in X and method

	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=106090
	public void test011a() {
		// http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6182950
		String expectedCompilerLog = (this.complianceLevel == ClassFileConstants.JDK1_6)?
		"----------\n" + 
		"1. WARNING in Combined.java (at line 2)\n" + 
		"	<T extends Comparable<T>> void pickOne(T value) throws ExOne {}\n" + 
		"	                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
		"Method pickOne(T) has the same erasure pickOne(Comparable<T>) as another method in type Combined<A,B>\n" + 
		"----------\n" + 
		"2. WARNING in Combined.java (at line 3)\n" + 
		"	<T> T pickOne(Comparable<T> value) throws ExTwo { return null;}\n" + 
		"	      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
		"Method pickOne(Comparable<T>) has the same erasure pickOne(Comparable<T>) as another method in type Combined<A,B>\n" + 
		"----------\n":
			"----------\n" + 
			"1. ERROR in Combined.java (at line 2)\n" + 
			"	<T extends Comparable<T>> void pickOne(T value) throws ExOne {}\n" + 
			"	                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
			"Method pickOne(T) has the same erasure pickOne(Comparable<T>) as another method in type Combined<A,B>\n" + 
			"----------\n" + 
			"2. ERROR in Combined.java (at line 3)\n" + 
			"	<T> T pickOne(Comparable<T> value) throws ExTwo { return null;}\n" + 
			"	      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
			"Method pickOne(Comparable<T>) has the same erasure pickOne(Comparable<T>) as another method in type Combined<A,B>\n" + 
			"----------\n";
		this.runNegativeTest(
			new String[] {
				"Combined.java",

				"class ExOne extends Exception {static final long serialVersionUID = 1;}\n" +
				"class ExTwo extends Exception {static final long serialVersionUID = 2;}"
			},
			expectedCompilerLog
			"1. ERROR in Combined.java (at line 2)\n" + 
			"	<T extends Comparable<T>> void pickOne(T value) throws ExOne {}\n" + 
			"	                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
			"Method pickOne(T) has the same erasure pickOne(Comparable<T>) as another method in type Combined<A,B>\n" + 
			"----------\n" + 
			"2. ERROR in Combined.java (at line 3)\n" + 
			"	<T> T pickOne(Comparable<T> value) throws ExTwo { return null;}\n" + 
			"	      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
			"Method pickOne(Comparable<T>) has the same erasure pickOne(Comparable<T>) as another method in type Combined<A,B>\n" + 
			"----------\n"
		);
/* javac 7
X.java:3: name clash: <T#1>pickOne(Comparable<T#1>) and <T#2>pickOne(T#2) have the same erasure

	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=106090
	public void test011b() {
		// http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6182950
		String expectedCompilerLog = (this.complianceLevel == ClassFileConstants.JDK1_6)?
		"----------\n" + 
		"1. WARNING in Test1.java (at line 2)\n" + 
		"	<T extends Comparable<T>> void pickOne(T value) throws ExOne {}\n" + 
		"	                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
		"Method pickOne(T) has the same erasure pickOne(Comparable<T>) as another method in type Test1<AA,BB>\n" + 
		"----------\n" + 
		"2. WARNING in Test1.java (at line 3)\n" + 
		"	<T> T pickOne(Comparable<T> value) throws ExTwo { return null;}\n" + 
		"	      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
		"Method pickOne(Comparable<T>) has the same erasure pickOne(Comparable<T>) as another method in type Test1<AA,BB>\n" + 
		"----------\n" + 
		"3. WARNING in Test1.java (at line 4)\n" + 
		"	void pickOne2(Test1<Integer,Integer> c) throws ExOne { c.pickOne((Comparable) \"test\"); }\n" + 
		"	                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
		"Type safety: Unchecked invocation pickOne(Comparable) of the generic method pickOne(T) of type Test1<Integer,Integer>\n" + 
		"----------\n" + 
		"4. WARNING in Test1.java (at line 4)\n" + 
		"	void pickOne2(Test1<Integer,Integer> c) throws ExOne { c.pickOne((Comparable) \"test\"); }\n" + 
		"	                                                                  ^^^^^^^^^^\n" + 
		"Comparable is a raw type. References to generic type Comparable<T> should be parameterized\n" + 
		"----------\n":
			"----------\n" + 
			"1. ERROR in Test1.java (at line 2)\n" + 
			"	<T extends Comparable<T>> void pickOne(T value) throws ExOne {}\n" + 

			"	void pickOne2(Test1<Integer,Integer> c) throws ExOne { c.pickOne((Comparable) \"test\"); }\n" + 
			"	                                                                  ^^^^^^^^^^\n" + 
			"Comparable is a raw type. References to generic type Comparable<T> should be parameterized\n" + 
			"----------\n";
		this.runNegativeTest(
			new String[] {
				"Test1.java",
				"public class Test1<AA, BB> {\n" +
				"	<T extends Comparable<T>> void pickOne(T value) throws ExOne {}\n" +
				"	<T> T pickOne(Comparable<T> value) throws ExTwo { return null;}\n" +
				"	void pickOne2(Test1<Integer,Integer> c) throws ExOne { c.pickOne((Comparable) \"test\"); }\n" +
				"}\n" +
				"class ExOne extends Exception {static final long serialVersionUID = 1;}\n" +
				"class ExTwo extends Exception {static final long serialVersionUID = 2;}"
			},
			expectedCompilerLog
		);
/* javac 7
X.java:3: name clash: <T#1>pickOne(Comparable<T#1>) and <T#2>pickOne(T#2) have the same erasure

	// variant: having both methods in the same class should not change anything
	public void test021() {
		// http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6182950
		String expectedCompilerLog = (this.complianceLevel == ClassFileConstants.JDK1_6)?
		"----------\n" + 
		"1. WARNING in Y.java (at line 3)\n" + 
		"	public class Y<V extends String> extends X<V> {\n" + 
		"	                         ^^^^^^\n" + 
		"The type parameter V should not be bounded by the final type String. Final types cannot be further extended\n" + 
		"----------\n" + 
		"2. WARNING in Y.java (at line 4)\n" + 
		"	public static <W extends String> Y<W> make(Class<W> clazz) {\n" + 
		"	                         ^^^^^^\n" + 
		"The type parameter W should not be bounded by the final type String. Final types cannot be further extended\n" + 
		"----------\n" + 
		"3. WARNING in Y.java (at line 4)\n" + 
		"	public static <W extends String> Y<W> make(Class<W> clazz) {\n" + 
		"	                                      ^^^^^^^^^^^^^^^^^^^^\n" + 
		"Method make(Class<W>) has the same erasure make(Class<T>) as another method in type Y<V>\n" + 
		"----------\n" + 
		"4. WARNING in Y.java (at line 8)\n" + 
		"	public static <U extends Object> X<U> make(Class<U> clazz) {\n" + 
		"	                                      ^^^^^^^^^^^^^^^^^^^^\n" + 
		"Method make(Class<U>) has the same erasure make(Class<T>) as another method in type Y<V>\n" + 
		"----------\n" + 
		"5. WARNING in Y.java (at line 13)\n" + 
		"	Y.make(getClazz());\n" + 
		"	^^^^^^^^^^^^^^^^^^\n" + 
		"Type safety: Unchecked invocation make(Class) of the generic method make(Class<W>) of type Y\n" + 
		"----------\n" + 
		"6. WARNING in Y.java (at line 13)\n" + 
		"	Y.make(getClazz());\n" + 
		"	       ^^^^^^^^^^\n" + 
		"Type safety: The expression of type Class needs unchecked conversion to conform to Class<String>\n" + 
		"----------\n" + 
		"7. WARNING in Y.java (at line 15)\n" + 
		"	public static Class getClazz() {\n" + 
		"	              ^^^^^\n" + 
		"Class is a raw type. References to generic type Class<T> should be parameterized\n" + 
		"----------\n":
			"----------\n" + 
			"1. WARNING in Y.java (at line 3)\n" + 
			"	public class Y<V extends String> extends X<V> {\n" + 

			"	public static Class getClazz() {\n" + 
			"	              ^^^^^\n" + 
			"Class is a raw type. References to generic type Class<T> should be parameterized\n" + 
			"----------\n";
		this.runNegativeTest(
			new String[] {
				"Y.java",
				"class X<T extends Object> {\n" +
				"}\n" +
				"public class Y<V extends String> extends X<V> {\n" +
				"  public static <W extends String> Y<W> make(Class<W> clazz) {\n" +
				"    System.out.print(true);\n" +
				"    return new Y<W>();\n" +
				"  }\n" +
				"  public static <U extends Object> X<U> make(Class<U> clazz) {\n" +
				"    System.out.print(false);\n" +
				"    return new X<U>();\n" +
				"  }\n" +
				"  public static void main(String[] args) throws Exception {\n" +
				"    Y.make(getClazz());\n" +
				"  }\n" +
				"  public static Class getClazz() {\n" +
				"    return String.class;\n" +
				"  }\n" +
				"}"
			},
			expectedCompilerLog
		);
/* javac 7
X.java:8: name clash: <U>make(Class<U>) and <W>make(Class<W>) have the same erasure

	// variant: using instances triggers raw methods, which are ambiguous
	public void test022() {
		// http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6182950
		String expectedCompilerLog = (this.complianceLevel == ClassFileConstants.JDK1_6)?
		"----------\n" + 
		"1. WARNING in X.java (at line 3)\n" + 
		"	class Y<V extends String> extends X<V> {\n" + 
		"	                  ^^^^^^\n" + 
		"The type parameter V should not be bounded by the final type String. Final types cannot be further extended\n" + 
		"----------\n" + 
		"2. WARNING in X.java (at line 4)\n" + 
		"	public <W extends String> Y<W> make(Class<W> clazz) {\n" + 
		"	                  ^^^^^^\n" + 
		"The type parameter W should not be bounded by the final type String. Final types cannot be further extended\n" + 
		"----------\n" + 
		"3. WARNING in X.java (at line 4)\n" + 
		"	public <W extends String> Y<W> make(Class<W> clazz) {\n" + 
		"	                               ^^^^^^^^^^^^^^^^^^^^\n" + 
		"Method make(Class<W>) has the same erasure make(Class<T>) as another method in type Y<V>\n" + 
		"----------\n" + 
		"4. WARNING in X.java (at line 7)\n" + 
		"	public <U extends Object> X<U> make(Class<U> clazz) {\n" + 
		"	                               ^^^^^^^^^^^^^^^^^^^^\n" + 
		"Method make(Class<U>) has the same erasure make(Class<T>) as another method in type Y<V>\n" + 
		"----------\n" + 
		"5. WARNING in X.java (at line 11)\n" + 
		"	Y y = new Y();\n" + 
		"	^\n" + 
		"Y is a raw type. References to generic type Y<V> should be parameterized\n" + 
		"----------\n" + 
		"6. WARNING in X.java (at line 11)\n" + 
		"	Y y = new Y();\n" + 
		"	          ^\n" + 
		"Y is a raw type. References to generic type Y<V> should be parameterized\n" + 
		"----------\n" + 
		"7. ERROR in X.java (at line 12)\n" + 
		"	y.make(String.class);\n" + 
		"	  ^^^^\n" + 
		"The method make(Class) is ambiguous for the type Y\n" + 
		"----------\n" + 
		"8. ERROR in X.java (at line 13)\n" + 
		"	y.make(getClazz());\n" + 
		"	  ^^^^\n" + 
		"The method make(Class) is ambiguous for the type Y\n" + 
		"----------\n" + 
		"9. ERROR in X.java (at line 14)\n" + 
		"	y.make(getClazz().newInstance().getClass());\n" + 
		"	  ^^^^\n" + 
		"The method make(Class) is ambiguous for the type Y\n" + 
		"----------\n" + 
		"10. WARNING in X.java (at line 16)\n" + 
		"	public static Class getClazz() {\n" + 
		"	              ^^^^^\n" + 
		"Class is a raw type. References to generic type Class<T> should be parameterized\n" + 
		"----------\n":
			"----------\n" + 
			"1. WARNING in X.java (at line 3)\n" + 
			"	class Y<V extends String> extends X<V> {\n" + 

			"	public static Class getClazz() {\n" + 
			"	              ^^^^^\n" + 
			"Class is a raw type. References to generic type Class<T> should be parameterized\n" + 
			"----------\n";
		this.runNegativeTest(
			new String[] {
				"X.java",
				"public class X<T extends Object> {\n" +
				"}\n" +
				"class Y<V extends String> extends X<V> {\n" +
				"  public <W extends String> Y<W> make(Class<W> clazz) {\n" +
				"    return new Y<W>();\n" +
				"  }\n" +
				"  public <U extends Object> X<U> make(Class<U> clazz) {\n" +
				"    return new X<U>();\n" +
				"  }\n" +
				"  public static void main(String[] args) throws Exception {\n" +
				"    Y y = new Y();\n" +
				"    y.make(String.class);\n" +
				"    y.make(getClazz());\n" +
				"    y.make(getClazz().newInstance().getClass());\n" +
				"  }\n" +
				"  public static Class getClazz() {\n" +
				"    return String.class;\n" +
				"  }\n" +
				"}"
			},
			expectedCompilerLog
		);
/* javac 7
X.java:7: name clash: <U>make(Class<U>) and <W>make(Class<W>) have the same erasure

//https://bugs.eclipse.org/bugs/show_bug.cgi?id=268837
// See that this test case exhibits the bug 345947
public void test076() {
	String output = (this.complianceLevel == ClassFileConstants.JDK1_6)?
			"----------\n" + 
			"1. WARNING in X.java (at line 8)\n" + 
			"	<U> J<String> b();\n" + 
			"	              ^^^\n" + 
			"Name clash: The method b() of type J<E> has the same erasure as b() of type I<E> but does not override it\n" + 
			"----------\n" + 
			"2. ERROR in X.java (at line 15)\n" + 
			"	J<Integer> b = ints.a();\n" + 
			"	               ^^^^^^^^\n" + 
			"Type mismatch: cannot convert from J<String> to J<Integer>\n" + 
			"----------\n" + 
			"3. ERROR in X.java (at line 16)\n" + 
			"	J<Object> c = ints.a();\n" + 
			"	              ^^^^^^^^\n" + 
			"Type mismatch: cannot convert from J<String> to J<Object>\n" + 
			"----------\n" + 
			"4. WARNING in X.java (at line 17)\n" + 
			"	J d = ints.a();\n" + 
			"	^\n" + 
			"J is a raw type. References to generic type J<E> should be parameterized\n" + 
			"----------\n" + 
			"5. ERROR in X.java (at line 19)\n" + 
			"	I<Integer> f = ints.a();\n" + 
			"	               ^^^^^^^^\n" + 
			"Type mismatch: cannot convert from J<String> to I<Integer>\n" + 
			"----------\n" + 
			"6. ERROR in X.java (at line 20)\n" + 
			"	I<Object> g = ints.a();\n" + 
			"	              ^^^^^^^^\n" + 
			"Type mismatch: cannot convert from J<String> to I<Object>\n" + 
			"----------\n" + 
			"7. WARNING in X.java (at line 21)\n" + 
			"	I h = ints.a();\n" + 
			"	^\n" + 
			"I is a raw type. References to generic type I<E> should be parameterized\n" + 
			"----------\n" + 
			"8. ERROR in X.java (at line 24)\n" + 
			"	ints.b();\n" + 
			"	     ^\n" + 
			"The method b() is ambiguous for the type J<Integer>\n" + 
			"----------\n" + 
			"9. ERROR in X.java (at line 25)\n" + 
			"	J<String> a = ints.b();\n" + 
			"	                   ^\n" + 
			"The method b() is ambiguous for the type J<Integer>\n" + 
			"----------\n" + 
			"10. ERROR in X.java (at line 26)\n" + 
			"	J<Integer> b = ints.b();\n" + 
			"	                    ^\n" + 
			"The method b() is ambiguous for the type J<Integer>\n" + 
			"----------\n" + 
			"11. ERROR in X.java (at line 27)\n" + 
			"	J<Object> c = ints.b();\n" + 
			"	                   ^\n" + 
			"The method b() is ambiguous for the type J<Integer>\n" + 
			"----------\n" + 
			"12. WARNING in X.java (at line 28)\n" + 
			"	J d = ints.b();\n" + 
			"	^\n" + 
			"J is a raw type. References to generic type J<E> should be parameterized\n" + 
			"----------\n" + 
			"13. ERROR in X.java (at line 28)\n" + 
			"	J d = ints.b();\n" + 
			"	           ^\n" + 
			"The method b() is ambiguous for the type J<Integer>\n" + 
			"----------\n" + 
			"14. ERROR in X.java (at line 29)\n" + 
			"	I<String> e = ints.b();\n" + 
			"	                   ^\n" + 
			"The method b() is ambiguous for the type J<Integer>\n" + 
			"----------\n" + 
			"15. ERROR in X.java (at line 30)\n" + 
			"	I<Integer> f = ints.b();\n" + 
			"	                    ^\n" + 
			"The method b() is ambiguous for the type J<Integer>\n" + 
			"----------\n" + 
			"16. ERROR in X.java (at line 31)\n" + 
			"	I<Object> g = ints.b();\n" + 
			"	                   ^\n" + 
			"The method b() is ambiguous for the type J<Integer>\n" + 
			"----------\n" + 
			"17. WARNING in X.java (at line 32)\n" + 
			"	I h = ints.b();\n" + 
			"	^\n" + 
			"I is a raw type. References to generic type I<E> should be parameterized\n" + 
			"----------\n" + 
			"18. ERROR in X.java (at line 32)\n" + 
			"	I h = ints.b();\n" + 
			"	           ^\n" + 
			"The method b() is ambiguous for the type J<Integer>\n" + 
			"----------\n" + 
			"19. WARNING in X.java (at line 39)\n" + 
			"	J d = ints.c();\n" + 
			"	^\n" + 
			"J is a raw type. References to generic type J<E> should be parameterized\n" + 
			"----------\n" + 
			"20. WARNING in X.java (at line 43)\n" + 
			"	I h = ints.c();\n" + 
			"	^\n" + 
			"I is a raw type. References to generic type I<E> should be parameterized\n" + 
			"----------\n":
				"----------\n" + 
				"1. ERROR in X.java (at line 8)\n" + 
				"	<U> J<String> b();\n" + 
				"	              ^^^\n" + 
				"Name clash: The method b() of type J<E> has the same erasure as b() of type I<E> but does not override it\n" + 
				"----------\n" + 
				"2. ERROR in X.java (at line 15)\n" + 
				"	J<Integer> b = ints.a();\n" + 
				"	               ^^^^^^^^\n" + 
				"Type mismatch: cannot convert from J<String> to J<Integer>\n" + 
				"----------\n" + 
				"3. ERROR in X.java (at line 16)\n" + 
				"	J<Object> c = ints.a();\n" + 
				"	              ^^^^^^^^\n" + 
				"Type mismatch: cannot convert from J<String> to J<Object>\n" + 
				"----------\n" + 
				"4. WARNING in X.java (at line 17)\n" + 
				"	J d = ints.a();\n" + 
				"	^\n" + 
				"J is a raw type. References to generic type J<E> should be parameterized\n" + 
				"----------\n" + 
				"5. ERROR in X.java (at line 19)\n" + 
				"	I<Integer> f = ints.a();\n" + 
				"	               ^^^^^^^^\n" + 
				"Type mismatch: cannot convert from J<String> to I<Integer>\n" + 
				"----------\n" + 
				"6. ERROR in X.java (at line 20)\n" + 
				"	I<Object> g = ints.a();\n" + 
				"	              ^^^^^^^^\n" + 
				"Type mismatch: cannot convert from J<String> to I<Object>\n" + 
				"----------\n" + 
				"7. WARNING in X.java (at line 21)\n" + 
				"	I h = ints.a();\n" + 
				"	^\n" + 
				"I is a raw type. References to generic type I<E> should be parameterized\n" + 
				"----------\n" + 
				"8. ERROR in X.java (at line 24)\n" + 
				"	ints.b();\n" + 
				"	     ^\n" + 
				"The method b() is ambiguous for the type J<Integer>\n" + 
				"----------\n" + 
				"9. ERROR in X.java (at line 25)\n" + 
				"	J<String> a = ints.b();\n" + 
				"	                   ^\n" + 
				"The method b() is ambiguous for the type J<Integer>\n" + 
				"----------\n" + 
				"10. ERROR in X.java (at line 26)\n" + 
				"	J<Integer> b = ints.b();\n" + 
				"	                    ^\n" + 
				"The method b() is ambiguous for the type J<Integer>\n" + 
				"----------\n" + 
				"11. ERROR in X.java (at line 27)\n" + 
				"	J<Object> c = ints.b();\n" + 
				"	                   ^\n" + 
				"The method b() is ambiguous for the type J<Integer>\n" + 
				"----------\n" + 
				"12. WARNING in X.java (at line 28)\n" + 
				"	J d = ints.b();\n" + 
				"	^\n" + 
				"J is a raw type. References to generic type J<E> should be parameterized\n" + 
				"----------\n" + 
				"13. ERROR in X.java (at line 28)\n" + 
				"	J d = ints.b();\n" + 
				"	           ^\n" + 
				"The method b() is ambiguous for the type J<Integer>\n" + 
				"----------\n" + 
				"14. ERROR in X.java (at line 29)\n" + 
				"	I<String> e = ints.b();\n" + 
				"	                   ^\n" + 
				"The method b() is ambiguous for the type J<Integer>\n" + 
				"----------\n" + 
				"15. ERROR in X.java (at line 30)\n" + 
				"	I<Integer> f = ints.b();\n" + 
				"	                    ^\n" + 
				"The method b() is ambiguous for the type J<Integer>\n" + 
				"----------\n" + 
				"16. ERROR in X.java (at line 31)\n" + 
				"	I<Object> g = ints.b();\n" + 
				"	                   ^\n" + 
				"The method b() is ambiguous for the type J<Integer>\n" + 
				"----------\n" + 
				"17. WARNING in X.java (at line 32)\n" + 
				"	I h = ints.b();\n" + 
				"	^\n" + 
				"I is a raw type. References to generic type I<E> should be parameterized\n" + 
				"----------\n" + 
				"18. ERROR in X.java (at line 32)\n" + 
				"	I h = ints.b();\n" + 
				"	           ^\n" + 
				"The method b() is ambiguous for the type J<Integer>\n" + 
				"----------\n" + 
				"19. WARNING in X.java (at line 39)\n" + 
				"	J d = ints.c();\n" + 
				"	^\n" + 
				"J is a raw type. References to generic type J<E> should be parameterized\n" + 
				"----------\n" + 
				"20. WARNING in X.java (at line 43)\n" + 
				"	I h = ints.c();\n" + 
				"	^\n" + 
				"I is a raw type. References to generic type I<E> should be parameterized\n" + 
				"----------\n";
	this.runNegativeTest(
		new String[] {
			"X.java",

			"	}\n" +
			"}"
		},
		output
		"1. ERROR in X.java (at line 8)\n" + 
		"	<U> J<String> b();\n" + 
		"	              ^^^\n" + 
		"Name clash: The method b() of type J<E> has the same erasure as b() of type I<E> but does not override it\n" + 
		"----------\n" + 
		"2. ERROR in X.java (at line 15)\n" + 
		"	J<Integer> b = ints.a();\n" + 
		"	               ^^^^^^^^\n" + 
		"Type mismatch: cannot convert from J<String> to J<Integer>\n" + 
		"----------\n" + 
		"3. ERROR in X.java (at line 16)\n" + 
		"	J<Object> c = ints.a();\n" + 
		"	              ^^^^^^^^\n" + 
		"Type mismatch: cannot convert from J<String> to J<Object>\n" + 
		"----------\n" + 
		"4. WARNING in X.java (at line 17)\n" + 
		"	J d = ints.a();\n" + 
		"	^\n" + 
		"J is a raw type. References to generic type J<E> should be parameterized\n" + 
		"----------\n" + 
		"5. ERROR in X.java (at line 19)\n" + 
		"	I<Integer> f = ints.a();\n" + 
		"	               ^^^^^^^^\n" + 
		"Type mismatch: cannot convert from J<String> to I<Integer>\n" + 
		"----------\n" + 
		"6. ERROR in X.java (at line 20)\n" + 
		"	I<Object> g = ints.a();\n" + 
		"	              ^^^^^^^^\n" + 
		"Type mismatch: cannot convert from J<String> to I<Object>\n" + 
		"----------\n" + 
		"7. WARNING in X.java (at line 21)\n" + 
		"	I h = ints.a();\n" + 
		"	^\n" + 
		"I is a raw type. References to generic type I<E> should be parameterized\n" + 
		"----------\n" + 
		"8. ERROR in X.java (at line 24)\n" + 
		"	ints.b();\n" + 
		"	     ^\n" + 
		"The method b() is ambiguous for the type J<Integer>\n" + 
		"----------\n" + 
		"9. ERROR in X.java (at line 25)\n" + 
		"	J<String> a = ints.b();\n" + 
		"	                   ^\n" + 
		"The method b() is ambiguous for the type J<Integer>\n" + 
		"----------\n" + 
		"10. ERROR in X.java (at line 26)\n" + 
		"	J<Integer> b = ints.b();\n" + 
		"	                    ^\n" + 
		"The method b() is ambiguous for the type J<Integer>\n" + 
		"----------\n" + 
		"11. ERROR in X.java (at line 27)\n" + 
		"	J<Object> c = ints.b();\n" + 
		"	                   ^\n" + 
		"The method b() is ambiguous for the type J<Integer>\n" + 
		"----------\n" + 
		"12. WARNING in X.java (at line 28)\n" + 
		"	J d = ints.b();\n" + 
		"	^\n" + 
		"J is a raw type. References to generic type J<E> should be parameterized\n" + 
		"----------\n" + 
		"13. ERROR in X.java (at line 28)\n" + 
		"	J d = ints.b();\n" + 
		"	           ^\n" + 
		"The method b() is ambiguous for the type J<Integer>\n" + 
		"----------\n" + 
		"14. ERROR in X.java (at line 29)\n" + 
		"	I<String> e = ints.b();\n" + 
		"	                   ^\n" + 
		"The method b() is ambiguous for the type J<Integer>\n" + 
		"----------\n" + 
		"15. ERROR in X.java (at line 30)\n" + 
		"	I<Integer> f = ints.b();\n" + 
		"	                    ^\n" + 
		"The method b() is ambiguous for the type J<Integer>\n" + 
		"----------\n" + 
		"16. ERROR in X.java (at line 31)\n" + 
		"	I<Object> g = ints.b();\n" + 
		"	                   ^\n" + 
		"The method b() is ambiguous for the type J<Integer>\n" + 
		"----------\n" + 
		"17. WARNING in X.java (at line 32)\n" + 
		"	I h = ints.b();\n" + 
		"	^\n" + 
		"I is a raw type. References to generic type I<E> should be parameterized\n" + 
		"----------\n" + 
		"18. ERROR in X.java (at line 32)\n" + 
		"	I h = ints.b();\n" + 
		"	           ^\n" + 
		"The method b() is ambiguous for the type J<Integer>\n" + 
		"----------\n" + 
		"19. WARNING in X.java (at line 39)\n" + 
		"	J d = ints.c();\n" + 
		"	^\n" + 
		"J is a raw type. References to generic type J<E> should be parameterized\n" + 
		"----------\n" + 
		"20. WARNING in X.java (at line 43)\n" + 
		"	I h = ints.c();\n" + 
		"	^\n" + 
		"I is a raw type. References to generic type I<E> should be parameterized\n" + 
		"----------\n"
	);
}






public class MethodVerifyTest extends AbstractComparableTest {
	static {
//		TESTS_NAMES = new String[] { "test050l" };
//		TESTS_NUMBERS = new int[] { 213 };
//		TESTS_RANGE = new int[] { 190, -1};
	}


	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=85900
	public void test048() {
		String expectedCompilerLog = (this.complianceLevel == ClassFileConstants.JDK1_6)?
				"----------\n" + 
				"1. WARNING in X1.java (at line 2)\n" + 
				"	public class X1 extends LinkedHashMap<String, String> {\n" + 
				"	             ^^\n" + 
				"The serializable class X1 does not declare a static final serialVersionUID field of type long\n" + 
				"----------\n" + 
				"2. WARNING in X1.java (at line 3)\n" + 
				"	public Object putAll(Map<String,String> a) { return null; }\n" + 
				"	              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Name clash: The method putAll(Map<String,String>) of type X1 has the same erasure as putAll(Map<? extends K,? extends V>) of type HashMap<K,V> but does not override it\n" + 
				"----------\n":
					"----------\n" + 
					"1. WARNING in X1.java (at line 2)\n" + 
					"	public class X1 extends LinkedHashMap<String, String> {\n" + 
					"	             ^^\n" + 
					"The serializable class X1 does not declare a static final serialVersionUID field of type long\n" + 
					"----------\n" + 
					"2. ERROR in X1.java (at line 3)\n" + 
					"	public Object putAll(Map<String,String> a) { return null; }\n" + 
					"	              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
					"Name clash: The method putAll(Map<String,String>) of type X1 has the same erasure as putAll(Map<? extends K,? extends V>) of type HashMap<K,V> but does not override it\n" + 
					"----------\n";
		this.runNegativeTest(
			new String[] {
				"X1.java",

				"    public Object putAll(Map<String,String> a) { return null; }\n" +
				"}\n"
			},
			expectedCompilerLog
			"1. WARNING in X1.java (at line 2)\n" + 
			"	public class X1 extends LinkedHashMap<String, String> {\n" + 
			"	             ^^\n" + 
			"The serializable class X1 does not declare a static final serialVersionUID field of type long\n" + 
			"----------\n" + 
			"2. ERROR in X1.java (at line 3)\n" + 
			"	public Object putAll(Map<String,String> a) { return null; }\n" + 
			"	              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
			"Name clash: The method putAll(Map<String,String>) of type X1 has the same erasure as putAll(Map<? extends K,? extends V>) of type HashMap<K,V> but does not override it\n" + 
			"----------\n"
		);
/* javac 7
X.java:4: name clash: putAll(Map<String,String>) in X1 and putAll(Map<? extends K,? extends V>) in HashMap have the same erasure, yet neither overrides the other

	}
	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=85900
	public void test048a() {
		String expectedCompilerLog = (this.complianceLevel == ClassFileConstants.JDK1_6)?
				"----------\n" + 
				"1. WARNING in X2.java (at line 2)\n" + 
				"	public Object foo(I<String> z) { return null; }\n" + 
				"	              ^^^^^^^^^^^^^^^^\n" + 
				"Name clash: The method foo(I<String>) of type X2 has the same erasure as foo(I<? extends T>) of type Y<T> but does not override it\n" + 
				"----------\n":		
					"----------\n" + 
					"1. ERROR in X2.java (at line 2)\n" + 
					"	public Object foo(I<String> z) { return null; }\n" + 
					"	              ^^^^^^^^^^^^^^^^\n" + 
					"Name clash: The method foo(I<String>) of type X2 has the same erasure as foo(I<? extends T>) of type Y<T> but does not override it\n" + 
					"----------\n";
		this.runNegativeTest(
			new String[] {
				"X2.java",

				"    public void foo(I<? extends T> a);\n" +
				"}\n"
			},
			expectedCompilerLog
			"1. ERROR in X2.java (at line 2)\n" + 
			"	public Object foo(I<String> z) { return null; }\n" + 
			"	              ^^^^^^^^^^^^^^^^\n" + 
			"Name clash: The method foo(I<String>) of type X2 has the same erasure as foo(I<? extends T>) of type Y<T> but does not override it\n" + 
			"----------\n"
		);
/* javac 7
X.java:2: name clash: foo(I<String>) in X2 and foo(I<? extends T>) in Y have the same erasure, yet neither overrides the other

	}
	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=85900
	public void test048c() {
		String expectedCompilerLog = (this.complianceLevel == ClassFileConstants.JDK1_6)?
				"----------\n" + 
				"1. WARNING in X4.java (at line 2)\n" + 
				"	public String foo(I<String> z) { return null; }\n" + 
				"	              ^^^^^^^^^^^^^^^^\n" + 
				"Name clash: The method foo(I<String>) of type X4 has the same erasure as foo(I<? extends T>) of type Y<T> but does not override it\n" + 
				"----------\n":
					"----------\n" + 
					"1. ERROR in X4.java (at line 2)\n" + 
					"	public String foo(I<String> z) { return null; }\n" + 
					"	              ^^^^^^^^^^^^^^^^\n" + 
					"Name clash: The method foo(I<String>) of type X4 has the same erasure as foo(I<? extends T>) of type Y<T> but does not override it\n" + 
					"----------\n";
		this.runNegativeTest(
			new String[] {
				"X4.java",

				"    public Object foo(I<? extends T> a);\n" +
				"}\n"
			},
			expectedCompilerLog
			"1. ERROR in X4.java (at line 2)\n" + 
			"	public String foo(I<String> z) { return null; }\n" + 
			"	              ^^^^^^^^^^^^^^^^\n" + 
			"Name clash: The method foo(I<String>) of type X4 has the same erasure as foo(I<? extends T>) of type Y<T> but does not override it\n" + 
			"----------\n"
		);
/* javac 7
X.java:2: name clash: foo(I<String>) in X4 and foo(I<? extends T>) in Y have the same erasure, yet neither overrides the other

	}
	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=85900
	public void test048d() {
		String expectedCompilerLog = (this.complianceLevel == ClassFileConstants.JDK1_6)?
				"----------\n" + 
				"1. WARNING in X5.java (at line 2)\n" + 
				"	public Object foo(I<String> z) { return null; }\n" + 
				"	              ^^^^^^^^^^^^^^^^\n" + 
				"Name clash: The method foo(I<String>) of type X5 has the same erasure as foo(I<? extends T>) of type Y<T> but does not override it\n" + 
				"----------\n":
					"----------\n" + 
					"1. ERROR in X5.java (at line 2)\n" + 
					"	public Object foo(I<String> z) { return null; }\n" + 
					"	              ^^^^^^^^^^^^^^^^\n" + 
					"Name clash: The method foo(I<String>) of type X5 has the same erasure as foo(I<? extends T>) of type Y<T> but does not override it\n" + 
					"----------\n";
		this.runNegativeTest(
			new String[] {
				"X5.java",

				"    public String foo(I<? extends T> a);\n" +
				"}\n"
			},
			expectedCompilerLog
			"1. ERROR in X5.java (at line 2)\n" + 
			"	public Object foo(I<String> z) { return null; }\n" + 
			"	              ^^^^^^^^^^^^^^^^\n" + 
			"Name clash: The method foo(I<String>) of type X5 has the same erasure as foo(I<? extends T>) of type Y<T> but does not override it\n" + 
			"----------\n"
		);
/* javac 7
X.java:2: name clash: foo(I<String>) in X5 and foo(I<? extends T>) in Y have the

	}
	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=85900
	public void test048e() {
		String expectedCompilerLog = (this.complianceLevel == ClassFileConstants.JDK1_6)?
				"----------\n" + 
				"1. WARNING in X6.java (at line 2)\n" + 
				"	public void foo(I<String> z) {}\n" + 
				"	            ^^^^^^^^^^^^^^^^\n" + 
				"Name clash: The method foo(I<String>) of type X6 has the same erasure as foo(I<? extends T>) of type Y<T> but does not override it\n" + 
				"----------\n":
					"----------\n" + 
					"1. ERROR in X6.java (at line 2)\n" + 
					"	public void foo(I<String> z) {}\n" + 
					"	            ^^^^^^^^^^^^^^^^\n" + 
					"Name clash: The method foo(I<String>) of type X6 has the same erasure as foo(I<? extends T>) of type Y<T> but does not override it\n" + 
					"----------\n";
		this.runNegativeTest(
			new String[] {
				"X6.java",

				"    public Object foo(I<? extends T> a);\n" +
				"}\n"
			},
			expectedCompilerLog
			"1. ERROR in X6.java (at line 2)\n" + 
			"	public void foo(I<String> z) {}\n" + 
			"	            ^^^^^^^^^^^^^^^^\n" + 
			"Name clash: The method foo(I<String>) of type X6 has the same erasure as foo(I<? extends T>) of type Y<T> but does not override it\n" + 
			"----------\n"
		);
/* javac 7
X.java:2: name clash: foo(I<String>) in X6 and foo(I<? extends T>) in Y have the same erasure, yet neither overrides the other

	}
	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=85900
	public void test048f() {
		String expectedCompilerLog = (this.complianceLevel == ClassFileConstants.JDK1_6)?
				"----------\n" + 
				"1. WARNING in X7.java (at line 2)\n" + 
				"	public String foo(I<String> z) { return null; }\n" + 
				"	              ^^^^^^^^^^^^^^^^\n" + 
				"Name clash: The method foo(I<String>) of type X7 has the same erasure as foo(I<? extends T>) of type Y<T> but does not override it\n" + 
				"----------\n":
					"----------\n" + 
					"1. ERROR in X7.java (at line 2)\n" + 
					"	public String foo(I<String> z) { return null; }\n" + 
					"	              ^^^^^^^^^^^^^^^^\n" + 
					"Name clash: The method foo(I<String>) of type X7 has the same erasure as foo(I<? extends T>) of type Y<T> but does not override it\n" + 
					"----------\n";
		this.runNegativeTest(
			new String[] {
				"X7.java",

				"    public T foo(I<? extends T> a);\n" +
				"}\n"
			},
			expectedCompilerLog
			"1. ERROR in X7.java (at line 2)\n" + 
			"	public String foo(I<String> z) { return null; }\n" + 
			"	              ^^^^^^^^^^^^^^^^\n" + 
			"Name clash: The method foo(I<String>) of type X7 has the same erasure as foo(I<? extends T>) of type Y<T> but does not override it\n" + 
			"----------\n"
		);
/* javac 7
X.java:2: name clash: foo(I<String>) in X7 and foo(I<? extends T>) in Y have the same erasure, yet neither overrides the other

	}
	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=90423 - variation
	public void test050c() {
		String expectedCompilerLog = (this.complianceLevel == ClassFileConstants.JDK1_6)?
				"----------\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" + 
				"----------\n" + 
				"3. WARNING in X.java (at line 7)\n" + 
				"	<T extends Y> T foo(A<Y> o) {  return null; } // ok\n" + 
				"	                ^^^^^^^^^^^\n" + 
				"Method foo(A<Y>) has the same erasure foo(A<T>) as another method in type X.C6\n" + 
				"----------\n" + 
				"4. WARNING in X.java (at line 8)\n" + 
				"	<T extends Z> T foo(A<Z> o) {  return null; } // ok\n" + 
				"	                ^^^^^^^^^^^\n" + 
				"Method foo(A<Z>) has the same erasure foo(A<T>) as another method in type X.C6\n" + 
				"----------\n":
					"----------\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" + 
					"----------\n" + 
					"3. ERROR in X.java (at line 7)\n" + 
					"	<T extends Y> T foo(A<Y> o) {  return null; } // ok\n" + 
					"	                ^^^^^^^^^^^\n" + 
					"Method foo(A<Y>) has the same erasure foo(A<T>) as another method in type X.C6\n" + 
					"----------\n" + 
					"4. ERROR in X.java (at line 8)\n" + 
					"	<T extends Z> T foo(A<Z> o) {  return null; } // ok\n" + 
					"	                ^^^^^^^^^^^\n" + 
					"Method foo(A<Z>) has the same erasure foo(A<T>) as another method in type X.C6\n" + 
					"----------\n";
		this.runNegativeTest(
			new String[] {
				"X.java",

				"class Y {}\n" +
				"class Z {}"
			},
			expectedCompilerLog
			"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" + 
			"----------\n" + 
			"3. ERROR in X.java (at line 7)\n" + 
			"	<T extends Y> T foo(A<Y> o) {  return null; } // ok\n" + 
			"	                ^^^^^^^^^^^\n" + 
			"Method foo(A<Y>) has the same erasure foo(A<T>) as another method in type X.C6\n" + 
			"----------\n" + 
			"4. ERROR in X.java (at line 8)\n" + 
			"	<T extends Z> T foo(A<Z> o) {  return null; } // ok\n" + 
			"	                ^^^^^^^^^^^\n" + 
			"Method foo(A<Z>) has the same erasure foo(A<T>) as another method in type X.C6\n" + 
			"----------\n"
		);
/* javac 7
X.java:4: name clash: foo(A<Z>) and foo(A<Y>) have the same erasure


	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=90423
	public void test050e() {
		String expectedCompilerLog = (this.complianceLevel == ClassFileConstants.JDK1_6)?
				"----------\n" + 
				"1. WARNING 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. WARNING in X.java (at line 3)\n" + 
				"	<N> Object 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" + 
				"----------\n" + 
				"3. WARNING in X.java (at line 4)\n" + 
				"	<N extends B> void b(A<String> s) {}\n" + 
				"	                   ^^^^^^^^^^^^^^\n" + 
				"Method b(A<String>) has the same erasure b(A<T>) as another method in type X\n" + 
				"----------\n" + 
				"4. WARNING in X.java (at line 5)\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" + 
				"----------\n" + 
				"5. WARNING in X.java (at line 6)\n" + 
				"	void c(A<String> s) {}\n" + 
				"	     ^^^^^^^^^^^^^^\n" + 
				"Method c(A<String>) has the same erasure c(A<T>) as another method in type X\n" + 
				"----------\n" + 
				"6. WARNING in X.java (at line 7)\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" + 
				"----------\n":
					"----------\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> Object 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" + 
					"----------\n" + 
					"3. ERROR in X.java (at line 4)\n" + 
					"	<N extends B> void b(A<String> s) {}\n" + 
					"	                   ^^^^^^^^^^^^^^\n" + 
					"Method b(A<String>) 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 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" + 
					"----------\n" + 
					"5. ERROR in X.java (at line 6)\n" + 
					"	void c(A<String> s) {}\n" + 
					"	     ^^^^^^^^^^^^^^\n" + 
					"Method c(A<String>) has the same erasure c(A<T>) as another method in type X\n" + 
					"----------\n" + 
					"6. ERROR in X.java (at line 7)\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" + 
					"----------\n";
		this.runNegativeTest(
			new String[] {
				"X.java",

				"class A<T> {}\n" +
				"class B {}\n"
			},
			expectedCompilerLog
			"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> Object 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" + 
			"----------\n" + 
			"3. ERROR in X.java (at line 4)\n" + 
			"	<N extends B> void b(A<String> s) {}\n" + 
			"	                   ^^^^^^^^^^^^^^\n" + 
			"Method b(A<String>) 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 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" + 
			"----------\n" + 
			"5. ERROR in X.java (at line 6)\n" + 
			"	void c(A<String> s) {}\n" + 
			"	     ^^^^^^^^^^^^^^\n" + 
			"Method c(A<String>) has the same erasure c(A<T>) as another method in type X\n" + 
			"----------\n" + 
			"6. ERROR in X.java (at line 7)\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" + 
			"----------\n"
		);
/* javac 7
X.java:3: name clash: <N#1>a(A<Number>) and <N#2>a(A<String>) have the same erasure

				"class A<T> {}\n" +
				"class B {}\n"
			},
			"----------\n" + 
			"1. ERROR in X.java (at line 2)\n" + 
			"	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" + 
			"	B a(A<Number> n) { return null; }\n" + 
			"	  ^^^^^^^^^^^^^^\n" + 
			"Duplicate method a(A<Number>) in type X\n" + 
			"----------\n" + 
			"3. ERROR in X.java (at line 4)\n" + 
			"	Object b(A<Number> s) {}\n" + 
			"	       ^^^^^^^^^^^^^^\n" + 
			"Duplicate method b(A<Number>) in type X\n" + 
			"----------\n" + 
			"4. ERROR in X.java (at line 4)\n" + 
			"	Object b(A<Number> s) {}\n" + 
			"	       ^^^^^^^^^^^^^^\n" + 
			"This method must return a result of type Object\n" + 
			"----------\n" + 
			"5. ERROR in X.java (at line 5)\n" + 
			"	B b(A<Number> n) { return null; }\n" + 
			"	  ^^^^^^^^^^^^^^\n" + 
			"Duplicate method b(A<Number>) in type X\n" + 
			"----------\n"
		);
/* javac 7

}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=202830
public void test120a() {
	String expectedCompilerLog = (this.complianceLevel == ClassFileConstants.JDK1_6)?
			"----------\n" + 
			"1. WARNING in Bar.java (at line 2)\n" + 
			"	int getThing(V v) { return 1; }\n" + 
			"	    ^^^^^^^^^^^^^\n" + 
			"Method getThing(V) has the same erasure getThing(Object) as another method in type Foo<V,E>\n" + 
			"----------\n" + 
			"2. WARNING in Bar.java (at line 3)\n" + 
			"	boolean getThing(E e) { return true; }\n" + 
			"	        ^^^^^^^^^^^^^\n" + 
			"Method getThing(E) has the same erasure getThing(Object) as another method in type Foo<V,E>\n" + 
			"----------\n":
				"----------\n" + 
				"1. ERROR in Bar.java (at line 2)\n" + 
				"	int getThing(V v) { return 1; }\n" + 
				"	    ^^^^^^^^^^^^^\n" + 
				"Method getThing(V) has the same erasure getThing(Object) as another method in type Foo<V,E>\n" + 
				"----------\n" + 
				"2. ERROR in Bar.java (at line 3)\n" + 
				"	boolean getThing(E e) { return true; }\n" + 
				"	        ^^^^^^^^^^^^^\n" + 
				"Method getThing(E) has the same erasure getThing(Object) as another method in type Foo<V,E>\n" + 
				"----------\n";
	this.runNegativeTest(
		new String[] {
			"Bar.java",

			"}\n" +
			"public class Bar<V,E> extends Foo<V,E> {}"
		},
		expectedCompilerLog
		"1. ERROR in Bar.java (at line 2)\n" + 
		"	int getThing(V v) { return 1; }\n" + 
		"	    ^^^^^^^^^^^^^\n" + 
		"Method getThing(V) has the same erasure getThing(Object) as another method in type Foo<V,E>\n" + 
		"----------\n" + 
		"2. ERROR in Bar.java (at line 3)\n" + 
		"	boolean getThing(E e) { return true; }\n" + 
		"	        ^^^^^^^^^^^^^\n" + 
		"Method getThing(E) has the same erasure getThing(Object) as another method in type Foo<V,E>\n" + 
		"----------\n"
	);
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=173477

}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=285088
public void test200() {
	Map options = getCompilerOptions();
	String compliance = (String) options.get(JavaCore.COMPILER_COMPLIANCE);
	String errorMessage = compliance == JavaCore.VERSION_1_6 ?
			"----------\n" + 
			"1. WARNING in X.java (at line 3)\n" + 
			"	int foo(Collection bar) { return 0; }\n" + 
			"	    ^^^^^^^^^^^^^^^^^^^\n" + 
			"Method foo(Collection) has the same erasure foo(Collection<E>) as another method in type X\n" + 
			"----------\n" + 
			"2. WARNING in X.java (at line 3)\n" + 
			"	int foo(Collection bar) { return 0; }\n" + 
			"	        ^^^^^^^^^^\n" + 
			"Collection is a raw type. References to generic type Collection<E> should be parameterized\n" + 
			"----------\n" + 
			"3. WARNING in X.java (at line 4)\n" + 
			"	double foo(Collection<String> bar) {return 0; }\n" + 
			"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
			"Method foo(Collection<String>) has the same erasure foo(Collection<E>) as another method in type X\n" + 
			"----------\n" :
				"----------\n" + 
				"1. ERROR in X.java (at line 3)\n" + 
				"	int foo(Collection bar) { return 0; }\n" + 
				"	    ^^^^^^^^^^^^^^^^^^^\n" + 
				"Method foo(Collection) has the same erasure foo(Collection<E>) as another method in type X\n" + 
				"----------\n" + 
				"2. WARNING in X.java (at line 3)\n" + 
				"	int foo(Collection bar) { return 0; }\n" + 
				"	        ^^^^^^^^^^\n" + 
				"Collection is a raw type. References to generic type Collection<E> should be parameterized\n" + 
				"----------\n" + 
				"3. ERROR in X.java (at line 4)\n" + 
				"	double foo(Collection<String> bar) {return 0; }\n" + 
				"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Method foo(Collection<String>) has the same erasure foo(Collection<E>) as another method in type X\n" + 
				"----------\n";
	this.runNegativeTest(
		new String[] {
			"X.java",

			"	double foo(Collection<String> bar) {return 0; }\n" +
			"}"
		},
		errorMessage
		"1. ERROR in X.java (at line 3)\n" + 
		"	int foo(Collection bar) { return 0; }\n" + 
		"	    ^^^^^^^^^^^^^^^^^^^\n" + 
		"Method foo(Collection) has the same erasure foo(Collection<E>) as another method in type X\n" + 
		"----------\n" + 
		"2. WARNING in X.java (at line 3)\n" + 
		"	int foo(Collection bar) { return 0; }\n" + 
		"	        ^^^^^^^^^^\n" + 
		"Collection is a raw type. References to generic type Collection<E> should be parameterized\n" + 
		"----------\n" + 
		"3. ERROR in X.java (at line 4)\n" + 
		"	double foo(Collection<String> bar) {return 0; }\n" + 
		"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
		"Method foo(Collection<String>) has the same erasure foo(Collection<E>) as another method in type X\n" + 
		"----------\n"
	);
/* javac 7
X.java:4: foo(Collection) is already defined in X

Return to bug 317719

Lines 1597-1603 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java (-2 / +5 lines)
1597	nodeSourceStart(local, location),	1597	nodeSourceStart(local, location),
1598	nodeSourceEnd(local, location));	1598	nodeSourceEnd(local, location));
1599	}	1599	}
1600	public void duplicateMethodInType(SourceTypeBinding type, AbstractMethodDeclaration methodDecl, boolean equalParameters) {	1600	public void duplicateMethodInType(SourceTypeBinding type, AbstractMethodDeclaration methodDecl, boolean equalParameters, int severity) {
1601	MethodBinding method = methodDecl.binding;	1601	MethodBinding method = methodDecl.binding;
1602	if (equalParameters) {	1602	if (equalParameters) {
1603	this.handle(	1603	this.handle(
Lines 1610-1615 Link Here
1610	new String(methodDecl.selector),	1610	new String(methodDecl.selector),
1611	new String(method.declaringClass.shortReadableName()),	1611	new String(method.declaringClass.shortReadableName()),
1612	typesAsString(method, true)},	1612	typesAsString(method, true)},
		1613	severity,
1613	methodDecl.sourceStart,	1614	methodDecl.sourceStart,
1614	methodDecl.sourceEnd);	1615	methodDecl.sourceEnd);
1615	} else {	1616	} else {
Lines 1630-1635 Link Here
1630	new String(method.declaringClass.shortReadableName()),	1631	new String(method.declaringClass.shortReadableName()),
1631	typesAsString(method, true),	1632	typesAsString(method, true),
1632	typesAsString(method, erasures, true) },	1633	typesAsString(method, erasures, true) },
		1634	severity,
1633	methodDecl.sourceStart,	1635	methodDecl.sourceStart,
1634	methodDecl.sourceEnd);	1636	methodDecl.sourceEnd);
1635	}	1637	}
Lines 5095-5101 Link Here
5095	method.sourceEnd);	5097	method.sourceEnd);
5096	}	5098	}
5097		5099
5098	public void methodNameClash(MethodBinding currentMethod, MethodBinding inheritedMethod) {	5100	public void methodNameClash(MethodBinding currentMethod, MethodBinding inheritedMethod, int severity) {
5099	this.handle(	5101	this.handle(
5100	IProblem.MethodNameClash,	5102	IProblem.MethodNameClash,
5101	new String[] {	5103	new String[] {
Lines 5112-5117 Link Here
5112	typesAsString(inheritedMethod, true),	5114	typesAsString(inheritedMethod, true),
5113	new String(inheritedMethod.declaringClass.shortReadableName()),	5115	new String(inheritedMethod.declaringClass.shortReadableName()),
5114	},	5116	},
		5117	severity,
5115	currentMethod.sourceStart(),	5118	currentMethod.sourceStart(),
5116	currentMethod.sourceEnd());	5119	currentMethod.sourceEnd());
5117	}	5120	}

Lines 22-28 Link Here

(-)Eclipse Java Tests Compiler/org/eclipse/jdt/tests/compiler/regression/NegativeTest.java (-11 / +16 lines)
22		22
23	public class NegativeTest extends AbstractRegressionTest {	23	public class NegativeTest extends AbstractRegressionTest {
24	static {	24	static {
25	// TESTS_NUMBERS = new int[] { 275 };	25	TESTS_NUMBERS = new int[] { 92 };
26	}	26	}
27	public NegativeTest(String name) {	27	public NegativeTest(String name) {
28	super(name);	28	super(name);
Lines 3697-3712 Link Here
3697	" }\n" +	3697	" }\n" +
3698	"}",	3698	"}",
3699	},	3699	},
3700	"----------\n" +	3700	"----------\n" +
3701	"1. ERROR in p\\Toplevel12.java (at line 4)\n" +	3701	"1. ERROR in p\\Toplevel12.java (at line 4)\n" +
3702	" Object local(){\n" +	3702	" Object local(){\n" +
3703	" ^^^^^^^\n" +	3703	" ^^^^^^^\n" +
3704	"Duplicate method local() in type Toplevel12\n" +	3704	"Duplicate method local() in type Toplevel12\n" +
3705	"----------\n" +	3705	"----------\n" +
3706	"2. ERROR in p\\Toplevel12.java (at line 17)\n" +	3706	"2. ERROR in p\\Toplevel12.java (at line 15)\n" +
3707	" void local(){\n" +	3707	" return new Package2.Sub();\n" +
3708	" ^^^^^^^\n" +	3708	" ^^^^^^^^^^^^^^^^^^\n" +
3709	"Duplicate method local() in type Toplevel12\n" +	3709	"No enclosing instance of type Package2 is accessible. Must qualify the allocation with an enclosing instance of type Package2 (e.g. x.new A() where x is an instance of Package2).\n" +
		3710	"----------\n" +
		3711	"3. ERROR in p\\Toplevel12.java (at line 17)\n" +
		3712	" void local(){\n" +
		3713	" ^^^^^^^\n" +
		3714	"Duplicate method local() in type Toplevel12\n" +
3710	"----------\n"	3715	"----------\n"
3711	);	3716	);
3712	}	3717	}