archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-16 00:54:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8068836: Error message should be updated when Override is used with static methods

Browse source 
Issue a more direct, specific error when @Override annotation is used with a static method

Reviewed-by: sadayapalam
This commit is contained in:
Priya Lakshmi Muthuswamy 2017-07-03 12:58:30 +05:30 • committed by Srikanth Adayapalam
parent 6cc1fadb9a
commit 9797f94e75
5 changed files with 41 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
View file

@ -2052,7 +2052,7 @@ public class Check {
} }
} }
log.error(pos, log.error(pos,
explicitOverride ? Errors.MethodDoesNotOverrideSuperclass : explicitOverride ? (m.isStatic() ? Errors.StaticMethodsCannotBeAnnotatedWithOverride : Errors.MethodDoesNotOverrideSuperclass) :
Errors.AnonymousDiamondMethodDoesNotOverrideSuperclass(Fragments.DiamondAnonymousMethodsImplicitlyOverride)); Errors.AnonymousDiamondMethodDoesNotOverrideSuperclass(Fragments.DiamondAnonymousMethodsImplicitlyOverride));
} }
} }

3
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
View file

@ -727,6 +727,9 @@ compiler.err.malformed.fp.lit=\
compiler.err.method.does.not.override.superclass=\ compiler.err.method.does.not.override.superclass=\
method does not override or implement a method from a supertype 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=\ compiler.err.missing.meth.body.or.decl.abstract=\
missing method body, or declare abstract missing method body, or declare abstract

4
langtools/test/tools/javac/annotations/6359949/T6359949a.java
View file

@ -1,7 +1,7 @@
/* /*
* @test /nodynamiccopyright/ * @test /nodynamiccopyright/
* @bug 6359949 * @bug 6359949 8068836
* @summary (at)Override of static shouldn't be accepted (compiler shouldissue an error/warning) * @summary (at)Override of static methods shouldn't be accepted (compiler should issue an error)
* @compile/fail/ref=T6359949a.out -XDrawDiagnostics T6359949a.java * @compile/fail/ref=T6359949a.out -XDrawDiagnostics T6359949a.java
*/ */

2
langtools/test/tools/javac/annotations/6359949/T6359949a.out
View file

@ -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 1 error

34
langtools/test/tools/javac/diags/examples/OverrideAnnotatedStaticMethod.java Normal file
View file

@ -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(){
}
}