# HG changeset patch
# User sadayapalam
# Date 1499066910 -19800
# Node ID b2a0122861f578d2366a64b7f0648793bf382f06
# Parent  1017cd5d6506edcec88acf04e7c507086d9797e3
8068836: Error message should be updated when Override is used with static methods
Summary: Issue a more direct, specific error when @Override annotation is used with a static method
Reviewed-by: sadayapalam
Contributed-by: priya.lakshmi.muthuswamy@oracle.com

diff -r 1017cd5d6506 -r b2a0122861f5 langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java	Fri Jun 30 20:03:07 2017 +0200
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java	Mon Jul 03 12:58:30 2017 +0530
@@ -2052,7 +2052,7 @@
                 }
             }
             log.error(pos,
-                      explicitOverride ? Errors.MethodDoesNotOverrideSuperclass :
+                      explicitOverride ? (m.isStatic() ? Errors.StaticMethodsCannotBeAnnotatedWithOverride : Errors.MethodDoesNotOverrideSuperclass) :
                                 Errors.AnonymousDiamondMethodDoesNotOverrideSuperclass(Fragments.DiamondAnonymousMethodsImplicitlyOverride));
         }
     }
diff -r 1017cd5d6506 -r b2a0122861f5 langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties	Fri Jun 30 20:03:07 2017 +0200
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties	Mon Jul 03 12:58:30 2017 +0530
@@ -727,6 +727,9 @@
 compiler.err.method.does.not.override.superclass=\
     method does not override or implement a method from a supertype
 
+compiler.err.static.methods.cannot.be.annotated.with.override=\
+    static methods cannot be annotated with @Override
+
 compiler.err.missing.meth.body.or.decl.abstract=\
     missing method body, or declare abstract
 
diff -r 1017cd5d6506 -r b2a0122861f5 langtools/test/tools/javac/annotations/6359949/T6359949a.java
--- a/langtools/test/tools/javac/annotations/6359949/T6359949a.java	Fri Jun 30 20:03:07 2017 +0200
+++ b/langtools/test/tools/javac/annotations/6359949/T6359949a.java	Mon Jul 03 12:58:30 2017 +0530
@@ -1,7 +1,7 @@
 /*
  * @test    /nodynamiccopyright/
- * @bug     6359949
- * @summary (at)Override of static shouldn't be accepted (compiler shouldissue an error/warning)
+ * @bug     6359949 8068836
+ * @summary (at)Override of static methods shouldn't be accepted (compiler should issue an error)
  * @compile/fail/ref=T6359949a.out -XDrawDiagnostics  T6359949a.java
  */
 
diff -r 1017cd5d6506 -r b2a0122861f5 langtools/test/tools/javac/annotations/6359949/T6359949a.out
--- a/langtools/test/tools/javac/annotations/6359949/T6359949a.out	Fri Jun 30 20:03:07 2017 +0200
+++ b/langtools/test/tools/javac/annotations/6359949/T6359949a.out	Mon Jul 03 12:58:30 2017 +0530
@@ -1,2 +1,2 @@
-T6359949a.java:15:5: compiler.err.method.does.not.override.superclass
+T6359949a.java:15:5: compiler.err.static.methods.cannot.be.annotated.with.override
 1 error
diff -r 1017cd5d6506 -r b2a0122861f5 langtools/test/tools/javac/diags/examples/OverrideAnnotatedStaticMethod.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/diags/examples/OverrideAnnotatedStaticMethod.java	Mon Jul 03 12:58:30 2017 +0530
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.static.methods.cannot.be.annotated.with.override
+
+class Example {
+    public static void example(){
+    }
+}
+class OverrideAnnotatedStaticMethod extends Example {
+    @Override
+    public static void example(){
+    }
+}
\ No newline at end of file