JDK 9 RFR of JDK-8074126: Correct @see cross-refs to the JLS in java.lang[.annotation]
joe darcy
joe.darcy at oracle.com
Mon Mar 2 23:56:12 UTC 2015
PS Taking another scan of the changes, I'll also add links to the JLS
discussion of overriding in classes (chapter 8) and interfaces (chapter
9) to the Override annotation:
diff -r c9257ce77b6f src/java.base/share/classes/java/lang/Override.java
--- a/src/java.base/share/classes/java/lang/Override.java Mon Mar 02
13:37:30 2015 -0800
+++ b/src/java.base/share/classes/java/lang/Override.java Mon Mar 02
15:53:36 2015 -0800
@@ -43,7 +43,9 @@
*
* @author Peter von der Ahé
* @author Joshua Bloch
- * @jls 9.6.1.4 @Override
+ * @jls 8.4.8 Inheritance, Overriding, and Hiding
+ * @jls 9.4.1 Inheritance and Overriding
+ * @jls 9.6.4.4 @Override
* @since 1.5
*/
Thanks for the quick review,
-Joe
On 3/2/2015 3:49 PM, Lance Andersen wrote:
> +1
> On Mar 2, 2015, at 6:25 PM, joe darcy <joe.darcy at oracle.com
> <mailto:joe.darcy at oracle.com>> wrote:
>
>> Hello,
>>
>> Please review the straightforward changes below to correct and
>> supplement some @jls links from the core libs area into the Java
>> Language Specification. Patch at the end.
>>
>> Thanks to Helbig Wolfgang for indirectly pointing out this issue on
>> jdk9-dev.
>>
>> Cheers,
>>
>> -Joe
>>
>> diff -r c9257ce77b6f
>> src/java.base/share/classes/java/lang/FunctionalInterface.java
>> --- a/src/java.base/share/classes/java/lang/FunctionalInterface.java
>> Mon Mar 02 13:37:30 2015 -0800
>> +++ b/src/java.base/share/classes/java/lang/FunctionalInterface.java
>> Mon Mar 02 15:25:00 2015 -0800
>> @@ -1,5 +1,5 @@
>> /*
>> - * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All
>> rights reserved.
>> + * Copyright (c) 2012, 2015, 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
>> @@ -60,6 +60,7 @@
>> * @jls 4.3.2. The Class Object
>> * @jls 9.8 Functional Interfaces
>> * @jls 9.4.3 Interface Method Body
>> + * @jls 9.6.4.9 @FunctionalInterface
>> * @since 1.8
>> */
>> @Documented
>> diff -r c9257ce77b6f src/java.base/share/classes/java/lang/Override.java
>> --- a/src/java.base/share/classes/java/lang/Override.java Mon Mar
>> 02 13:37:30 2015 -0800
>> +++ b/src/java.base/share/classes/java/lang/Override.java Mon Mar
>> 02 15:25:00 2015 -0800
>> @@ -1,5 +1,5 @@
>> /*
>> - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All
>> rights reserved.
>> + * Copyright (c) 2003, 2015, 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
>> @@ -43,7 +43,7 @@
>> *
>> * @author Peter von der Ahé
>> * @author Joshua Bloch
>> - * @jls 9.6.1.4 @Override
>> + * @jls 9.6.4.4 @Override
>> * @since 1.5
>> */
>> @Target(ElementType.METHOD)
>> diff -r c9257ce77b6f
>> src/java.base/share/classes/java/lang/SafeVarargs.java
>> --- a/src/java.base/share/classes/java/lang/SafeVarargs.java Mon
>> Mar 02 13:37:30 2015 -0800
>> +++ b/src/java.base/share/classes/java/lang/SafeVarargs.java Mon
>> Mar 02 15:25:00 2015 -0800
>> @@ -1,5 +1,5 @@
>> /*
>> - * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All
>> rights reserved.
>> + * Copyright (c) 2010, 2015, 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
>> @@ -85,7 +85,7 @@
>> * @since 1.7
>> * @jls 4.7 Reifiable Types
>> * @jls 8.4.1 Formal Parameters
>> - * @jls 9.6.3.7 @SafeVarargs
>> + * @jls 9.6.4.7 @SafeVarargs
>> */
>> @Documented
>> @Retention(RetentionPolicy.RUNTIME)
>> diff -r c9257ce77b6f
>> src/java.base/share/classes/java/lang/SuppressWarnings.java
>> --- a/src/java.base/share/classes/java/lang/SuppressWarnings.java Mon
>> Mar 02 13:37:30 2015 -0800
>> +++ b/src/java.base/share/classes/java/lang/SuppressWarnings.java Mon
>> Mar 02 15:25:00 2015 -0800
>> @@ -1,5 +1,5 @@
>> /*
>> - * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All
>> rights reserved.
>> + * Copyright (c) 2004, 2015, 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
>> @@ -47,7 +47,7 @@
>> * @jls 4.12.2 Variables of Reference Type
>> * @jls 5.1.9 Unchecked Conversion
>> * @jls 5.5.2 Checked Casts and Unchecked Casts
>> - * @jls 9.6.3.5 @SuppressWarnings
>> + * @jls 9.6.4.5 @SuppressWarnings
>> */
>> @Target({TYPE, FIELD, METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE})
>> @Retention(RetentionPolicy.SOURCE)
>> diff -r c9257ce77b6f
>> src/java.base/share/classes/java/lang/annotation/Inherited.java
>> --- a/src/java.base/share/classes/java/lang/annotation/Inherited.java
>> Mon Mar 02 13:37:30 2015 -0800
>> +++ b/src/java.base/share/classes/java/lang/annotation/Inherited.java
>> Mon Mar 02 15:25:00 2015 -0800
>> @@ -1,5 +1,5 @@
>> /*
>> - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All
>> rights reserved.
>> + * Copyright (c) 2003, 2015, 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
>> @@ -44,7 +44,7 @@
>> *
>> * @author Joshua Bloch
>> * @since 1.5
>> - * @jls 9.6.3.3 @Inherited
>> + * @jls 9.6.4.3 @Inherited
>> */
>> @Documented
>> @Retention(RetentionPolicy.RUNTIME)
>> diff -r c9257ce77b6f
>> src/java.base/share/classes/java/lang/annotation/Repeatable.java
>> ---
>> a/src/java.base/share/classes/java/lang/annotation/Repeatable.java
>> Mon Mar 02 13:37:30 2015 -0800
>> +++
>> b/src/java.base/share/classes/java/lang/annotation/Repeatable.java
>> Mon Mar 02 15:25:00 2015 -0800
>> @@ -1,5 +1,5 @@
>> /*
>> - * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All
>> rights reserved.
>> + * Copyright (c) 2012, 2015, 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
>> @@ -33,8 +33,8 @@
>> * type</em> for the repeatable annotation type.
>> *
>> * @since 1.8
>> - * @jls 9.6 Annotation Types
>> - * @jls 9.7 Annotations
>> + * @jls 9.6.3 Repeatable Annotation Types
>> + * @jls 9.7.5 Multiple Annotations of the Same Type
>> */
>> @Documented
>> @Retention(RetentionPolicy.RUNTIME)
>> diff -r c9257ce77b6f
>> src/java.base/share/classes/java/lang/annotation/Retention.java
>> --- a/src/java.base/share/classes/java/lang/annotation/Retention.java
>> Mon Mar 02 13:37:30 2015 -0800
>> +++ b/src/java.base/share/classes/java/lang/annotation/Retention.java
>> Mon Mar 02 15:25:00 2015 -0800
>> @@ -1,5 +1,5 @@
>> /*
>> - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All
>> rights reserved.
>> + * Copyright (c) 2003, 2015, 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
>> @@ -38,7 +38,7 @@
>> *
>> * @author Joshua Bloch
>> * @since 1.5
>> - * @jls 9.6.3.2 @Retention
>> + * @jls 9.6.4.2 @Retention
>> */
>> @Documented
>> @Retention(RetentionPolicy.RUNTIME)
>> diff -r c9257ce77b6f
>> src/java.base/share/classes/java/lang/annotation/Target.java
>> --- a/src/java.base/share/classes/java/lang/annotation/Target.java
>> Mon Mar 02 13:37:30 2015 -0800
>> +++ b/src/java.base/share/classes/java/lang/annotation/Target.java
>> Mon Mar 02 15:25:00 2015 -0800
>> @@ -1,5 +1,5 @@
>> /*
>> - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All
>> rights reserved.
>> + * Copyright (c) 2003, 2015, 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
>> @@ -72,6 +72,7 @@
>> * @since 1.5
>> * @jls 9.6.4.1 @Target
>> * @jls 9.7.4 Where Annotations May Appear
>> + * @jls 9.7.5 Multiple Annotations of the Same Type
>> */
>> @Documented
>> @Retention(RetentionPolicy.RUNTIME)
>>
>
>
>
> Lance Andersen| Principal Member of Technical Staff | +1.781.442.2037
> Oracle Java Engineering
> 1 Network Drive
> Burlington, MA 01803
> <http://oracle.com/us/design/oracle-email-sig-198324.gif>Lance.Andersen at oracle.com
> <mailto:Lance.Andersen at oracle.com>
>
>
>
>
More information about the core-libs-dev
mailing list