Attachment #52296 for bug #141931

Lines 95-100 Link Here

(-)compiler/org/eclipse/jdt/core/compiler/IProblem.java (+3 lines)
95	* IBM Corporation - added the following constants	95	* IBM Corporation - added the following constants
96	* AnnotationValueMustBeAnEnumConstant	96	* AnnotationValueMustBeAnEnumConstant
97	* OverridingMethodWithoutSuperInvocation	97	* OverridingMethodWithoutSuperInvocation
		98	* MethodMustOverrideOrImplement
98	*******************************************************************************/	99	*******************************************************************************/
99	package org.eclipse.jdt.core.compiler;	100	package org.eclipse.jdt.core.compiler;
100		101
Lines 1121-1126 Link Here
1121	int AnnotationValueMustBeArrayInitializer = Internal + 632;	1122	int AnnotationValueMustBeArrayInitializer = Internal + 632;
1122	/** @since 3.3 */	1123	/** @since 3.3 */
1123	int AnnotationValueMustBeAnEnumConstant = Internal + 633;	1124	int AnnotationValueMustBeAnEnumConstant = Internal + 633;
		1125	/** @since 3.3 */
		1126	int MethodMustOverrideOrImplement = MethodRelated + 634;
1124		1127
1125	/**	1128	/**
1126	* Corrupted binaries	1129	* Corrupted binaries

Lines 526-531 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/problem/messages.properties (-1 / +1 lines)
526	631 = Unhandled warning token {0}	526	631 = Unhandled warning token {0}
527	632 = The value for annotation attribute {0}.{1} must be an array initializer	527	632 = The value for annotation attribute {0}.{1} must be an array initializer
528	633 = The value for annotation attribute {0}.{1} must be an enum constant expression	528	633 = The value for annotation attribute {0}.{1} must be an enum constant expression
		529	634 = The method {0}({1}) of type {2} must override or implement a supertype method
529		530
530	### CORRUPTED BINARIES	531	### CORRUPTED BINARIES
531	700 = The class file {0} contains a signature ''{1}'' ill-formed at position {2}	532	700 = The class file {0} contains a signature ''{1}'' ill-formed at position {2}
Lines 570-573 Link Here
570	857 = Incorrect number of type arguments for generic constructor <{3}>{0}({1}) of type {2}; it cannot be parameterized with arguments <{4}>	571	857 = Incorrect number of type arguments for generic constructor <{3}>{0}({1}) of type {2}; it cannot be parameterized with arguments <{4}>
571	858 = The parameterized constructor <{3}>{0}({1}) of type {2} is not applicable for the arguments ({4})	572	858 = The parameterized constructor <{3}>{0}({1}) of type {2} is not applicable for the arguments ({4})
572	859 = The constructor {0}({1}) of raw type {2} is no longer generic; it cannot be parameterized with arguments <{3}>	573	859 = The constructor {0}({1}) of raw type {2} is no longer generic; it cannot be parameterized with arguments <{3}>
573

Lines 272-277 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java (-1 / +2 lines)
272		272
273	case IProblem.FallthroughCase:	273	case IProblem.FallthroughCase:
274	return CompilerOptions.FallthroughCase;	274	return CompilerOptions.FallthroughCase;
		275
275	case IProblem.OverridingMethodWithoutSuperInvocation:	276	case IProblem.OverridingMethodWithoutSuperInvocation:
276	return CompilerOptions.OverridingMethodWithoutSuperInvocation;	277	return CompilerOptions.OverridingMethodWithoutSuperInvocation;
277	}	278	}
Lines 4343-4349 Link Here
4343	public void methodMustOverride(AbstractMethodDeclaration method) {	4344	public void methodMustOverride(AbstractMethodDeclaration method) {
4344	MethodBinding binding = method.binding;	4345	MethodBinding binding = method.binding;
4345	this.handle(	4346	this.handle(
4346	IProblem.MethodMustOverride,	4347	this.options.sourceLevel == ClassFileConstants.JDK1_5 ? IProblem.MethodMustOverride : IProblem.MethodMustOverrideOrImplement,
4347	new String[] {new String(binding.selector), typesAsString(binding.isVarargs(), binding.parameters, false), new String(binding.declaringClass.readableName()), },	4348	new String[] {new String(binding.selector), typesAsString(binding.isVarargs(), binding.parameters, false), new String(binding.declaringClass.readableName()), },
4348	new String[] {new String(binding.selector), typesAsString(binding.isVarargs(), binding.parameters, true), new String(binding.declaringClass.shortReadableName()),},	4349	new String[] {new String(binding.selector), typesAsString(binding.isVarargs(), binding.parameters, true), new String(binding.declaringClass.shortReadableName()),},
4349	method.sourceStart,	4350	method.sourceStart,




		final CompilerOptions compilerOptions = this.scope.compilerOptions();
		checkOverride: {
			if (this.binding == null) break checkOverride;
			long sourceLevel = compilerOptions.sourceLevel;
			if (sourceLevel < ClassFileConstants.JDK1_5) break checkOverride;
			int bindingModifiers = this.binding.modifiers;
			boolean hasOverrideAnnotation = (this.binding.tagBits & TagBits.AnnotationOverride) != 0;
			boolean isInterfaceMethod = this.binding.declaringClass.isInterface();
			if (hasOverrideAnnotation) {
				// no static method is considered overriding
				if (!isInterfaceMethod && (bindingModifiers & (ClassFileConstants.AccStatic|ExtraCompilerModifiers.AccOverriding)) == ExtraCompilerModifiers.AccOverriding)
					break checkOverride;
				//	in 1.5, strictly for overriding superclass method
				//	in 1.6 and above, also tolerate implementing interface method
				if (sourceLevel >= ClassFileConstants.JDK1_6
						&& ((bindingModifiers & (ClassFileConstants.AccStatic|ExtraCompilerModifiers.AccImplementing)) == ExtraCompilerModifiers.AccImplementing))
					break checkOverride;
				// claims to override, and doesn't actually do so
				this.scope.problemReporter().methodMustOverride(this);					
			} else if (!isInterfaceMethod 	
						&& (bindingModifiers & (ClassFileConstants.AccStatic|ExtraCompilerModifiers.AccOverriding)) == ExtraCompilerModifiers.AccOverriding) {
				// actually overrides, but did not claim to do so
				this.scope.problemReporter().missingOverrideAnnotation(this);
			}
		}
				
		// by grammatical construction, interface methods are always abstract
		switch (TypeDeclaration.kind(this.scope.referenceType().modifiers)) {
			case TypeDeclaration.ENUM_DECL :




import org.eclipse.jdt.core.util.ClassFileBytesDisassembler;
import org.eclipse.jdt.core.util.IClassFileReader;
import org.eclipse.jdt.core.util.IMethodInfo;
import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;

public class MethodVerifyTest extends AbstractComparableTest {


	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=99106
	public void test062() {
		String expectedOutput = new CompilerOptions(getCompilerOptions()).sourceLevel < ClassFileConstants.JDK1_6
		?	"----------\n" + 
				"Errors.java",
				"public class Errors {\n" +
				"	void foo() {\n" +
				"		Ex<String> ex = new Ex<String>();\n" +
				"		ex.proof(\"eclipse\");\n" +
				"		ex.five(\"eclipse\");\n" +
				"		ex.six(\"eclipse\");\n" +
				"		Ex ex2 = ex;\n" +
				"		ex2.proof(\"eclipse\");\n" +
				"		ex2.five(\"eclipse\");\n" +
				"		ex2.six(\"eclipse\");\n" +
				"	}\n" +
				"}\n" +
				"class Top<TC> {\n" +
				"	<TM> void proof(Object cTop) {}\n" +
				"	<TM> void five(TC cTop) {}\n" +
				"	void six(TC cTop) {}\n" +
				"}\n" +
				"class Ex<C> extends Top<C> {\n" +
				"	@Override void proof(Object cTop) {}\n" +
				"	@Override void five(C cEx) {}\n" +
				"	@Override <M> void six(C cEx) {}\n" +
				"}"
			},
			"----------\n" + 
			"1. ERROR in Errors.java (at line 6)\n" + 
			"	ex.six(\"eclipse\");\n" + 
			"	   ^^^\n" + 

			"	                   ^^^^^^^^^^\n" + 
			"The method six(C) of type Ex<C> must override a superclass method\n" + 
			"----------\n"
		:	"----------\n" + 
			"1. ERROR in Errors.java (at line 6)\n" + 
			"	ex.six(\"eclipse\");\n" + 
			"	   ^^^\n" + 
			"The method six(String) is ambiguous for the type Ex<String>\n" + 
			"----------\n" + 
			"2. WARNING in Errors.java (at line 7)\n" + 
			"	Ex ex2 = ex;\n" + 
			"	^^\n" + 
			"Ex is a raw type. References to generic type Ex<C> should be parameterized\n" + 
			"----------\n" + 
			"3. WARNING in Errors.java (at line 9)\n" + 
			"	ex2.five(\"eclipse\");\n" + 
			"	^^^^^^^^^^^^^^^^^^^\n" + 
			"Type safety: The method five(Object) belongs to the raw type Ex. References to generic type Ex<C> should be parameterized\n" + 
			"----------\n" + 
			"4. ERROR in Errors.java (at line 10)\n" + 
			"	ex2.six(\"eclipse\");\n" + 
			"	    ^^^\n" + 
			"The method six(Object) is ambiguous for the type Ex\n" + 
			"----------\n" + 
			"5. ERROR in Errors.java (at line 21)\n" + 
			"	@Override <M> void six(C cEx) {}\n" + 
			"	                   ^^^^^^^^^^\n" + 
			"Name clash: The method six(C) of type Ex<C> has the same erasure as six(TC) of type Top<TC> but does not override it\n" + 
			"----------\n" + 
			"6. ERROR in Errors.java (at line 21)\n" + 
			"	@Override <M> void six(C cEx) {}\n" + 
			"	                   ^^^^^^^^^^\n" + 
			"The method six(C) of type Ex<C> must override or implement a supertype method\n" + 
			"----------\n";		
				this.runNegativeTest(
			new String[] {
				"Errors.java",
				"public class Errors {\n" +
				"	void foo() {\n" +
				"		Ex<String> ex = new Ex<String>();\n" +
				"		ex.proof(\"eclipse\");\n" +
				"		ex.five(\"eclipse\");\n" +
				"		ex.six(\"eclipse\");\n" +
				"		Ex ex2 = ex;\n" +
				"		ex2.proof(\"eclipse\");\n" +
				"		ex2.five(\"eclipse\");\n" +
				"		ex2.six(\"eclipse\");\n" +
				"	}\n" +
				"}\n" +
				"class Top<TC> {\n" +
				"	<TM> void proof(Object cTop) {}\n" +
				"	<TM> void five(TC cTop) {}\n" +
				"	void six(TC cTop) {}\n" +
				"}\n" +
				"class Ex<C> extends Top<C> {\n" +
				"	@Override void proof(Object cTop) {}\n" +
				"	@Override void five(C cEx) {}\n" +
				"	@Override <M> void six(C cEx) {}\n" +
				"}"
			},
			expectedOutput
			// we disagree about the ambiguous errors on lines 5, 9 & 20, see the message sends to proof()
			// 5: reference to five is ambiguous, both method <TM>five(TC) in Top<java.lang.String> and method five(C) in Ex<java.lang.String> match
			// 6: reference to six is ambiguous, both method six(TC) in Top<java.lang.String> and method <M>six(C) in Ex<java.lang.String> match

	}
	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=107045
	public void test071() {
		String expectedOutput = new CompilerOptions(getCompilerOptions()).sourceLevel < ClassFileConstants.JDK1_6
		?	"----------\n" + 
				"D.java",
				"class D extends B<Integer> {\n" +
				"	@Override void m(Number t) {}\n" + 
				"	@Override void m(Integer t) {}\n" + 
				"}\n" + 
				"class A<T extends Number> { void m(T t) {} }\n" +
				"class B<S extends Integer> extends A<S> { @Override void m(S t) {} }"
			},
			"----------\n" + 
			"1. ERROR in D.java (at line 2)\r\n" + 
			"	@Override void m(Number t) {}\r\n" + 
			"	               ^^^^^^^^^^^\n" + 

			"	                  ^^^^^^^\n" + 
			"The type parameter S should not be bounded by the final type Integer. Final types cannot be further extended\n" + 
			"----------\n"
		:	"----------\n" + 
			"1. ERROR in D.java (at line 2)\n" + 
			"	@Override void m(Number t) {}\n" + 
			"	               ^^^^^^^^^^^\n" + 
			"Name clash: The method m(Number) of type D has the same erasure as m(T) of type A<T> but does not override it\n" + 
			"----------\n" + 
			"2. ERROR in D.java (at line 2)\n" + 
			"	@Override void m(Number t) {}\n" + 
			"	               ^^^^^^^^^^^\n" + 
			"The method m(Number) of type D must override or implement a supertype method\n" + 
			"----------\n" + 
			"3. WARNING in D.java (at line 6)\n" + 
			"	class B<S extends Integer> extends A<S> { @Override void m(S t) {} }\n" + 
			"	                  ^^^^^^^\n" + 
			"The type parameter S should not be bounded by the final type Integer. Final types cannot be further extended\n" + 
			"----------\n";
		this.runNegativeTest(
			new String[] {
				"D.java",
				"class D extends B<Integer> {\n" +
				"	@Override void m(Number t) {}\n" + 
				"	@Override void m(Integer t) {}\n" + 
				"}\n" + 
				"class A<T extends Number> { void m(T t) {} }\n" +
				"class B<S extends Integer> extends A<S> { @Override void m(S t) {} }"
			},
			expectedOutput);
	}
	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=108780
	public void test072() {

	}
	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=111350
	public void test073c() {
		String expectedOutput = new CompilerOptions(getCompilerOptions()).sourceLevel < ClassFileConstants.JDK1_6
		?	"----------\n" + 
			"1. ERROR in NumericArray4.java (at line 5)\r\n" + 
			"	@Override public <U> void add(Number n) {}\r\n" + 
			"	                          ^^^^^^^^^^^^^\n" + 
			"The method add(Number) of type NumericArray4<T> must override a superclass method\n" + 
			"----------\n"
		:	"----------\n" + 
			"1. ERROR in NumericArray4.java (at line 5)\n" + 
			"	@Override public <U> void add(Number n) {}\n" + 
			"	                          ^^^^^^^^^^^^^\n" + 
			"The method add(Number) of type NumericArray4<T> must override or implement a supertype method\n" + 
			"----------\n";
		this.runNegativeTest(
			new String[] {
				"NumericArray4.java",

				"	@Override public <U> void add(Number n) {}\n" +
				"}"
			},
			expectedOutput);
			"1. ERROR in NumericArray4.java (at line 5)\r\n" + 
			"	@Override public <U> void add(Number n) {}\r\n" + 
			"	                          ^^^^^^^^^^^^^\n" + 
			"The method add(Number) of type NumericArray4<T> must override a superclass method\n" + 
			"----------\n"
		);
	}
	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=111350
	public void test073d() {
		String expectedOutput = new CompilerOptions(getCompilerOptions()).sourceLevel < ClassFileConstants.JDK1_6
		?	"----------\n" + 
			"1. ERROR in NumericArray5.java (at line 5)\r\n" + 
			"	@Override public void add(Number n, Integer i) {}\r\n" + 
			"	                      ^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
			"The method add(Number, Integer) of type NumericArray5<T> must override a superclass method\n" + 
			"----------\n"
		:	"----------\n" + 
			"1. ERROR in NumericArray5.java (at line 5)\n" + 
			"	@Override public void add(Number n, Integer i) {}\n" + 
			"	                      ^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
			"The method add(Number, Integer) of type NumericArray5<T> must override or implement a supertype method\n" + 
			"----------\n";		
		this.runNegativeTest(
			new String[] {
				"NumericArray5.java",

				"	@Override public void add(Number n, Integer i) {}\n" +
				"}"
			},
			expectedOutput);
			"1. ERROR in NumericArray5.java (at line 5)\r\n" + 
			"	@Override public void add(Number n, Integer i) {}\r\n" + 
			"	                      ^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
			"The method add(Number, Integer) of type NumericArray5<T> must override a superclass method\n" + 
			"----------\n"
		);
	}
	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=100970
	public void test074() {
		String expectedOutput = new CompilerOptions(getCompilerOptions()).sourceLevel < ClassFileConstants.JDK1_6
		?	"----------\n" + 
				"I.java",
				"interface I {}\n" +
				"interface J extends I { @Override void clone(); }"
			},
			"----------\n" + 
			"1. WARNING in I.java (at line 2)\n" + 
			"	interface J extends I { @Override void clone(); }\n" + 
			"	                                       ^^^^^^^\n" + 

			"	                                       ^^^^^^^\n" + 
			"The method clone() of type J must override a superclass method\n" + 
			"----------\n"
		:	"----------\n" + 
			"1. WARNING in I.java (at line 2)\n" + 
			"	interface J extends I { @Override void clone(); }\n" + 
			"	                                       ^^^^^^^\n" + 
			"The return type is incompatible with Object.clone(), thus this interface cannot be implemented\n" + 
			"----------\n" + 
			"2. ERROR in I.java (at line 2)\n" + 
			"	interface J extends I { @Override void clone(); }\n" + 
			"	                                       ^^^^^^^\n" + 
			"The method clone() of type J must override or implement a supertype method\n" + 
			"----------\n";		
		this.runNegativeTest(
			new String[] {
				"I.java",
				"interface I {}\n" +
				"interface J extends I { @Override void clone(); }"
			},
			expectedOutput);
	}
	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=100970
	public void test074a() {
		String expectedOutput = new CompilerOptions(getCompilerOptions()).sourceLevel < ClassFileConstants.JDK1_6
		?	"----------\n" + 
			"1. WARNING in I.java (at line 1)\n" + 
			"	interface I { @Override void clone(); }\n" + 
			"	                             ^^^^^^^\n" + 

			"	                             ^^^^^^^\n" + 
			"The method clone() of type I must override a superclass method\n" + 
			"----------\n"
		:	"----------\n" + 
			"1. WARNING in I.java (at line 1)\n" + 
			"	interface I { @Override void clone(); }\n" + 
			"	                             ^^^^^^^\n" + 
			"The return type is incompatible with Object.clone(), thus this interface cannot be implemented\n" + 
			"----------\n" + 
			"2. ERROR in I.java (at line 1)\n" + 
			"	interface I { @Override void clone(); }\n" + 
			"	                             ^^^^^^^\n" + 
			"The method clone() of type I must override or implement a supertype method\n" + 
			"----------\n";		
		this.runNegativeTest(
			new String[] {
				"I.java",
				"interface I { @Override void clone(); }\n" +
				"interface J extends I {}"
			},
			expectedOutput);
	}
	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=100970
	public void test074b() {

	}
	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=107105
	public void test075() {
		String expectedOutput = new CompilerOptions(getCompilerOptions()).sourceLevel < ClassFileConstants.JDK1_6
			?	"----------\n" + 
				"1. ERROR in A.java (at line 2)\n" + 
				"	class B extends A { @Override <T1, S1 extends J & I<S1>> void foo() { } }\n" + 
				"	                                                              ^^^^^\n" + 
				"Name clash: The method foo() of type B has the same erasure as foo() of type A but does not override it\n" + 
				"----------\n" + 
				"2. ERROR in A.java (at line 2)\n" + 
				"	class B extends A { @Override <T1, S1 extends J & I<S1>> void foo() { } }\n" + 
				"	                                                              ^^^^^\n" + 
				"The method foo() of type B must override a superclass method\n" + 
				"----------\n" + 
				"3. WARNING in A.java (at line 3)\n" + 
				"	class C extends A { @Override <T2, S2 extends J & I> void foo() { } }\n" + 
				"	                                                  ^\n" + 
				"I is a raw type. References to generic type I<TT> should be parameterized\n" + 
				"----------\n" + 
				"4. ERROR in A.java (at line 3)\n" + 
				"	class C extends A { @Override <T2, S2 extends J & I> void foo() { } }\n" + 
				"	                                                          ^^^^^\n" + 
				"Name clash: The method foo() of type C has the same erasure as foo() of type A but does not override it\n" + 
				"----------\n" + 
				"5. ERROR in A.java (at line 3)\n" + 
				"	class C extends A { @Override <T2, S2 extends J & I> void foo() { } }\n" + 
				"	                                                          ^^^^^\n" + 
				"The method foo() of type C must override a superclass method\n" + 
				"----------\n"
			:	"----------\n" + 
				"1. ERROR in A.java (at line 2)\n" + 
				"	class B extends A { @Override <T1, S1 extends J & I<S1>> void foo() { } }\n" + 
				"	                                                              ^^^^^\n" + 
				"Name clash: The method foo() of type B has the same erasure as foo() of type A but does not override it\n" + 
				"----------\n" + 
				"2. ERROR in A.java (at line 2)\n" + 
				"	class B extends A { @Override <T1, S1 extends J & I<S1>> void foo() { } }\n" + 
				"	                                                              ^^^^^\n" + 
				"The method foo() of type B must override or implement a supertype method\n" + 
				"----------\n" + 
				"3. WARNING in A.java (at line 3)\n" + 
				"	class C extends A { @Override <T2, S2 extends J & I> void foo() { } }\n" + 
				"	                                                  ^\n" + 
				"I is a raw type. References to generic type I<TT> should be parameterized\n" + 
				"----------\n" + 
				"4. ERROR in A.java (at line 3)\n" + 
				"	class C extends A { @Override <T2, S2 extends J & I> void foo() { } }\n" + 
				"	                                                          ^^^^^\n" + 
				"Name clash: The method foo() of type C has the same erasure as foo() of type A but does not override it\n" + 
				"----------\n" + 
				"5. ERROR in A.java (at line 3)\n" + 
				"	class C extends A { @Override <T2, S2 extends J & I> void foo() { } }\n" + 
				"	                                                          ^^^^^\n" + 
				"The method foo() of type C must override or implement a supertype method\n" + 
				"----------\n";		
		this.runNegativeTest(
			new String[] {
				"A.java",

				"interface I<TT> {}\n" +
				"interface J {}"
			},
			expectedOutput
			"1. ERROR in A.java (at line 2)\n" + 
			"	class B extends A { @Override <T1, S1 extends J & I<S1>> void foo() { } }\n" + 
			"	                                                              ^^^^^\n" + 
			"Name clash: The method foo() of type B has the same erasure as foo() of type A but does not override it\n" + 
			"----------\n" + 
			"2. ERROR in A.java (at line 2)\n" + 
			"	class B extends A { @Override <T1, S1 extends J & I<S1>> void foo() { } }\n" + 
			"	                                                              ^^^^^\n" + 
			"The method foo() of type B must override a superclass method\n" + 
			"----------\n" + 
			"3. WARNING in A.java (at line 3)\n" + 
			"	class C extends A { @Override <T2, S2 extends J & I> void foo() { } }\n" + 
			"	                                                  ^\n" + 
			"I is a raw type. References to generic type I<TT> should be parameterized\n" + 
			"----------\n" + 
			"4. ERROR in A.java (at line 3)\n" + 
			"	class C extends A { @Override <T2, S2 extends J & I> void foo() { } }\n" + 
			"	                                                          ^^^^^\n" + 
			"Name clash: The method foo() of type C has the same erasure as foo() of type A but does not override it\n" + 
			"----------\n" + 
			"5. ERROR in A.java (at line 3)\n" + 
			"	class C extends A { @Override <T2, S2 extends J & I> void foo() { } }\n" + 
			"	                                                          ^^^^^\n" + 
			"The method foo() of type C must override a superclass method\n" + 
			"----------\n"
			// A.java:2: method does not override a method from its superclass
			// A.java:3: method does not override a method from its superclass
		);

	}
	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=107105
	public void test075b() {
		String expectedOutput = new CompilerOptions(getCompilerOptions()).sourceLevel < ClassFileConstants.JDK1_6
		?	"----------\n" + 
			"1. ERROR in A.java (at line 2)\r\n" + 
			"	class B<V> extends A<V> { @Override <T1, S1 extends K & I<T1>> void foo(V v, T1 t, S1 s) { } }\r\n" + 
			"	                                                                    ^^^^^^^^^^^^^^^^^^^^\n" + 
			"The method foo(V, T1, S1) of type B<V> must override a superclass method\n" + 
			"----------\n"
		:	"----------\n" + 
			"1. ERROR in A.java (at line 2)\n" + 
			"	class B<V> extends A<V> { @Override <T1, S1 extends K & I<T1>> void foo(V v, T1 t, S1 s) { } }\n" + 
			"	                                                                    ^^^^^^^^^^^^^^^^^^^^\n" + 
			"The method foo(V, T1, S1) of type B<V> must override or implement a supertype method\n" + 
			"----------\n";				
		this.runNegativeTest(
			new String[] {
				"A.java",

				"interface J {}\n" +
				"interface K extends J {}"
			},
			expectedOutput
			"1. ERROR in A.java (at line 2)\r\n" + 
			"	class B<V> extends A<V> { @Override <T1, S1 extends K & I<T1>> void foo(V v, T1 t, S1 s) { } }\r\n" + 
			"	                                                                    ^^^^^^^^^^^^^^^^^^^^\n" + 
			"The method foo(V, T1, S1) of type B<V> must override a superclass method\n" + 
			"----------\n"
			// A.java:2: method does not override a method from its superclass
		);
	}

}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=156736
public void test116() {
   	Map options = this.getCompilerOptions();
   	options.put(CompilerOptions.OPTION_ReportOverridingMethodWithoutSuperInvocation, CompilerOptions.ERROR);
	String expectedOutput = new CompilerOptions(options).sourceLevel < ClassFileConstants.JDK1_6
	?	"----------\n" + 
		"1. ERROR in X.java (at line 2)\n" + 
		"	Zork foo() {}\n" + 
		"	^^^^\n" + 
		"Zork cannot be resolved to a type\n" + 
		"----------\n" + 
		"2. ERROR in X.java (at line 6)\n" + 
		"	Object foo() {\n" + 
		"	       ^^^^^\n" + 
		"The method foo() of type X must override a superclass method\n" + 
		"----------\n"
	:	"----------\n" + 
		"1. ERROR in X.java (at line 2)\n" + 
		"	Zork foo() {}\n" + 
		"	^^^^\n" + 
		"Zork cannot be resolved to a type\n" + 
		"----------\n" + 
		"2. ERROR in X.java (at line 6)\n" + 
		"	Object foo() {\n" + 
		"	       ^^^^^\n" + 
		"The method foo() of type X must override or implement a supertype method\n" + 
		"----------\n";	
   	this.runNegativeTest(
		new String[] {
			"X.java",
			"class Y {\n" + 
			"  Zork foo() {}\n" + 
			"}\n" + 
			"public class X extends Y {\n" + 
			"  @Override\n" +
			"  Object foo() {\n" +
			"     return new Y() {\n" +
			"         Object foo() {\n" +
			"            return null;\n" +
			"         }\n" +
			"     };" +
			"  }\n" + 
			"}"
		},
		expectedOutput,
		null,
		true,
		options	);
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=156736
public void test117() {




import org.eclipse.jdt.core.tests.util.AbstractCompilerTest;
import org.eclipse.jdt.core.tests.util.Util;
import org.eclipse.jdt.core.util.ClassFileBytesDisassembler;
import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;

public class GenericTypeTest extends AbstractComparableTest {

	// All specified tests which does not belong to the class are skipped...
	static {
//		TESTS_NAMES = new String[] { "test0788" };
//		TESTS_NUMBERS = new int[] { 1050, 1054 };
//		TESTS_RANGE = new int[] { 821, -1 };
	}
	public static Test suite() {

}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=140643
public void test0987() {
	String expectedOutput = new CompilerOptions(getCompilerOptions()).sourceLevel < ClassFileConstants.JDK1_6
	?	"----------\n" + 
		"1. ERROR in X.java (at line 7)\n" + 
		"	abstract class GLinkElementView<M,CM> extends AbstractLinkView<M> {}\n" + 
		"	               ^^^^^^^^^^^^^^^^\n" + 
		"The return type is incompatible with EditPart.getViewer(), AbstractLinkView<M>.getViewer()\n" + 
		"----------\n" + 
		"2. ERROR in X.java (at line 11)\n" + 
		"	public ISheetViewer getViewer() { return null; }	\n" + 
		"	                    ^^^^^^^^^^^\n" + 
		"The return type is incompatible with EditPart.getViewer()\n" + 
		"----------\n" + 
		"3. ERROR in X.java (at line 11)\n" + 
		"	public ISheetViewer getViewer() { return null; }	\n" + 
		"	                    ^^^^^^^^^^^\n" + 
		"The method getViewer() of type AbstractLinkView<M> must override a superclass method\n" + 
		"----------\n"
	:	"----------\n" + 
		"1. ERROR in X.java (at line 7)\n" + 
		"	abstract class GLinkElementView<M,CM> extends AbstractLinkView<M> {}\n" + 
		"	               ^^^^^^^^^^^^^^^^\n" + 
		"The return type is incompatible with EditPart.getViewer(), AbstractLinkView<M>.getViewer()\n" + 
		"----------\n" + 
		"2. ERROR in X.java (at line 11)\n" + 
		"	public ISheetViewer getViewer() { return null; }	\n" + 
		"	                    ^^^^^^^^^^^\n" + 
		"The return type is incompatible with EditPart.getViewer()\n" + 
		"----------\n";	
	this.runNegativeTest(
			new String[] {
				"X.java",//===================

				"\n" + 
				"interface EditPartViewer {}\n", // =================			
			},
			expectedOutput);
			"1. ERROR in X.java (at line 7)\n" + 
			"	abstract class GLinkElementView<M,CM> extends AbstractLinkView<M> {}\n" + 
			"	               ^^^^^^^^^^^^^^^^\n" + 
			"The return type is incompatible with EditPart.getViewer(), AbstractLinkView<M>.getViewer()\n" + 
			"----------\n" + 
			"2. ERROR in X.java (at line 11)\n" + 
			"	public ISheetViewer getViewer() { return null; }	\n" + 
			"	                    ^^^^^^^^^^^\n" + 
			"The return type is incompatible with EditPart.getViewer()\n" + 
			"----------\n" + 
			"3. ERROR in X.java (at line 11)\n" + 
			"	public ISheetViewer getViewer() { return null; }	\n" + 
			"	                    ^^^^^^^^^^^\n" + 
			"The method getViewer() of type AbstractLinkView<M> must override a superclass method\n" + 
			"----------\n");
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=140643 - variation
public void test0988() {




	}	
	// check @Override annotation - strictly for superclasses (overrides) and not interfaces (implements)
	public void test077() {
		String expectedOutput = new CompilerOptions(getCompilerOptions()).sourceLevel < ClassFileConstants.JDK1_6
			?	"----------\n" + 
				"1. ERROR in X.java (at line 14)\n" + 
				"	void foo() {}\n" + 
				"	     ^^^^^\n" + 
				"The method foo() of type X must override a superclass method\n" + 
				"----------\n" + 
				"2. ERROR in X.java (at line 18)\n" + 
				"	public void baz() {}\n" + 
				"	            ^^^^^\n" + 
				"The method baz() of type X must override a superclass method\n" + 
				"----------\n"
			:	"----------\n" + 
				"1. ERROR in X.java (at line 14)\n" + 
				"	void foo() {}\n" + 
				"	     ^^^^^\n" + 
				"The method foo() of type X must override or implement a supertype method\n" + 
				"----------\n";
		this.runNegativeTest(
			new String[] {
				"X.java",

				"	public void baz() {}\n" + 
				"}\n"
			},
			expectedOutput);
			"1. ERROR in X.java (at line 14)\n" + 
			"	void foo() {}\n" + 
			"	     ^^^^^\n" + 
			"The method foo() of type X must override a superclass method\n" + 
			"----------\n" + 
			"2. ERROR in X.java (at line 18)\n" + 
			"	public void baz() {}\n" + 
			"	            ^^^^^\n" + 
			"The method baz() of type X must override a superclass method\n" + 
			"----------\n");
	}
	
	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=80114

    }          
    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=90111 - variation
    public void test140() {
    	String expectedOutput = new CompilerOptions(getCompilerOptions()).sourceLevel < ClassFileConstants.JDK1_6
		?	"----------\n" + 
    		"1. ERROR in X.java (at line 6)\r\n" + 
    		"	static void foo(){}	\r\n" + 
    		"	            ^^^^^\n" + 
    		"The method foo() of type Bar must override a superclass method\n" + 
    		"----------\n"
		:	"----------\n" + 
			"1. ERROR in X.java (at line 6)\n" + 
			"	static void foo(){}	\n" + 
			"	            ^^^^^\n" + 
			"The method foo() of type Bar must override or implement a supertype method\n" + 
			"----------\n";    	
        this.runNegativeTest(
            new String[] {
                "X.java",

				"}\n" + 
				"\n"
            },
            expectedOutput);
    		"1. ERROR in X.java (at line 6)\r\n" + 
    		"	static void foo(){}	\r\n" + 
    		"	            ^^^^^\n" + 
    		"The method foo() of type Bar must override a superclass method\n" + 
    		"----------\n");
    }              
    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=94867
    public void test141() {

    }
    //https://bugs.eclipse.org/bugs/show_bug.cgi?id=94759
    public void test168() {
    	String expectedOutput = new CompilerOptions(getCompilerOptions()).sourceLevel < ClassFileConstants.JDK1_6
			?	"----------\n" + 
				"1. ERROR in X.java (at line 2)\n" + 
				"	@Override I clone();\n" + 
				"	            ^^^^^^^\n" + 
				"The method clone() of type I must override a superclass method\n" + 
				"----------\n" + 
				"2. ERROR in X.java (at line 7)\n" + 
				"	@Override void foo();\n" + 
				"	               ^^^^^\n" + 
				"The method foo() of type J must override a superclass method\n" + 
				"----------\n"
			:	"----------\n" + 
				"1. ERROR in X.java (at line 2)\n" + 
				"	@Override I clone();\n" + 
				"	            ^^^^^^^\n" + 
				"The method clone() of type I must override or implement a supertype method\n" + 
				"----------\n";
    	this.runNegativeTest(
            new String[] {
                "X.java",
				"interface I {\n" + 

				"	@Override void foo();\n" + 
				"}\n",
           },
           expectedOutput);
		"1. ERROR in X.java (at line 2)\n" + 
		"	@Override I clone();\n" + 
		"	            ^^^^^^^\n" + 
		"The method clone() of type I must override a superclass method\n" + 
		"----------\n" + 
		"2. ERROR in X.java (at line 7)\n" + 
		"	@Override void foo();\n" + 
		"	               ^^^^^\n" + 
		"The method foo() of type J must override a superclass method\n" + 
		"----------\n");
    }
    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=97220
    public void test169() {

}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=130017
public void test194() {
	String expectedOutput = new CompilerOptions(getCompilerOptions()).sourceLevel < ClassFileConstants.JDK1_6
	?	"----------\n" + 
		"1. ERROR in X.java (at line 5)\n" + 
		"	@Override\n" + 
		"	^^^^^^^^^\n" + 
		"The annotation @Override is disallowed for this location\n" + 
		"----------\n" + 
		"2. ERROR in X.java (at line 9)\n" + 
		"	public static void foo() {}\n" + 
		"	                   ^^^^^\n" + 
		"The method foo() of type X must override a superclass method\n" + 
		"----------\n"
	:	"----------\n" + 
		"1. ERROR in X.java (at line 5)\n" + 
		"	@Override\n" + 
		"	^^^^^^^^^\n" + 
		"The annotation @Override is disallowed for this location\n" + 
		"----------\n" + 
		"2. ERROR in X.java (at line 9)\n" + 
		"	public static void foo() {}\n" + 
		"	                   ^^^^^\n" + 
		"The method foo() of type X must override or implement a supertype method\n" + 
		"----------\n";	
	this.runNegativeTest(
		new String[] {
			"X.java",

			"    public static void foo() {}\n" + 
			"}\n"
		},
		expectedOutput);
		"1. ERROR in X.java (at line 5)\n" + 
		"	@Override\n" + 
		"	^^^^^^^^^\n" + 
		"The annotation @Override is disallowed for this location\n" + 
		"----------\n" + 
		"2. ERROR in X.java (at line 9)\n" + 
		"	public static void foo() {}\n" + 
		"	                   ^^^^^\n" + 
		"The method foo() of type X must override a superclass method\n" + 
		"----------\n");
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=130516
public void test195() {

}
// no override between package private methods
public void test197() {
	String expectedOutput = new CompilerOptions(getCompilerOptions()).sourceLevel < ClassFileConstants.JDK1_6
	?	"----------\n" + 
		"1. WARNING in p\\X.java (at line 4)\n" + 
		"	void foo() {\n" + 
		"	     ^^^^^\n" + 
		"The method X.foo() does not override the inherited method from OldStuff since it is private to a different package\n" + 
		"----------\n" + 
		"2. ERROR in p\\X.java (at line 4)\n" + 
		"	void foo() {\n" + 
		"	     ^^^^^\n" + 
		"The method foo() of type X must override a superclass method\n" + 
		"----------\n"
	:	"----------\n" + 
		"1. WARNING in p\\X.java (at line 4)\n" + 
		"	void foo() {\n" + 
		"	     ^^^^^\n" + 
		"The method X.foo() does not override the inherited method from OldStuff since it is private to a different package\n" + 
		"----------\n" + 
		"2. ERROR in p\\X.java (at line 4)\n" + 
		"	void foo() {\n" + 
		"	     ^^^^^\n" + 
		"The method foo() of type X must override or implement a supertype method\n" + 
		"----------\n";		
    this.runNegativeTest(
        new String[] {
            "p/X.java",

			"	}	\n" + 
			"}\n",
        },
        expectedOutput);
		"1. WARNING in p\\X.java (at line 4)\n" + 
		"	void foo() {\n" + 
		"	     ^^^^^\n" + 
		"The method X.foo() does not override the inherited method from OldStuff since it is private to a different package\n" + 
		"----------\n" + 
		"2. ERROR in p\\X.java (at line 4)\n" + 
		"	void foo() {\n" + 
		"	     ^^^^^\n" + 
		"The method foo() of type X must override a superclass method\n" + 
		"----------\n");
}    
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=134129
public void test198() {

		"The value for annotation attribute MyAnnotation.values must be an array initializer\n" + 
		"----------\n");
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=141931
public void test214() {
	String expectedOutput = new CompilerOptions(getCompilerOptions()).sourceLevel < ClassFileConstants.JDK1_6
		?	"----------\n" + 
			"1. ERROR in X.java (at line 3)\n" + 
			"	void foo();\n" + 
			"	     ^^^^^\n" + 
			"The method foo() of type I must override a superclass method\n" + 
			"----------\n" + 
			"2. ERROR in X.java (at line 8)\n" + 
			"	public void foo() {}\n" + 
			"	            ^^^^^\n" + 
			"The method foo() of type X must override a superclass method\n" + 
			"----------\n" + 
			"3. ERROR in X.java (at line 13)\n" + 
			"	void foo();\n" + 
			"	     ^^^^^\n" + 
			"The method foo() of type J must override a superclass method\n" + 
			"----------\n"
		:	"----------\n" + 
			"1. ERROR in X.java (at line 3)\n" + 
			"	void foo();\n" + 
			"	     ^^^^^\n" + 
			"The method foo() of type I must override or implement a supertype method\n" + 
			"----------\n";
    this.runNegativeTest(
        new String[] {
            "X.java",
			"interface I {\n" + 
			"  @Override\n" + 
			"  void foo();\n" + 
			"  void bar();\n" + 
			"}\n" + 
			"public class X implements I {\n" + 
			"  @Override\n" + 
			"  public void foo() {}\n" + 
			"  public void bar() {}\n" + 
			"}\n" + 
			"interface J extends I {\n" + 
			"	@Override\n" + 
			"	void foo();\n" + 
			"}\n",
        },
        expectedOutput);
}
}

Return to bug 141931

Lines 151-170 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/ast/MethodDeclaration.java (-6 / +15 lines)
151	final CompilerOptions compilerOptions = this.scope.compilerOptions();	151	final CompilerOptions compilerOptions = this.scope.compilerOptions();
152	checkOverride: {	152	checkOverride: {
153	if (this.binding == null) break checkOverride;	153	if (this.binding == null) break checkOverride;
154	if (compilerOptions.sourceLevel < ClassFileConstants.JDK1_5) break checkOverride;	154	long sourceLevel = compilerOptions.sourceLevel;
		155	if (sourceLevel < ClassFileConstants.JDK1_5) break checkOverride;
155	int bindingModifiers = this.binding.modifiers;	156	int bindingModifiers = this.binding.modifiers;
156	boolean hasOverrideAnnotation = (this.binding.tagBits & TagBits.AnnotationOverride) != 0;	157	boolean hasOverrideAnnotation = (this.binding.tagBits & TagBits.AnnotationOverride) != 0;
157	boolean isInterfaceMethod = this.binding.declaringClass.isInterface();	158	boolean isInterfaceMethod = this.binding.declaringClass.isInterface();
158	if (hasOverrideAnnotation) {	159	if (hasOverrideAnnotation) {
159	if ((bindingModifiers & ExtraCompilerModifiers.AccOverriding) == 0 \|\| isInterfaceMethod \|\| this.binding.isStatic())	160	// no static method is considered overriding
160	// claims to override, and doesn't actually do so	161	if (!isInterfaceMethod && (bindingModifiers & (ClassFileConstants.AccStatic\|ExtraCompilerModifiers.AccOverriding)) == ExtraCompilerModifiers.AccOverriding)
161	this.scope.problemReporter().methodMustOverride(this);	162	break checkOverride;
162	} else if (!isInterfaceMethod && (bindingModifiers & (ClassFileConstants.AccStatic\|ExtraCompilerModifiers.AccOverriding)) == ExtraCompilerModifiers.AccOverriding) {	163	// in 1.5, strictly for overriding superclass method
		164	// in 1.6 and above, also tolerate implementing interface method
		165	if (sourceLevel >= ClassFileConstants.JDK1_6
		166	&& ((bindingModifiers & (ClassFileConstants.AccStatic\|ExtraCompilerModifiers.AccImplementing)) == ExtraCompilerModifiers.AccImplementing))
		167	break checkOverride;
		168	// claims to override, and doesn't actually do so
		169	this.scope.problemReporter().methodMustOverride(this);
		170	} else if (!isInterfaceMethod
		171	&& (bindingModifiers & (ClassFileConstants.AccStatic\|ExtraCompilerModifiers.AccOverriding)) == ExtraCompilerModifiers.AccOverriding) {
163	// actually overrides, but did not claim to do so	172	// actually overrides, but did not claim to do so
164	this.scope.problemReporter().missingOverrideAnnotation(this);	173	this.scope.problemReporter().missingOverrideAnnotation(this);
165	}	174	}
166	}	175	}
167		176
168	// by grammatical construction, interface methods are always abstract	177	// by grammatical construction, interface methods are always abstract
169	switch (TypeDeclaration.kind(this.scope.referenceType().modifiers)) {	178	switch (TypeDeclaration.kind(this.scope.referenceType().modifiers)) {
170	case TypeDeclaration.ENUM_DECL :	179	case TypeDeclaration.ENUM_DECL :

Lines 20-25 Link Here

(-)src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java (-17 / +31 lines)
20	import org.eclipse.jdt.core.tests.util.AbstractCompilerTest;	20	import org.eclipse.jdt.core.tests.util.AbstractCompilerTest;
21	import org.eclipse.jdt.core.tests.util.Util;	21	import org.eclipse.jdt.core.tests.util.Util;
22	import org.eclipse.jdt.core.util.ClassFileBytesDisassembler;	22	import org.eclipse.jdt.core.util.ClassFileBytesDisassembler;
		23	import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
23	import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;	24	import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
24		25
25	public class GenericTypeTest extends AbstractComparableTest {	26	public class GenericTypeTest extends AbstractComparableTest {
Lines 32-38 Link Here
32	// All specified tests which does not belong to the class are skipped...	33	// All specified tests which does not belong to the class are skipped...
33	static {	34	static {
34	// TESTS_NAMES = new String[] { "test0788" };	35	// TESTS_NAMES = new String[] { "test0788" };
35	TESTS_NUMBERS = new int[] { 1050, 1054 };	36	// TESTS_NUMBERS = new int[] { 1050, 1054 };
36	// TESTS_RANGE = new int[] { 821, -1 };	37	// TESTS_RANGE = new int[] { 821, -1 };
37	}	38	}
38	public static Test suite() {	39	public static Test suite() {
Lines 31228-31233 Link Here
31228	}	31229	}
31229	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=140643	31230	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=140643
31230	public void test0987() {	31231	public void test0987() {
		31232	String expectedOutput = new CompilerOptions(getCompilerOptions()).sourceLevel < ClassFileConstants.JDK1_6
		31233	? "----------\n" +
		31234	"1. ERROR in X.java (at line 7)\n" +
		31235	" abstract class GLinkElementView<M,CM> extends AbstractLinkView<M> {}\n" +
		31236	" ^^^^^^^^^^^^^^^^\n" +
		31237	"The return type is incompatible with EditPart.getViewer(), AbstractLinkView<M>.getViewer()\n" +
		31238	"----------\n" +
		31239	"2. ERROR in X.java (at line 11)\n" +
		31240	" public ISheetViewer getViewer() { return null; } \n" +
		31241	" ^^^^^^^^^^^\n" +
		31242	"The return type is incompatible with EditPart.getViewer()\n" +
		31243	"----------\n" +
		31244	"3. ERROR in X.java (at line 11)\n" +
		31245	" public ISheetViewer getViewer() { return null; } \n" +
		31246	" ^^^^^^^^^^^\n" +
		31247	"The method getViewer() of type AbstractLinkView<M> must override a superclass method\n" +
		31248	"----------\n"
		31249	: "----------\n" +
		31250	"1. ERROR in X.java (at line 7)\n" +
		31251	" abstract class GLinkElementView<M,CM> extends AbstractLinkView<M> {}\n" +
		31252	" ^^^^^^^^^^^^^^^^\n" +
		31253	"The return type is incompatible with EditPart.getViewer(), AbstractLinkView<M>.getViewer()\n" +
		31254	"----------\n" +
		31255	"2. ERROR in X.java (at line 11)\n" +
		31256	" public ISheetViewer getViewer() { return null; } \n" +
		31257	" ^^^^^^^^^^^\n" +
		31258	"The return type is incompatible with EditPart.getViewer()\n" +
		31259	"----------\n";
31231	this.runNegativeTest(	31260	this.runNegativeTest(
31232	new String[] {	31261	new String[] {
31233	"X.java",//===================	31262	"X.java",//===================
Lines 31262-31283 Link Here
31262	"\n" +	31291	"\n" +
31263	"interface EditPartViewer {}\n", // =================	31292	"interface EditPartViewer {}\n", // =================
31264	},	31293	},
31265	"----------\n" +	31294	expectedOutput);
31266	"1. ERROR in X.java (at line 7)\n" +
31267	" abstract class GLinkElementView<M,CM> extends AbstractLinkView<M> {}\n" +
31268	" ^^^^^^^^^^^^^^^^\n" +
31269	"The return type is incompatible with EditPart.getViewer(), AbstractLinkView<M>.getViewer()\n" +
31270	"----------\n" +
31271	"2. ERROR in X.java (at line 11)\n" +
31272	" public ISheetViewer getViewer() { return null; } \n" +
31273	" ^^^^^^^^^^^\n" +
31274	"The return type is incompatible with EditPart.getViewer()\n" +
31275	"----------\n" +
31276	"3. ERROR in X.java (at line 11)\n" +
31277	" public ISheetViewer getViewer() { return null; } \n" +
31278	" ^^^^^^^^^^^\n" +
31279	"The method getViewer() of type AbstractLinkView<M> must override a superclass method\n" +
31280	"----------\n");
31281	}	31295	}
31282	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=140643 - variation	31296	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=140643 - variation
31283	public void test0988() {	31297	public void test0988() {

Lines 2437-2442 Link Here

(-)src/org/eclipse/jdt/core/tests/compiler/regression/AnnotationTest.java (-51 / +146 lines)
2437	}	2437	}
2438	// check @Override annotation - strictly for superclasses (overrides) and not interfaces (implements)	2438	// check @Override annotation - strictly for superclasses (overrides) and not interfaces (implements)
2439	public void test077() {	2439	public void test077() {
		2440	String expectedOutput = new CompilerOptions(getCompilerOptions()).sourceLevel < ClassFileConstants.JDK1_6
		2441	? "----------\n" +
		2442	"1. ERROR in X.java (at line 14)\n" +
		2443	" void foo() {}\n" +
		2444	" ^^^^^\n" +
		2445	"The method foo() of type X must override a superclass method\n" +
		2446	"----------\n" +
		2447	"2. ERROR in X.java (at line 18)\n" +
		2448	" public void baz() {}\n" +
		2449	" ^^^^^\n" +
		2450	"The method baz() of type X must override a superclass method\n" +
		2451	"----------\n"
		2452	: "----------\n" +
		2453	"1. ERROR in X.java (at line 14)\n" +
		2454	" void foo() {}\n" +
		2455	" ^^^^^\n" +
		2456	"The method foo() of type X must override or implement a supertype method\n" +
		2457	"----------\n";
2440	this.runNegativeTest(	2458	this.runNegativeTest(
2441	new String[] {	2459	new String[] {
2442	"X.java",	2460	"X.java",
Lines 2460-2476 Link Here
2460	" public void baz() {}\n" +	2478	" public void baz() {}\n" +
2461	"}\n"	2479	"}\n"
2462	},	2480	},
2463	"----------\n" +	2481	expectedOutput);
2464	"1. ERROR in X.java (at line 14)\n" +
2465	" void foo() {}\n" +
2466	" ^^^^^\n" +
2467	"The method foo() of type X must override a superclass method\n" +
2468	"----------\n" +
2469	"2. ERROR in X.java (at line 18)\n" +
2470	" public void baz() {}\n" +
2471	" ^^^^^\n" +
2472	"The method baz() of type X must override a superclass method\n" +
2473	"----------\n");
2474	}	2482	}
2475		2483
2476	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=80114	2484	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=80114
Lines 4488-4493 Link Here
4488	}	4496	}
4489	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=90111 - variation	4497	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=90111 - variation
4490	public void test140() {	4498	public void test140() {
		4499	String expectedOutput = new CompilerOptions(getCompilerOptions()).sourceLevel < ClassFileConstants.JDK1_6
		4500	? "----------\n" +
		4501	"1. ERROR in X.java (at line 6)\r\n" +
		4502	" static void foo(){} \r\n" +
		4503	" ^^^^^\n" +
		4504	"The method foo() of type Bar must override a superclass method\n" +
		4505	"----------\n"
		4506	: "----------\n" +
		4507	"1. ERROR in X.java (at line 6)\n" +
		4508	" static void foo(){} \n" +
		4509	" ^^^^^\n" +
		4510	"The method foo() of type Bar must override or implement a supertype method\n" +
		4511	"----------\n";
4491	this.runNegativeTest(	4512	this.runNegativeTest(
4492	new String[] {	4513	new String[] {
4493	"X.java",	4514	"X.java",
Lines 4500-4511 Link Here
4500	"}\n" +	4521	"}\n" +
4501	"\n"	4522	"\n"
4502	},	4523	},
4503	"----------\n" +	4524	expectedOutput);
4504	"1. ERROR in X.java (at line 6)\r\n" +
4505	" static void foo(){} \r\n" +
4506	" ^^^^^\n" +
4507	"The method foo() of type Bar must override a superclass method\n" +
4508	"----------\n");
4509	}	4525	}
4510	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=94867	4526	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=94867
4511	public void test141() {	4527	public void test141() {
Lines 5611-5617 Link Here
5611	}	5627	}
5612	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=94759	5628	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=94759
5613	public void test168() {	5629	public void test168() {
5614	this.runNegativeTest(	5630	String expectedOutput = new CompilerOptions(getCompilerOptions()).sourceLevel < ClassFileConstants.JDK1_6
		5631	? "----------\n" +
		5632	"1. ERROR in X.java (at line 2)\n" +
		5633	" @Override I clone();\n" +
		5634	" ^^^^^^^\n" +
		5635	"The method clone() of type I must override a superclass method\n" +
		5636	"----------\n" +
		5637	"2. ERROR in X.java (at line 7)\n" +
		5638	" @Override void foo();\n" +
		5639	" ^^^^^\n" +
		5640	"The method foo() of type J must override a superclass method\n" +
		5641	"----------\n"
		5642	: "----------\n" +
		5643	"1. ERROR in X.java (at line 2)\n" +
		5644	" @Override I clone();\n" +
		5645	" ^^^^^^^\n" +
		5646	"The method clone() of type I must override or implement a supertype method\n" +
		5647	"----------\n";
		5648	this.runNegativeTest(
5615	new String[] {	5649	new String[] {
5616	"X.java",	5650	"X.java",
5617	"interface I {\n" +	5651	"interface I {\n" +
Lines 5623-5639 Link Here
5623	" @Override void foo();\n" +	5657	" @Override void foo();\n" +
5624	"}\n",	5658	"}\n",
5625	},	5659	},
5626	"----------\n" +	5660	expectedOutput);
5627	"1. ERROR in X.java (at line 2)\n" +
5628	" @Override I clone();\n" +
5629	" ^^^^^^^\n" +
5630	"The method clone() of type I must override a superclass method\n" +
5631	"----------\n" +
5632	"2. ERROR in X.java (at line 7)\n" +
5633	" @Override void foo();\n" +
5634	" ^^^^^\n" +
5635	"The method foo() of type J must override a superclass method\n" +
5636	"----------\n");
5637	}	5661	}
5638	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=97220	5662	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=97220
5639	public void test169() {	5663	public void test169() {
Lines 6417-6422 Link Here
6417	}	6441	}
6418	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=130017	6442	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=130017
6419	public void test194() {	6443	public void test194() {
		6444	String expectedOutput = new CompilerOptions(getCompilerOptions()).sourceLevel < ClassFileConstants.JDK1_6
		6445	? "----------\n" +
		6446	"1. ERROR in X.java (at line 5)\n" +
		6447	" @Override\n" +
		6448	" ^^^^^^^^^\n" +
		6449	"The annotation @Override is disallowed for this location\n" +
		6450	"----------\n" +
		6451	"2. ERROR in X.java (at line 9)\n" +
		6452	" public static void foo() {}\n" +
		6453	" ^^^^^\n" +
		6454	"The method foo() of type X must override a superclass method\n" +
		6455	"----------\n"
		6456	: "----------\n" +
		6457	"1. ERROR in X.java (at line 5)\n" +
		6458	" @Override\n" +
		6459	" ^^^^^^^^^\n" +
		6460	"The annotation @Override is disallowed for this location\n" +
		6461	"----------\n" +
		6462	"2. ERROR in X.java (at line 9)\n" +
		6463	" public static void foo() {}\n" +
		6464	" ^^^^^\n" +
		6465	"The method foo() of type X must override or implement a supertype method\n" +
		6466	"----------\n";
6420	this.runNegativeTest(	6467	this.runNegativeTest(
6421	new String[] {	6468	new String[] {
6422	"X.java",	6469	"X.java",
Lines 6431-6447 Link Here
6431	" public static void foo() {}\n" +	6478	" public static void foo() {}\n" +
6432	"}\n"	6479	"}\n"
6433	},	6480	},
6434	"----------\n" +	6481	expectedOutput);
6435	"1. ERROR in X.java (at line 5)\n" +
6436	" @Override\n" +
6437	" ^^^^^^^^^\n" +
6438	"The annotation @Override is disallowed for this location\n" +
6439	"----------\n" +
6440	"2. ERROR in X.java (at line 9)\n" +
6441	" public static void foo() {}\n" +
6442	" ^^^^^\n" +
6443	"The method foo() of type X must override a superclass method\n" +
6444	"----------\n");
6445	}	6482	}
6446	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=130516	6483	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=130516
6447	public void test195() {	6484	public void test195() {
Lines 6492-6497 Link Here
6492	}	6529	}
6493	// no override between package private methods	6530	// no override between package private methods
6494	public void test197() {	6531	public void test197() {
		6532	String expectedOutput = new CompilerOptions(getCompilerOptions()).sourceLevel < ClassFileConstants.JDK1_6
		6533	? "----------\n" +
		6534	"1. WARNING in p\\X.java (at line 4)\n" +
		6535	" void foo() {\n" +
		6536	" ^^^^^\n" +
		6537	"The method X.foo() does not override the inherited method from OldStuff since it is private to a different package\n" +
		6538	"----------\n" +
		6539	"2. ERROR in p\\X.java (at line 4)\n" +
		6540	" void foo() {\n" +
		6541	" ^^^^^\n" +
		6542	"The method foo() of type X must override a superclass method\n" +
		6543	"----------\n"
		6544	: "----------\n" +
		6545	"1. WARNING in p\\X.java (at line 4)\n" +
		6546	" void foo() {\n" +
		6547	" ^^^^^\n" +
		6548	"The method X.foo() does not override the inherited method from OldStuff since it is private to a different package\n" +
		6549	"----------\n" +
		6550	"2. ERROR in p\\X.java (at line 4)\n" +
		6551	" void foo() {\n" +
		6552	" ^^^^^\n" +
		6553	"The method foo() of type X must override or implement a supertype method\n" +
		6554	"----------\n";
6495	this.runNegativeTest(	6555	this.runNegativeTest(
6496	new String[] {	6556	new String[] {
6497	"p/X.java",	6557	"p/X.java",
Lines 6508-6524 Link Here
6508	" } \n" +	6568	" } \n" +
6509	"}\n",	6569	"}\n",
6510	},	6570	},
6511	"----------\n" +	6571	expectedOutput);
6512	"1. WARNING in p\\X.java (at line 4)\n" +
6513	" void foo() {\n" +
6514	" ^^^^^\n" +
6515	"The method X.foo() does not override the inherited method from OldStuff since it is private to a different package\n" +
6516	"----------\n" +
6517	"2. ERROR in p\\X.java (at line 4)\n" +
6518	" void foo() {\n" +
6519	" ^^^^^\n" +
6520	"The method foo() of type X must override a superclass method\n" +
6521	"----------\n");
6522	}	6572	}
6523	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=134129	6573	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=134129
6524	public void test198() {	6574	public void test198() {
Lines 7005-7008 Link Here
7005	"The value for annotation attribute MyAnnotation.values must be an array initializer\n" +	7055	"The value for annotation attribute MyAnnotation.values must be an array initializer\n" +
7006	"----------\n");	7056	"----------\n");
7007	}	7057	}
		7058	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=141931
		7059	public void test214() {
		7060	String expectedOutput = new CompilerOptions(getCompilerOptions()).sourceLevel < ClassFileConstants.JDK1_6
		7061	? "----------\n" +
		7062	"1. ERROR in X.java (at line 3)\n" +
		7063	" void foo();\n" +
		7064	" ^^^^^\n" +
		7065	"The method foo() of type I must override a superclass method\n" +
		7066	"----------\n" +
		7067	"2. ERROR in X.java (at line 8)\n" +
		7068	" public void foo() {}\n" +
		7069	" ^^^^^\n" +
		7070	"The method foo() of type X must override a superclass method\n" +
		7071	"----------\n" +
		7072	"3. ERROR in X.java (at line 13)\n" +
		7073	" void foo();\n" +
		7074	" ^^^^^\n" +
		7075	"The method foo() of type J must override a superclass method\n" +
		7076	"----------\n"
		7077	: "----------\n" +
		7078	"1. ERROR in X.java (at line 3)\n" +
		7079	" void foo();\n" +
		7080	" ^^^^^\n" +
		7081	"The method foo() of type I must override or implement a supertype method\n" +
		7082	"----------\n";
		7083	this.runNegativeTest(
		7084	new String[] {
		7085	"X.java",
		7086	"interface I {\n" +
		7087	" @Override\n" +
		7088	" void foo();\n" +
		7089	" void bar();\n" +
		7090	"}\n" +
		7091	"public class X implements I {\n" +
		7092	" @Override\n" +
		7093	" public void foo() {}\n" +
		7094	" public void bar() {}\n" +
		7095	"}\n" +
		7096	"interface J extends I {\n" +
		7097	" @Override\n" +
		7098	" void foo();\n" +
		7099	"}\n",
		7100	},
		7101	expectedOutput);
		7102	}
7008	}	7103	}