diff options
| author | jjh <none@none> | 2011-04-13 11:35:43 -0700 |
|---|---|---|
| committer | jjh <none@none> | 2011-04-13 11:35:43 -0700 |
| commit | 1015ca8c8ad5adefff8a03cac606d35cdd3de423 (patch) | |
| tree | 386f0cb34376b3a6ec910c0eb556c37dc3e1e8c6 | |
| parent | a033f58d2c3d71329a2e2c4dbf4a6fe36b4538bd (diff) | |
7032975: API files in javax.annotation.processing need to be updated for references to JLS
7032972: API files in javax.tools need to updated for references to JVM Spec with editions/hyperlinks
7032978: API files in javax.tools need to be updated for references to JLS with editions/hyperlinks
Summary: Removed URLs and 'edition' references
Reviewed-by: jjg, darcy
107 files changed, 184 insertions, 171 deletions
diff --git a/make/build.properties b/make/build.properties index ad48717a..5c4ad09c 100644 --- a/make/build.properties +++ b/make/build.properties @@ -71,9 +71,18 @@ javac.version.opt = javac.lint.opts = -Xlint:all,-deprecation -Werror # options for the <javadoc> task for javac -javadoc.jls3.url=http://java.sun.com/docs/books/jls/ -javadoc.jls3.cite=<a href="${javadoc.jls3.url}">The Java Language Specification, Third Edition</a> -javadoc.jls3.option=-tag "jls3:a:See <cite>${javadoc.jls3.cite}</cite>:" +#javadoc.jls3.url=http://java.sun.com/docs/books/jls/ +#javadoc.jls3.cite=<a href="${javadoc.jls3.url}">The Java Language Specification, Third Edition</a> +#javadoc.jls3.option=-tag "jls3:a:See <cite>${javadoc.jls3.cite}</cite>:" + + +javadoc.jls.cite=The Java™ Language Specification + +javadoc.jls.option=-tag "jls:a:See <cite>${javadoc.jls.cite}</cite>:" + + + + # jtreg, used to run the JDK regression tests # See http://openjdk.java.net/jtreg/ diff --git a/make/build.xml b/make/build.xml index 6e9687bd..5141cfda 100644 --- a/make/build.xml +++ b/make/build.xml @@ -464,7 +464,7 @@ </target> <target name="javadoc-javac" depends="build-javac,-def-javadoc-tool"> - <javadoc-tool name="javac" includes="${javac.includes}" options="${javadoc.jls3.option}"/> + <javadoc-tool name="javac" includes="${javac.includes}" options="${javadoc.jls.option}"/> </target> <target name="jtreg-javac" depends="build-javac,build-javap,-def-jtreg"> diff --git a/src/share/classes/com/sun/javadoc/ClassDoc.java b/src/share/classes/com/sun/javadoc/ClassDoc.java index 03ce11cb..8eda69b4 100644 --- a/src/share/classes/com/sun/javadoc/ClassDoc.java +++ b/src/share/classes/com/sun/javadoc/ClassDoc.java @@ -311,8 +311,8 @@ public interface ClassDoc extends ProgramElementDoc, Type { /** * Get the list of classes and interfaces declared as imported. - * These are called "single-type-import declarations" in the - * Java Language Specification. + * These are called "single-type-import declarations" in + * <cite>The Java™ Language Specification</cite>. * * @return an array of ClassDoc representing the imported classes. * @@ -325,8 +325,8 @@ public interface ClassDoc extends ProgramElementDoc, Type { /** * Get the list of packages declared as imported. - * These are called "type-import-on-demand declarations" in the - * Java Language Specification. + * These are called "type-import-on-demand declarations" in + * <cite>The Java™ Language Specification</cite>. * * @return an array of PackageDoc representing the imported packages. * diff --git a/src/share/classes/com/sun/source/tree/AnnotationTree.java b/src/share/classes/com/sun/source/tree/AnnotationTree.java index 2ab8afb1..5a9074b2 100644 --- a/src/share/classes/com/sun/source/tree/AnnotationTree.java +++ b/src/share/classes/com/sun/source/tree/AnnotationTree.java @@ -36,7 +36,7 @@ import java.util.List; * {@code @}<em>annotationType</em> ( <em>arguments</em> ) * </pre> * - * @see "The Java Language Specification, 3rd ed, section 9.7" + * @jls section 9.7 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/ArrayAccessTree.java b/src/share/classes/com/sun/source/tree/ArrayAccessTree.java index b52307e2..7e5fc2cf 100644 --- a/src/share/classes/com/sun/source/tree/ArrayAccessTree.java +++ b/src/share/classes/com/sun/source/tree/ArrayAccessTree.java @@ -33,7 +33,7 @@ package com.sun.source.tree; * <em>expression</em> [ <em>index</em> ] * </pre> * - * @see "The Java Language Specification, 3rd ed, section 15.13" + * @jls section 15.13 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/ArrayTypeTree.java b/src/share/classes/com/sun/source/tree/ArrayTypeTree.java index bd6ef6c1..0c58a719 100644 --- a/src/share/classes/com/sun/source/tree/ArrayTypeTree.java +++ b/src/share/classes/com/sun/source/tree/ArrayTypeTree.java @@ -33,7 +33,7 @@ package com.sun.source.tree; * <em>type</em> [] * </pre> * - * @see "The Java Language Specification, 3rd ed, section 10.1" + * @jls section 10.1 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/AssertTree.java b/src/share/classes/com/sun/source/tree/AssertTree.java index 1212f7fd..fce758ed 100644 --- a/src/share/classes/com/sun/source/tree/AssertTree.java +++ b/src/share/classes/com/sun/source/tree/AssertTree.java @@ -35,7 +35,7 @@ package com.sun.source.tree; * assert <em>condition</em> : <em>detail</em> ; * </pre> * - * @see "The Java Language Specification, 3rd ed, section 14.10" + * @jls section 14.10 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/AssignmentTree.java b/src/share/classes/com/sun/source/tree/AssignmentTree.java index 0224d633..9c5480d5 100644 --- a/src/share/classes/com/sun/source/tree/AssignmentTree.java +++ b/src/share/classes/com/sun/source/tree/AssignmentTree.java @@ -33,7 +33,7 @@ package com.sun.source.tree; * <em>variable</em> = <em>expression</em> * </pre> * - * @see "The Java Language Specification, 3rd ed, section 15.26.1" + * @jls section 15.26.1 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/BinaryTree.java b/src/share/classes/com/sun/source/tree/BinaryTree.java index 21875f30..d24497a3 100644 --- a/src/share/classes/com/sun/source/tree/BinaryTree.java +++ b/src/share/classes/com/sun/source/tree/BinaryTree.java @@ -34,7 +34,7 @@ package com.sun.source.tree; * <em>leftOperand</em> <em>operator</em> <em>rightOperand</em> * </pre> * - * @see "The Java Language Specification, 3rd ed, sections 15.17 to 15.24" + * @jls sections 15.17 to 15.24 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/BlockTree.java b/src/share/classes/com/sun/source/tree/BlockTree.java index 1013f964..330309a0 100644 --- a/src/share/classes/com/sun/source/tree/BlockTree.java +++ b/src/share/classes/com/sun/source/tree/BlockTree.java @@ -39,7 +39,7 @@ import java.util.List; * static { <em>statements</em> } * </pre> * - * @see "The Java Language Specification, 3rd ed, section 14.2" + * @jls section 14.2 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/BreakTree.java b/src/share/classes/com/sun/source/tree/BreakTree.java index ae40b156..e287a981 100644 --- a/src/share/classes/com/sun/source/tree/BreakTree.java +++ b/src/share/classes/com/sun/source/tree/BreakTree.java @@ -37,7 +37,7 @@ import javax.lang.model.element.Name; * break <em>label</em> ; * </pre> * - * @see "The Java Language Specification, 3rd ed, section 14.15" + * @jls section 14.15 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/CaseTree.java b/src/share/classes/com/sun/source/tree/CaseTree.java index 717f00d8..a273c2ff 100644 --- a/src/share/classes/com/sun/source/tree/CaseTree.java +++ b/src/share/classes/com/sun/source/tree/CaseTree.java @@ -39,7 +39,7 @@ import java.util.List; * <em>statements</em> * </pre> * - * @see "The Java Language Specification, 3rd ed, section 14.11" + * @jls section 14.11 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/CatchTree.java b/src/share/classes/com/sun/source/tree/CatchTree.java index 29743866..9c34e860 100644 --- a/src/share/classes/com/sun/source/tree/CatchTree.java +++ b/src/share/classes/com/sun/source/tree/CatchTree.java @@ -34,7 +34,7 @@ package com.sun.source.tree; * <em>block</em> * </pre> * - * @see "The Java Language Specification, 3rd ed, section 14.20" + * @jls section 14.20 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/ClassTree.java b/src/share/classes/com/sun/source/tree/ClassTree.java index 4ff167a6..81c7c2f2 100644 --- a/src/share/classes/com/sun/source/tree/ClassTree.java +++ b/src/share/classes/com/sun/source/tree/ClassTree.java @@ -42,8 +42,7 @@ import javax.lang.model.element.Name; * } * </pre> * - * @see "The Java Language Specification, 3rd ed, - * sections 8.1, 8.9, 9.1, and 9.6" + * @jls sections 8.1, 8.9, 9.1, and 9.6 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/CompilationUnitTree.java b/src/share/classes/com/sun/source/tree/CompilationUnitTree.java index 6f130fc6..66b585cf 100644 --- a/src/share/classes/com/sun/source/tree/CompilationUnitTree.java +++ b/src/share/classes/com/sun/source/tree/CompilationUnitTree.java @@ -33,7 +33,7 @@ import com.sun.source.tree.LineMap; * Represents the abstract syntax tree for compilation units (source * files) and package declarations (package-info.java). * - * @see "The Java Language Specification, 3rd ed, sections 7.3, and 7.4" + * @jls sections 7.3, and 7.4 * * @author Peter von der Ahé * @since 1.6 diff --git a/src/share/classes/com/sun/source/tree/CompoundAssignmentTree.java b/src/share/classes/com/sun/source/tree/CompoundAssignmentTree.java index 37a292ca..86eb99c2 100644 --- a/src/share/classes/com/sun/source/tree/CompoundAssignmentTree.java +++ b/src/share/classes/com/sun/source/tree/CompoundAssignmentTree.java @@ -34,7 +34,7 @@ package com.sun.source.tree; * <em>variable</em> <em>operator</em> <em>expression</em> * </pre> * - * @see "The Java Language Specification, 3rd ed, section 15.26.2" + * @jls section 15.26.2 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/ConditionalExpressionTree.java b/src/share/classes/com/sun/source/tree/ConditionalExpressionTree.java index 6c9fb8c2..4492611f 100644 --- a/src/share/classes/com/sun/source/tree/ConditionalExpressionTree.java +++ b/src/share/classes/com/sun/source/tree/ConditionalExpressionTree.java @@ -33,7 +33,7 @@ package com.sun.source.tree; * <em>condition</em> ? <em>trueExpression</em> : <em>falseExpression</em> * </pre> * - * @see "The Java Language Specification, 3rd ed, section 15.25" + * @jls section 15.25 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/ContinueTree.java b/src/share/classes/com/sun/source/tree/ContinueTree.java index 0d141d86..98db3549 100644 --- a/src/share/classes/com/sun/source/tree/ContinueTree.java +++ b/src/share/classes/com/sun/source/tree/ContinueTree.java @@ -36,7 +36,7 @@ import javax.lang.model.element.Name; * continue <em>label</em> ; * </pre> * - * @see "The Java Language Specification, 3rd ed, section 14.16" + * @jls section 14.16 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/DoWhileLoopTree.java b/src/share/classes/com/sun/source/tree/DoWhileLoopTree.java index 70d98331..4a6e20b4 100644 --- a/src/share/classes/com/sun/source/tree/DoWhileLoopTree.java +++ b/src/share/classes/com/sun/source/tree/DoWhileLoopTree.java @@ -35,7 +35,7 @@ package com.sun.source.tree; * while ( <em>expression</em> ); * </pre> * - * @see "The Java Language Specification, 3rd ed, section 14.13" + * @jls section 14.13 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/EmptyStatementTree.java b/src/share/classes/com/sun/source/tree/EmptyStatementTree.java index d8b072a0..baf13c15 100644 --- a/src/share/classes/com/sun/source/tree/EmptyStatementTree.java +++ b/src/share/classes/com/sun/source/tree/EmptyStatementTree.java @@ -33,7 +33,7 @@ package com.sun.source.tree; * ; * </pre> * - * @see "The Java Language Specification, 3rd ed, section 14.6" + * @jls section 14.6 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/EnhancedForLoopTree.java b/src/share/classes/com/sun/source/tree/EnhancedForLoopTree.java index be486acb..f550bfaf 100644 --- a/src/share/classes/com/sun/source/tree/EnhancedForLoopTree.java +++ b/src/share/classes/com/sun/source/tree/EnhancedForLoopTree.java @@ -34,7 +34,7 @@ package com.sun.source.tree; * <em>statement</em> * </pre> * - * @see "The Java Language Specification, 3rd ed, section 14.14.2" + * @jls section 14.14.2 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/ExpressionStatementTree.java b/src/share/classes/com/sun/source/tree/ExpressionStatementTree.java index 099e9384..f3661c1d 100644 --- a/src/share/classes/com/sun/source/tree/ExpressionStatementTree.java +++ b/src/share/classes/com/sun/source/tree/ExpressionStatementTree.java @@ -33,7 +33,7 @@ package com.sun.source.tree; * <em>expression</em> ; * </pre> * - * @see "The Java Language Specification, 3rd ed, section 14.8" + * @jls section 14.8 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/ExpressionTree.java b/src/share/classes/com/sun/source/tree/ExpressionTree.java index 71ead42d..1ef4349f 100644 --- a/src/share/classes/com/sun/source/tree/ExpressionTree.java +++ b/src/share/classes/com/sun/source/tree/ExpressionTree.java @@ -29,7 +29,7 @@ package com.sun.source.tree; * A tree node used as the base class for the different types of * expressions. * - * @see "The Java Language Specification, 3rd ed, chapter 15" + * @jls chapter 15 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/ForLoopTree.java b/src/share/classes/com/sun/source/tree/ForLoopTree.java index 7e0f60a9..12e21b79 100644 --- a/src/share/classes/com/sun/source/tree/ForLoopTree.java +++ b/src/share/classes/com/sun/source/tree/ForLoopTree.java @@ -36,7 +36,7 @@ import java.util.List; * <em>statement</em> * </pre> * - * @see "The Java Language Specification, 3rd ed, section 14.14.1" + * @jls section 14.14.1 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/IdentifierTree.java b/src/share/classes/com/sun/source/tree/IdentifierTree.java index 4a973cfc..1d2d8adc 100644 --- a/src/share/classes/com/sun/source/tree/IdentifierTree.java +++ b/src/share/classes/com/sun/source/tree/IdentifierTree.java @@ -35,7 +35,7 @@ import javax.lang.model.element.Name; * <em>name</em> * </pre> * - * @see "The Java Language Specification, 3rd ed, section 6.5.6.1" + * @jls section 6.5.6.1 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/IfTree.java b/src/share/classes/com/sun/source/tree/IfTree.java index 30d225d8..f6009466 100644 --- a/src/share/classes/com/sun/source/tree/IfTree.java +++ b/src/share/classes/com/sun/source/tree/IfTree.java @@ -39,7 +39,7 @@ package com.sun.source.tree; * <em>elseStatement</em> * </pre> * - * @see "The Java Language Specification, 3rd ed, section 14.9" + * @jls section 14.9 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/ImportTree.java b/src/share/classes/com/sun/source/tree/ImportTree.java index 4a176ec8..1fd027d5 100644 --- a/src/share/classes/com/sun/source/tree/ImportTree.java +++ b/src/share/classes/com/sun/source/tree/ImportTree.java @@ -35,7 +35,7 @@ package com.sun.source.tree; * static import <em>qualifiedIdentifier</em> ; * </pre> * - * @see "The Java Language Specification, 3rd ed, section 7.5" + * @jls section 7.5 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/InstanceOfTree.java b/src/share/classes/com/sun/source/tree/InstanceOfTree.java index 5fb307ba..20d95e73 100644 --- a/src/share/classes/com/sun/source/tree/InstanceOfTree.java +++ b/src/share/classes/com/sun/source/tree/InstanceOfTree.java @@ -33,7 +33,7 @@ package com.sun.source.tree; * <em>expression</em> instanceof <em>type</em> * </pre> * - * @see "The Java Language Specification, 3rd ed, section 15.20.2" + * @jls section 15.20.2 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/LabeledStatementTree.java b/src/share/classes/com/sun/source/tree/LabeledStatementTree.java index d7d7a353..ba58dd48 100644 --- a/src/share/classes/com/sun/source/tree/LabeledStatementTree.java +++ b/src/share/classes/com/sun/source/tree/LabeledStatementTree.java @@ -35,7 +35,7 @@ import javax.lang.model.element.Name; * <em>label</em> : <em>statement</em> * </pre> * - * @see "The Java Language Specification, 3rd ed, section 14.7" + * @jls section 14.7 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/LiteralTree.java b/src/share/classes/com/sun/source/tree/LiteralTree.java index 76a91551..a8be528c 100644 --- a/src/share/classes/com/sun/source/tree/LiteralTree.java +++ b/src/share/classes/com/sun/source/tree/LiteralTree.java @@ -34,7 +34,7 @@ package com.sun.source.tree; * <em>value</em> * </pre> * - * @see "The Java Language Specification, 3rd ed, section 15.28" + * @jls section 15.28 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/MemberSelectTree.java b/src/share/classes/com/sun/source/tree/MemberSelectTree.java index d0332c02..e5beec5d 100644 --- a/src/share/classes/com/sun/source/tree/MemberSelectTree.java +++ b/src/share/classes/com/sun/source/tree/MemberSelectTree.java @@ -35,8 +35,7 @@ import javax.lang.model.element.Name; * <em>expression</em> . <em>identifier</em> * </pre> * - * @see "The Java Language Specification, 3rd ed, sections 6.5, - * 15.11, and 15.12" + * @jls sections 6.5, 15.11,and 15.12 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/MethodInvocationTree.java b/src/share/classes/com/sun/source/tree/MethodInvocationTree.java index 1d1cbab8..4728d996 100644 --- a/src/share/classes/com/sun/source/tree/MethodInvocationTree.java +++ b/src/share/classes/com/sun/source/tree/MethodInvocationTree.java @@ -37,7 +37,7 @@ import java.util.List; * this . <em>typeArguments</em> <em>identifier</em> ( <em>arguments</em> ) * </pre> * - * @see "The Java Language Specification, 3rd ed, section 15.12" + * @jls section 15.12 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/MethodTree.java b/src/share/classes/com/sun/source/tree/MethodTree.java index 074c8c08..8dfd0ba8 100644 --- a/src/share/classes/com/sun/source/tree/MethodTree.java +++ b/src/share/classes/com/sun/source/tree/MethodTree.java @@ -40,8 +40,7 @@ import javax.lang.model.element.Name; * <em>modifiers</em> <em>type</em> <em>name</em> () default <em>defaultValue</em> * </pre> * - * @see "The Java Language Specification, 3rd ed, sections 8.4, 8.6, 8.7, - * 9.4, and 9.6" + * @jls sections 8.4, 8.6, 8.7, 9.4, and 9.6 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/ModifiersTree.java b/src/share/classes/com/sun/source/tree/ModifiersTree.java index 8aeee844..3189651e 100644 --- a/src/share/classes/com/sun/source/tree/ModifiersTree.java +++ b/src/share/classes/com/sun/source/tree/ModifiersTree.java @@ -39,8 +39,7 @@ import javax.lang.model.element.Modifier; * <em>flags</em> <em>annotations</em> * </pre> * - * @see "The Java Language Specification, 3rd ed, sections - * 8.1.1, 8.3.1, 8.4.3, 8.5.1, 8.8.3, 9.1.1, and 9.7" + * @jls sections 8.1.1, 8.3.1, 8.4.3, 8.5.1, 8.8.3, 9.1.1, and 9.7 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/NewArrayTree.java b/src/share/classes/com/sun/source/tree/NewArrayTree.java index bff2108e..cdd5cd51 100644 --- a/src/share/classes/com/sun/source/tree/NewArrayTree.java +++ b/src/share/classes/com/sun/source/tree/NewArrayTree.java @@ -37,7 +37,7 @@ import java.util.List; * new <em>type</em> <em>dimensions</em> [ ] <em>initializers</em> * </pre> * - * @see "The Java Language Specification, 3rd ed, section 15.10" + * @jls section 15.10 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/NewClassTree.java b/src/share/classes/com/sun/source/tree/NewClassTree.java index aed47b0a..06d713be 100644 --- a/src/share/classes/com/sun/source/tree/NewClassTree.java +++ b/src/share/classes/com/sun/source/tree/NewClassTree.java @@ -42,7 +42,7 @@ import java.util.List; * <em>enclosingExpression</em>.new <em>identifier</em> ( <em>arguments</em> ) * </pre> * - * @see "The Java Language Specification, 3rd ed, section 15.9" + * @jls section 15.9 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/ParameterizedTypeTree.java b/src/share/classes/com/sun/source/tree/ParameterizedTypeTree.java index 7f88ddf1..aef328dd 100644 --- a/src/share/classes/com/sun/source/tree/ParameterizedTypeTree.java +++ b/src/share/classes/com/sun/source/tree/ParameterizedTypeTree.java @@ -35,7 +35,7 @@ import java.util.List; * <em>type</em> < <em>typeArguments</em> > * </pre> * - * @see "The Java Language Specification, 3rd ed, section 4.5.1" + * @jls section 4.5.1 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/ParenthesizedTree.java b/src/share/classes/com/sun/source/tree/ParenthesizedTree.java index 9290fd23..d68516fa 100644 --- a/src/share/classes/com/sun/source/tree/ParenthesizedTree.java +++ b/src/share/classes/com/sun/source/tree/ParenthesizedTree.java @@ -34,7 +34,7 @@ package com.sun.source.tree; * ( <em>expression</em> ) * </pre> * - * @see "The Java Language Specification, 3rd ed, section 15.8.5" + * @jls section 15.8.5 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/PrimitiveTypeTree.java b/src/share/classes/com/sun/source/tree/PrimitiveTypeTree.java index 0e1f95f7..f6cd5669 100644 --- a/src/share/classes/com/sun/source/tree/PrimitiveTypeTree.java +++ b/src/share/classes/com/sun/source/tree/PrimitiveTypeTree.java @@ -35,7 +35,7 @@ import javax.lang.model.type.TypeKind; * <em>primitiveTypeKind</em> * </pre> * - * @see "The Java Language Specification, 3rd ed, section 4.2" + * @jls section 4.2 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/ReturnTree.java b/src/share/classes/com/sun/source/tree/ReturnTree.java index e785be6d..62a51cb3 100644 --- a/src/share/classes/com/sun/source/tree/ReturnTree.java +++ b/src/share/classes/com/sun/source/tree/ReturnTree.java @@ -34,7 +34,7 @@ package com.sun.source.tree; * return <em>expression</em>; * </pre> * - * @see "The Java Language Specification, 3rd ed, section 14.17" + * @jls section 14.17 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/StatementTree.java b/src/share/classes/com/sun/source/tree/StatementTree.java index 24b8bd3c..47dba7dd 100644 --- a/src/share/classes/com/sun/source/tree/StatementTree.java +++ b/src/share/classes/com/sun/source/tree/StatementTree.java @@ -29,7 +29,7 @@ package com.sun.source.tree; * A tree node used as the base class for the different kinds of * statements. * - * @see "The Java Language Specification, 3rd ed, chapter 14" + * @jls chapter 14 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/SwitchTree.java b/src/share/classes/com/sun/source/tree/SwitchTree.java index 5cc5186a..c5a87c42 100644 --- a/src/share/classes/com/sun/source/tree/SwitchTree.java +++ b/src/share/classes/com/sun/source/tree/SwitchTree.java @@ -37,7 +37,7 @@ import java.util.List; * } * </pre> * - * @see "The Java Language Specification, 3rd ed, section 14.11" + * @jls section 14.11 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/SynchronizedTree.java b/src/share/classes/com/sun/source/tree/SynchronizedTree.java index 17d1441c..20c9a442 100644 --- a/src/share/classes/com/sun/source/tree/SynchronizedTree.java +++ b/src/share/classes/com/sun/source/tree/SynchronizedTree.java @@ -34,7 +34,7 @@ package com.sun.source.tree; * </em>block</em> * </pre> * - * @see "The Java Language Specification, 3rd ed, section 14.19" + * @jls section 14.19 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/ThrowTree.java b/src/share/classes/com/sun/source/tree/ThrowTree.java index e30e31b5..a91f63b0 100644 --- a/src/share/classes/com/sun/source/tree/ThrowTree.java +++ b/src/share/classes/com/sun/source/tree/ThrowTree.java @@ -33,7 +33,7 @@ package com.sun.source.tree; * throw <em>expression</em>; * </pre> * - * @see "The Java Language Specification, 3rd ed, section 14.18" + * @jls section 14.18 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/TryTree.java b/src/share/classes/com/sun/source/tree/TryTree.java index 24c185dc..f2510bd5 100644 --- a/src/share/classes/com/sun/source/tree/TryTree.java +++ b/src/share/classes/com/sun/source/tree/TryTree.java @@ -39,7 +39,7 @@ import java.util.List; * <em>finallyBlock</em> * </pre> * - * @see "The Java Language Specification, 3rd ed, section 14.20" + * @jls section 14.20 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/TypeCastTree.java b/src/share/classes/com/sun/source/tree/TypeCastTree.java index 682b5403..43dc6192 100644 --- a/src/share/classes/com/sun/source/tree/TypeCastTree.java +++ b/src/share/classes/com/sun/source/tree/TypeCastTree.java @@ -33,7 +33,7 @@ package com.sun.source.tree; * ( <em>type</em> ) <em>expression</em> * </pre> * - * @see "The Java Language Specification, 3rd ed, section 15.16" + * @jls section 15.16 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/TypeParameterTree.java b/src/share/classes/com/sun/source/tree/TypeParameterTree.java index 66e8757e..6a603389 100644 --- a/src/share/classes/com/sun/source/tree/TypeParameterTree.java +++ b/src/share/classes/com/sun/source/tree/TypeParameterTree.java @@ -38,7 +38,7 @@ import javax.lang.model.element.Name; * <em>name</em> extends <em>bounds</em> * </pre> * - * @see "The Java Language Specification, 3rd ed, section 4.4" + * @jls section 4.4 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/UnaryTree.java b/src/share/classes/com/sun/source/tree/UnaryTree.java index ed843c98..7b4d9e83 100644 --- a/src/share/classes/com/sun/source/tree/UnaryTree.java +++ b/src/share/classes/com/sun/source/tree/UnaryTree.java @@ -36,7 +36,7 @@ package com.sun.source.tree; * <em>expression</em> <em>operator</em> * </pre> * - * @see "The Java Language Specification, 3rd ed, sections 15.14 and 15.15" + * @jls sections 15.14 and 15.15 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/VariableTree.java b/src/share/classes/com/sun/source/tree/VariableTree.java index 6d7f65f5..ea73f23a 100644 --- a/src/share/classes/com/sun/source/tree/VariableTree.java +++ b/src/share/classes/com/sun/source/tree/VariableTree.java @@ -35,7 +35,7 @@ import javax.lang.model.element.Name; * <em>modifiers</em> <em>type</em> <em>name</em> <em>initializer</em> ; * </pre> * - * @see "The Java Language Specification, 3rd ed, sections 8.3 and 14.4" + * @jls sections 8.3 and 14.4 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/WhileLoopTree.java b/src/share/classes/com/sun/source/tree/WhileLoopTree.java index aec05f45..fd4a832a 100644 --- a/src/share/classes/com/sun/source/tree/WhileLoopTree.java +++ b/src/share/classes/com/sun/source/tree/WhileLoopTree.java @@ -35,7 +35,7 @@ package com.sun.source.tree; * </pre> * * - * @see "The Java Language Specification, 3rd ed, section 14.12" + * @jls section 14.12 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/source/tree/WildcardTree.java b/src/share/classes/com/sun/source/tree/WildcardTree.java index e6a98d0d..d3f62fd0 100644 --- a/src/share/classes/com/sun/source/tree/WildcardTree.java +++ b/src/share/classes/com/sun/source/tree/WildcardTree.java @@ -38,7 +38,7 @@ package com.sun.source.tree; * ? super <em>bound</em> * </pre> * - * @see "The Java Language Specification, 3rd ed, section 4.5.1" + * @jls section 4.5.1 * * @author Peter von der Ahé * @author Jonathan Gibbons diff --git a/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java b/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java index 7373804e..02f59ff0 100644 --- a/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java +++ b/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java @@ -67,7 +67,8 @@ public class DeclarationsImpl implements Declarations { /** * {@inheritDoc} - * See JLS 2 sections 8.3 and 8.4.6. + * See sections 8.3 and 8.4.6 of + * <cite>The Java™ Language Specification</cite> */ public boolean hides(MemberDeclaration sub, MemberDeclaration sup) { Symbol hider = ((DeclarationImpl) sub).sym; @@ -107,7 +108,8 @@ public class DeclarationsImpl implements Declarations { /** * {@inheritDoc} - * See JLS 2 section 8.4.6.1. + * See section 8.4.6.1 of + * <cite>The Java™ Language Specification</cite> */ public boolean overrides(MethodDeclaration sub, MethodDeclaration sup) { MethodSymbol overrider = ((MethodDeclarationImpl) sub).sym; diff --git a/src/share/classes/com/sun/tools/classfile/AccessFlags.java b/src/share/classes/com/sun/tools/classfile/AccessFlags.java index e7ab8969..bb8faf3d 100644 --- a/src/share/classes/com/sun/tools/classfile/AccessFlags.java +++ b/src/share/classes/com/sun/tools/classfile/AccessFlags.java @@ -30,7 +30,7 @@ import java.util.LinkedHashSet; import java.util.Set; /** - * See JVMS3, sections 4.2, 4.6, 4.7. + * See JVMS, sections 4.2, 4.6, 4.7. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/Annotation.java b/src/share/classes/com/sun/tools/classfile/Annotation.java index 98eadc6e..8192d1a0 100644 --- a/src/share/classes/com/sun/tools/classfile/Annotation.java +++ b/src/share/classes/com/sun/tools/classfile/Annotation.java @@ -28,7 +28,7 @@ package com.sun.tools.classfile; import java.io.IOException; /** - * See JVMS3, section 4.8.16. + * See JVMS, section 4.8.16. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. @@ -71,7 +71,7 @@ public class Annotation { public final element_value_pair element_value_pairs[]; /** - * See JVMS3, section 4.8.16.1. + * See JVMS, section 4.8.16.1. */ public static abstract class element_value { public static element_value read(ClassReader cr) diff --git a/src/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java b/src/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java index 091a8fa2..1ca7fc45 100644 --- a/src/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java +++ b/src/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java @@ -28,7 +28,7 @@ package com.sun.tools.classfile; import java.io.IOException; /** - * See JVMS3, section 4.8.15. + * See JVMS, section 4.8.15. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java b/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java index 59b00f11..38043332 100644 --- a/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java +++ b/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java @@ -28,7 +28,7 @@ package com.sun.tools.classfile; import java.io.IOException; /** - * See JVMS3 <TBD> + * See JVMS <TBD> * http://cr.openjdk.java.net/~jrose/pres/indy-javadoc-mlvm/ * * <p><b>This is NOT part of any supported API. diff --git a/src/share/classes/com/sun/tools/classfile/ClassFile.java b/src/share/classes/com/sun/tools/classfile/ClassFile.java index affcad05..9a68f617 100644 --- a/src/share/classes/com/sun/tools/classfile/ClassFile.java +++ b/src/share/classes/com/sun/tools/classfile/ClassFile.java @@ -33,7 +33,7 @@ import java.io.InputStream; import static com.sun.tools.classfile.AccessFlags.*; /** - * See JVMS3, section 4.2. + * See JVMS, section 4.2. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/Code_attribute.java b/src/share/classes/com/sun/tools/classfile/Code_attribute.java index bc21154c..af34c2a4 100644 --- a/src/share/classes/com/sun/tools/classfile/Code_attribute.java +++ b/src/share/classes/com/sun/tools/classfile/Code_attribute.java @@ -30,7 +30,7 @@ import java.util.Iterator; import java.util.NoSuchElementException; /** - * See JVMS3, section 4.8.3. + * See JVMS, section 4.8.3. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/ConstantPool.java b/src/share/classes/com/sun/tools/classfile/ConstantPool.java index c9a48bf4..29a5ce34 100644 --- a/src/share/classes/com/sun/tools/classfile/ConstantPool.java +++ b/src/share/classes/com/sun/tools/classfile/ConstantPool.java @@ -31,7 +31,7 @@ import java.io.OutputStream; import java.util.Iterator; /** - * See JVMS3, section 4.5. + * See JVMS, section 4.5. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java b/src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java index 94a88cb3..df40defa 100644 --- a/src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java +++ b/src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java @@ -28,7 +28,7 @@ package com.sun.tools.classfile; import java.io.IOException; /** - * See JVMS3, section 4.8.2. + * See JVMS, section 4.8.2. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/Deprecated_attribute.java b/src/share/classes/com/sun/tools/classfile/Deprecated_attribute.java index 646ed3d5..dbf6442f 100644 --- a/src/share/classes/com/sun/tools/classfile/Deprecated_attribute.java +++ b/src/share/classes/com/sun/tools/classfile/Deprecated_attribute.java @@ -28,7 +28,7 @@ package com.sun.tools.classfile; import java.io.IOException; /** - * See JVMS3, section 4.8.15. + * See JVMS, section 4.8.15. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/Descriptor.java b/src/share/classes/com/sun/tools/classfile/Descriptor.java index ff194c96..28db3312 100644 --- a/src/share/classes/com/sun/tools/classfile/Descriptor.java +++ b/src/share/classes/com/sun/tools/classfile/Descriptor.java @@ -29,7 +29,7 @@ package com.sun.tools.classfile; import java.io.IOException; /** - * See JVMS3, section 4.4. + * See JVMS, section 4.4. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java b/src/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java index 2296810e..bdebe41e 100644 --- a/src/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java +++ b/src/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java @@ -29,7 +29,7 @@ package com.sun.tools.classfile; import java.io.IOException; /** - * See JVMS3, section 4.8.7. + * See JVMS, section 4.8.7. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java b/src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java index 05c301b3..a56db00b 100644 --- a/src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java +++ b/src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java @@ -28,7 +28,7 @@ package com.sun.tools.classfile; import java.io.IOException; /** - * See JVMS3, section 4.8.5. + * See JVMS, section 4.8.5. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java b/src/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java index 2033a9ea..153a7ed9 100644 --- a/src/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java +++ b/src/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java @@ -30,7 +30,7 @@ import java.io.IOException; import com.sun.tools.classfile.ConstantPool.*; /** - * See JVMS3, section 4.8.6. + * See JVMS, section 4.8.6. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/Instruction.java b/src/share/classes/com/sun/tools/classfile/Instruction.java index d6ca812a..a2d36f5d 100644 --- a/src/share/classes/com/sun/tools/classfile/Instruction.java +++ b/src/share/classes/com/sun/tools/classfile/Instruction.java @@ -26,7 +26,7 @@ package com.sun.tools.classfile; /** - * See JVMS3, chapter 6. + * See JVMS, chapter 6. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java b/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java index e07c9ec6..58595b7d 100644 --- a/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java +++ b/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java @@ -28,7 +28,7 @@ package com.sun.tools.classfile; import java.io.IOException; /** - * See JVMS3, section 4.8.12. + * See JVMS, section 4.8.12. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java b/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java index 9aa060a2..1e4465f2 100644 --- a/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java +++ b/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java @@ -28,7 +28,7 @@ package com.sun.tools.classfile; import java.io.IOException; /** - * See JVMS3, section 4.8.13. + * See JVMS, section 4.8.13. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java b/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java index b917b0f4..8332cbec 100644 --- a/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java +++ b/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java @@ -28,7 +28,7 @@ package com.sun.tools.classfile; import java.io.IOException; /** - * See JVMS3, section 4.8.14. + * See JVMS, section 4.8.14. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/Opcode.java b/src/share/classes/com/sun/tools/classfile/Opcode.java index b5a0086d..9f276450 100644 --- a/src/share/classes/com/sun/tools/classfile/Opcode.java +++ b/src/share/classes/com/sun/tools/classfile/Opcode.java @@ -29,7 +29,7 @@ import static com.sun.tools.classfile.Instruction.Kind.*; import static com.sun.tools.classfile.Opcode.Set.*; /** - * See JVMS3, chapter 6. + * See JVMS, chapter 6. * * <p>In addition to providing all the standard opcodes defined in JVMS, * this class also provides legacy support for the PicoJava extensions. diff --git a/src/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java b/src/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java index c0ec09d2..859cec40 100644 --- a/src/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java +++ b/src/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java @@ -28,7 +28,7 @@ package com.sun.tools.classfile; import java.io.IOException; /** - * See JVMS3, section 4.8.16 and 4.8.17. + * See JVMS, section 4.8.16 and 4.8.17. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java b/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java index b1a2e65e..ed700823 100644 --- a/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java +++ b/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java @@ -28,7 +28,7 @@ package com.sun.tools.classfile; import java.io.IOException; /** - * See JVMS3, section 4.8.17. + * See JVMS, section 4.8.17. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java b/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java index 340383c8..57de543a 100644 --- a/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java +++ b/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java @@ -28,7 +28,7 @@ package com.sun.tools.classfile; import java.io.IOException; /** - * See JVMS3, section 4.8.18. + * See JVMS, section 4.8.18. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java b/src/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java index 22584380..904010f6 100644 --- a/src/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java +++ b/src/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java @@ -28,7 +28,7 @@ package com.sun.tools.classfile; import java.io.IOException; /** - * See JVMS3, section 4.8.18 and 4.8.19. + * See JVMS, section 4.8.18 and 4.8.19. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java b/src/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java index 51075d6f..c7a44390 100644 --- a/src/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java +++ b/src/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java @@ -28,7 +28,7 @@ package com.sun.tools.classfile; import java.io.IOException; /** - * See JVMS3, section 4.8.16. + * See JVMS, section 4.8.16. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java b/src/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java index 649fe85e..24214e7e 100644 --- a/src/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java +++ b/src/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java @@ -28,7 +28,7 @@ package com.sun.tools.classfile; import java.io.IOException; /** - * See JVMS3, section 4.8.18. + * See JVMS, section 4.8.18. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/Signature.java b/src/share/classes/com/sun/tools/classfile/Signature.java index ccc17bae..19c52f81 100644 --- a/src/share/classes/com/sun/tools/classfile/Signature.java +++ b/src/share/classes/com/sun/tools/classfile/Signature.java @@ -30,7 +30,7 @@ import java.util.List; import com.sun.tools.classfile.Type.*; /** - * See JVMS3 4.4.4. + * See JVMS 4.4.4. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/Signature_attribute.java b/src/share/classes/com/sun/tools/classfile/Signature_attribute.java index 89c4893e..acb9475c 100644 --- a/src/share/classes/com/sun/tools/classfile/Signature_attribute.java +++ b/src/share/classes/com/sun/tools/classfile/Signature_attribute.java @@ -28,7 +28,7 @@ package com.sun.tools.classfile; import java.io.IOException; /** - * See JVMS3, section 4.8.9. + * See JVMS, section 4.8.9. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java b/src/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java index 6ed4f017..ba1f2aa8 100644 --- a/src/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java +++ b/src/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java @@ -30,7 +30,7 @@ import java.io.DataInputStream; import java.io.IOException; /** - * See JVMS3, section 4.8.15. + * See JVMS, section 4.8.15. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/SourceFile_attribute.java b/src/share/classes/com/sun/tools/classfile/SourceFile_attribute.java index 168a4474..c3b7509d 100644 --- a/src/share/classes/com/sun/tools/classfile/SourceFile_attribute.java +++ b/src/share/classes/com/sun/tools/classfile/SourceFile_attribute.java @@ -28,7 +28,7 @@ package com.sun.tools.classfile; import java.io.IOException; /** - * See JVMS3, section 4.8.10. + * See JVMS, section 4.8.10. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java b/src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java index bdb39a98..13c43e42 100644 --- a/src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java +++ b/src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java @@ -28,7 +28,7 @@ package com.sun.tools.classfile; import java.io.IOException; /** - * See JVMS3, section 4.8.4. + * See JVMS, section 4.8.4. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/Synthetic_attribute.java b/src/share/classes/com/sun/tools/classfile/Synthetic_attribute.java index f1995d28..0b7f933d 100644 --- a/src/share/classes/com/sun/tools/classfile/Synthetic_attribute.java +++ b/src/share/classes/com/sun/tools/classfile/Synthetic_attribute.java @@ -28,7 +28,7 @@ package com.sun.tools.classfile; import java.io.IOException; /** - * See JVMS3, section 4.8.8. + * See JVMS, section 4.8.8. * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. diff --git a/src/share/classes/com/sun/tools/classfile/package.html b/src/share/classes/com/sun/tools/classfile/package.html index d065ba5f..765dfb1a 100644 --- a/src/share/classes/com/sun/tools/classfile/package.html +++ b/src/share/classes/com/sun/tools/classfile/package.html @@ -6,7 +6,7 @@ </head> <body> A minimalist library to read and write class files into objects closely - based on the corresponding definitions in the Java Virtual Machine - Specification (JVMS). + based on the corresponding definitions in + <cite>The Java™ Virtual Machine Specification</cite> (JVMS). </body> </html> diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java index 60609b4f..80cc01bd 100644 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java @@ -2523,8 +2523,9 @@ public class HtmlDocletWriter extends HtmlDocWriter { } /** - * According to the Java Language Specifications, all the outer classes - * and static nested classes are core classes. + * According to + * <cite>The Java™ Language Specification</cite>, + * all the outer classes and static nested classes are core classes. */ public boolean isCoreClass(ClassDoc cd) { return cd.containingClass() == null || cd.isStatic(); diff --git a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java index fde2c3c0..1e6186b3 100644 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java @@ -175,8 +175,9 @@ public class Util { } /** - * According to the Java Language Specifications, all the outer classes - * and static inner classes are core classes. + * According to + * <cite>The Java™ Language Specification</cite>, + * all the outer classes and static inner classes are core classes. */ public static boolean isCoreClass(ClassDoc cd) { return cd.containingClass() == null || cd.isStatic(); diff --git a/src/share/classes/com/sun/tools/javac/code/Symbol.java b/src/share/classes/com/sun/tools/javac/code/Symbol.java index e5521027..381edd2f 100644 --- a/src/share/classes/com/sun/tools/javac/code/Symbol.java +++ b/src/share/classes/com/sun/tools/javac/code/Symbol.java @@ -1193,7 +1193,7 @@ public abstract class Symbol implements Element { } private boolean isOverridableIn(TypeSymbol origin) { - // JLS3 8.4.6.1 + // JLS 8.4.6.1 switch ((int)(flags_field & Flags.AccessFlags)) { case Flags.PRIVATE: return false; diff --git a/src/share/classes/com/sun/tools/javac/code/Types.java b/src/share/classes/com/sun/tools/javac/code/Types.java index 6408a06e..355f56f6 100644 --- a/src/share/classes/com/sun/tools/javac/code/Types.java +++ b/src/share/classes/com/sun/tools/javac/code/Types.java @@ -1985,7 +1985,7 @@ public class Types { * signature</em> of the other. This is <b>not</b> an equivalence * relation. * - * @see "The Java Language Specification, Third Ed. (8.4.2)." + * @jls section 8.4.2. * @see #overrideEquivalent(Type t, Type s) * @param t first signature (possibly raw). * @param s second signature (could be subjected to erasure). @@ -2004,7 +2004,7 @@ public class Types { * equivalence</em>. This is the natural extension of * isSubSignature to an equivalence relation. * - * @see "The Java Language Specification, Third Ed. (8.4.2)." + * @jls section 8.4.2. * @see #isSubSignature(Type t, Type s) * @param t a signature (possible raw, could be subjected to * erasure). @@ -3049,8 +3049,7 @@ public class Types { /** * Return-Type-Substitutable. - * @see <a href="http://java.sun.com/docs/books/jls/">The Java - * Language Specification, Third Ed. (8.4.5)</a> + * @jls section 8.4.5 */ public boolean returnTypeSubstitutable(Type r1, Type r2) { if (hasSameArgs(r1, r2)) @@ -3130,7 +3129,7 @@ public class Types { // <editor-fold defaultstate="collapsed" desc="Capture conversion"> /* - * JLS 3rd Ed. 5.1.10 Capture Conversion: + * JLS 5.1.10 Capture Conversion: * * Let G name a generic type declaration with n formal type * parameters A1 ... An with corresponding bounds U1 ... Un. There @@ -3163,7 +3162,7 @@ public class Types { * Capture conversion is not applied recursively. */ /** - * Capture conversion as specified by JLS 3rd Ed. + * Capture conversion as specified by the JLS. */ public List<Type> capture(List<Type> ts) { diff --git a/src/share/classes/com/sun/tools/javac/comp/Attr.java b/src/share/classes/com/sun/tools/javac/comp/Attr.java index 03d6180e..ad075a04 100644 --- a/src/share/classes/com/sun/tools/javac/comp/Attr.java +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java @@ -2632,10 +2632,10 @@ public class Attr extends JCTree.Visitor { * @param tree The tree making up the variable reference. * @param env The current environment. * @param v The variable's symbol. - * @see JLS 3rd Ed. (8.9 Enums) + * @jls section 8.9 Enums */ private void checkEnumInitializer(JCTree tree, Env<AttrContext> env, VarSymbol v) { - // JLS 3rd Ed.: + // JLS: // // "It is a compile-time error to reference a static field // of an enum type that is not a compile-time constant diff --git a/src/share/classes/com/sun/tools/javac/comp/Check.java b/src/share/classes/com/sun/tools/javac/comp/Check.java index c54d6862..c8537ef9 100644 --- a/src/share/classes/com/sun/tools/javac/comp/Check.java +++ b/src/share/classes/com/sun/tools/javac/comp/Check.java @@ -2271,7 +2271,7 @@ public class Check { * that of any public or protected method declared in class Object * or in the interface annotation.Annotation." * - * @jls3 9.6 Annotation Types + * @jls 9.6 Annotation Types */ void validateAnnotationMethod(DiagnosticPosition pos, MethodSymbol m) { for (Type sup = syms.annotationType; sup.tag == CLASS; sup = types.supertype(sup)) { diff --git a/src/share/classes/com/sun/tools/javac/comp/Flow.java b/src/share/classes/com/sun/tools/javac/comp/Flow.java index 1c199ea4..d58106e3 100644 --- a/src/share/classes/com/sun/tools/javac/comp/Flow.java +++ b/src/share/classes/com/sun/tools/javac/comp/Flow.java @@ -51,7 +51,7 @@ import static com.sun.tools.javac.code.TypeTags.*; * unassignment analysis ensures that no final variable is assigned * more than once. * - * <p>The second edition of the JLS has a number of problems in the + * <p>The JLS has a number of problems in the * specification of these flow analysis problems. This implementation * attempts to address those issues. * @@ -126,7 +126,7 @@ import static com.sun.tools.javac.code.TypeTags.*; * don't have to worry about the return expression because this * concept is only used for construcrors. * - * <p>There is no spec in JLS2 for when a variable is definitely + * <p>There is no spec in the JLS for when a variable is definitely * assigned at the end of a constructor, which is needed for final * fields (8.3.1.2). We implement the rule that V is DA at the end * of the constructor iff it is DA and the end of the body of the diff --git a/src/share/classes/com/sun/tools/javac/comp/Resolve.java b/src/share/classes/com/sun/tools/javac/comp/Resolve.java index 94ddd16f..6626cb45 100644 --- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java +++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java @@ -346,7 +346,7 @@ public class Resolve { if (typeargtypes == null) typeargtypes = List.nil(); if (mt.tag != FORALL && typeargtypes.nonEmpty()) { // This is not a polymorphic method, but typeargs are supplied - // which is fine, see JLS3 15.12.2.1 + // which is fine, see JLS 15.12.2.1 } else if (mt.tag == FORALL && typeargtypes.nonEmpty()) { ForAll pmt = (ForAll) mt; if (typeargtypes.length() != pmt.tvars.length()) @@ -1769,7 +1769,7 @@ public class Resolve { /** * Resolve an appropriate implicit this instance for t's container. - * JLS2 8.8.5.1 and 15.9.2 + * JLS 8.8.5.1 and 15.9.2 */ Type resolveImplicitThis(DiagnosticPosition pos, Env<AttrContext> env, Type t) { return resolveImplicitThis(pos, env, t, false); diff --git a/src/share/classes/com/sun/tools/javac/jvm/Gen.java b/src/share/classes/com/sun/tools/javac/jvm/Gen.java index 55e1a9d5..bbde8d9e 100644 --- a/src/share/classes/com/sun/tools/javac/jvm/Gen.java +++ b/src/share/classes/com/sun/tools/javac/jvm/Gen.java @@ -283,7 +283,7 @@ public class Gen extends JCTree.Visitor { } // leave alone methods inherited from Object - // JLS2 13.1. + // JLS 13.1. if (sym.owner == syms.objectType.tsym) return sym; diff --git a/src/share/classes/javax/annotation/processing/Processor.java b/src/share/classes/javax/annotation/processing/Processor.java index f5169ce4..a466bdd7 100644 --- a/src/share/classes/javax/annotation/processing/Processor.java +++ b/src/share/classes/javax/annotation/processing/Processor.java @@ -225,12 +225,13 @@ public interface Processor { * </dl> * </blockquote> * - * where <i>TypeName</i> is as defined in the <i>Java Language Specification</i>. + * where <i>TypeName</i> is as defined in + * <cite>The Java™ Language Specification</cite>. * * @return the names of the annotation types supported by this processor * @see javax.annotation.processing.SupportedAnnotationTypes - * @jls3 3.8 Identifiers - * @jls3 6.5.5 Meaning of Type Names + * @jls 3.8 Identifiers + * @jls 6.5.5 Meaning of Type Names */ Set<String> getSupportedAnnotationTypes(); diff --git a/src/share/classes/javax/lang/model/SourceVersion.java b/src/share/classes/javax/lang/model/SourceVersion.java index 0c2dd667..50976723 100644 --- a/src/share/classes/javax/lang/model/SourceVersion.java +++ b/src/share/classes/javax/lang/model/SourceVersion.java @@ -32,10 +32,9 @@ import java.util.HashSet; /** * Source versions of the Java™ programming language. * - * See <a - * href="http://java.sun.com/docs/books/jls/">http://java.sun.com/docs/books/jls/</a> - * for information on editions of <i>The Java™ Language - * Specification</i>, including updates and clarifications. + * See the appropriate edition of + * <cite>The Java™ Language Specification</cite> + * for information about a particular source version. * * <p>Note that additional source version constants will be added to * model future releases of the language. @@ -59,17 +58,16 @@ public enum SourceVersion { /** * The original version. * - * The language described in the first edition of <i>The - * Java™ Language Specification</i>. + * The language described in + * <cite>The Java™ Language Specification, First Edition</cite>. */ RELEASE_0, /** * The version recognized by the Java Platform 1.1. * - * The language is {@code RELEASE_0} <a - * href="http://java.sun.com/docs/books/jls/first_edition/html/1.1Update.html">augmented</a> - * with nested classes. + * The language is {@code RELEASE_0} augmented with nested classes as described in the 1.1 update to + * <cite>The Java™ Language Specification, First Edition</cite>. */ RELEASE_1, @@ -77,8 +75,9 @@ public enum SourceVersion { * The version recognized by the Java 2 Platform, Standard Edition, * v 1.2. * - * The language described in <i>The Java™ Language - * Specification, Second Edition</i>, which includes the {@code + * The language described in + * <cite>The Java™ Language Specification, + * Second Edition</cite>, which includes the {@code * strictfp} modifier. */ RELEASE_2, @@ -103,8 +102,9 @@ public enum SourceVersion { * The version recognized by the Java 2 Platform, Standard * Edition 5.0. * - * The language described in <i>The Java™ Language - * Specification, Third Edition</i>. First release to support + * The language described in + * <cite>The Java™ Language Specification, + * Third Edition</cite>. First release to support * generics, annotations, autoboxing, var-args, enhanced {@code * for} loop, and hexadecimal floating-point literals. */ @@ -210,7 +210,7 @@ public enum SourceVersion { * @param name the string to check * @return {@code true} if this string is a * syntactically valid name, {@code false} otherwise. - * @jls3 6.2 Names and Identifiers + * @jls 6.2 Names and Identifiers */ public static boolean isName(CharSequence name) { String id = name.toString(); diff --git a/src/share/classes/javax/lang/model/element/Element.java b/src/share/classes/javax/lang/model/element/Element.java index f46c2cf2..06500d2a 100644 --- a/src/share/classes/javax/lang/model/element/Element.java +++ b/src/share/classes/javax/lang/model/element/Element.java @@ -232,8 +232,8 @@ public interface Element { * * @return the enclosed elements, or an empty list if none * @see Elements#getAllMembers - * @jls3 8.8.9 Default Constructor - * @jls3 8.9 Enums + * @jls 8.8.9 Default Constructor + * @jls 8.9 Enums */ List<? extends Element> getEnclosedElements(); diff --git a/src/share/classes/javax/lang/model/element/Modifier.java b/src/share/classes/javax/lang/model/element/Modifier.java index 5d7ac37e..2b6d8ac6 100644 --- a/src/share/classes/javax/lang/model/element/Modifier.java +++ b/src/share/classes/javax/lang/model/element/Modifier.java @@ -46,7 +46,7 @@ package javax.lang.model.element; public enum Modifier { - // See JLS2 sections 8.1.1, 8.3.1, 8.4.3, 8.8.3, and 9.1.1. + // See JLS sections 8.1.1, 8.3.1, 8.4.3, 8.8.3, and 9.1.1. // java.lang.reflect.Modifier includes INTERFACE, but that's a VMism. /** The modifier {@code public} */ PUBLIC, diff --git a/src/share/classes/javax/lang/model/element/PackageElement.java b/src/share/classes/javax/lang/model/element/PackageElement.java index 437633b4..66f13863 100644 --- a/src/share/classes/javax/lang/model/element/PackageElement.java +++ b/src/share/classes/javax/lang/model/element/PackageElement.java @@ -43,7 +43,7 @@ public interface PackageElement extends Element, QualifiedNameable { * * @return the fully qualified name of this package, or an * empty name if this is an unnamed package - * @jls3 6.7 Fully Qualified Names and Canonical Names + * @jls 6.7 Fully Qualified Names and Canonical Names */ Name getQualifiedName(); @@ -63,7 +63,7 @@ public interface PackageElement extends Element, QualifiedNameable { * * @return {@code true} is this is an unnamed package and {@code * false} otherwise - * @jls3 7.4.2 Unnamed Packages + * @jls 7.4.2 Unnamed Packages */ boolean isUnnamed(); diff --git a/src/share/classes/javax/lang/model/element/TypeElement.java b/src/share/classes/javax/lang/model/element/TypeElement.java index 0405aecc..d73adfee 100644 --- a/src/share/classes/javax/lang/model/element/TypeElement.java +++ b/src/share/classes/javax/lang/model/element/TypeElement.java @@ -101,7 +101,7 @@ public interface TypeElement extends Element, Parameterizable, QualifiedNameable * an empty name if none * * @see Elements#getBinaryName - * @jls3 6.7 Fully Qualified Names and Canonical Names + * @jls 6.7 Fully Qualified Names and Canonical Names */ Name getQualifiedName(); diff --git a/src/share/classes/javax/lang/model/element/VariableElement.java b/src/share/classes/javax/lang/model/element/VariableElement.java index dd081225..77451fab 100644 --- a/src/share/classes/javax/lang/model/element/VariableElement.java +++ b/src/share/classes/javax/lang/model/element/VariableElement.java @@ -59,8 +59,8 @@ public interface VariableElement extends Element { * otherwise * * @see Elements#getConstantExpression(Object) - * @jls3 15.28 Constant Expression - * @jls3 4.12.4 final Variables + * @jls 15.28 Constant Expression + * @jls 4.12.4 final Variables */ Object getConstantValue(); } diff --git a/src/share/classes/javax/lang/model/type/DeclaredType.java b/src/share/classes/javax/lang/model/type/DeclaredType.java index 63cefe1e..c1f500ee 100644 --- a/src/share/classes/javax/lang/model/type/DeclaredType.java +++ b/src/share/classes/javax/lang/model/type/DeclaredType.java @@ -79,8 +79,8 @@ public interface DeclaredType extends ReferenceType { * enclosing instance. * * @return a type mirror for the enclosing type - * @jls3 8.1.3 Inner Classes and Enclosing Instances - * @jls3 15.9.2 Determining Enclosing Instances + * @jls 8.1.3 Inner Classes and Enclosing Instances + * @jls 15.9.2 Determining Enclosing Instances */ TypeMirror getEnclosingType(); diff --git a/src/share/classes/javax/lang/model/type/TypeVariable.java b/src/share/classes/javax/lang/model/type/TypeVariable.java index cbecb024..993bba68 100644 --- a/src/share/classes/javax/lang/model/type/TypeVariable.java +++ b/src/share/classes/javax/lang/model/type/TypeVariable.java @@ -38,8 +38,8 @@ import javax.lang.model.util.Types; * type, method, or constructor. * A type variable may also be declared implicitly, as by * the capture conversion of a wildcard type argument - * (see chapter 5 of <i>The Java Language Specification, Third - * Edition</i>). + * (see chapter 5 of + * <cite>The Java™ Language Specification</cite>). * * @author Joseph D. Darcy * @author Scott Seligman diff --git a/src/share/classes/javax/lang/model/util/Elements.java b/src/share/classes/javax/lang/model/util/Elements.java index 7c68b4ff..035fcfb3 100644 --- a/src/share/classes/javax/lang/model/util/Elements.java +++ b/src/share/classes/javax/lang/model/util/Elements.java @@ -95,7 +95,7 @@ public interface Elements { * @param e the element being examined * @return the documentation comment of the element, or {@code null} * if there is none - * @jls3 3.6 White Space + * @jls 3.6 White Space */ String getDocComment(Element e); @@ -114,7 +114,7 @@ public interface Elements { * @return the binary name * * @see TypeElement#getQualifiedName - * @jls3 13.1 The Form of a Binary + * @jls 13.1 The Form of a Binary */ Name getBinaryName(TypeElement type); @@ -210,8 +210,8 @@ public interface Elements { * @param type the type of which the first method is a member * @return {@code true} if and only if the first method overrides * the second - * @jls3 8.4.8 Inheritance, Overriding, and Hiding - * @jls3 9.4.1 Inheritance and Overriding + * @jls 8.4.8 Inheritance, Overriding, and Hiding + * @jls 9.4.1 Inheritance and Overriding */ boolean overrides(ExecutableElement overrider, ExecutableElement overridden, TypeElement type); diff --git a/src/share/classes/javax/lang/model/util/Types.java b/src/share/classes/javax/lang/model/util/Types.java index 67924ce1..a53e66a5 100644 --- a/src/share/classes/javax/lang/model/util/Types.java +++ b/src/share/classes/javax/lang/model/util/Types.java @@ -81,7 +81,7 @@ public interface Types { * @return {@code true} if and only if the first type is a subtype * of the second * @throws IllegalArgumentException if given an executable or package type - * @jls3 4.10 Subtyping + * @jls 4.10 Subtyping */ boolean isSubtype(TypeMirror t1, TypeMirror t2); @@ -93,7 +93,7 @@ public interface Types { * @return {@code true} if and only if the first type is assignable * to the second * @throws IllegalArgumentException if given an executable or package type - * @jls3 5.2 Assignment Conversion + * @jls 5.2 Assignment Conversion */ boolean isAssignable(TypeMirror t1, TypeMirror t2); @@ -104,7 +104,7 @@ public interface Types { * @param t2 the second type * @return {@code true} if and only if the first type contains the second * @throws IllegalArgumentException if given an executable or package type - * @jls3 4.5.1.1 Type Argument Containment and Equivalence + * @jls 4.5.1.1 Type Argument Containment and Equivalence */ boolean contains(TypeMirror t1, TypeMirror t2); @@ -116,7 +116,7 @@ public interface Types { * @param m2 the second method * @return {@code true} if and only if the first signature is a * subsignature of the second - * @jls3 8.4.2 Method Signature + * @jls 8.4.2 Method Signature */ boolean isSubsignature(ExecutableType m1, ExecutableType m2); @@ -136,7 +136,7 @@ public interface Types { * @param t the type to be erased * @return the erasure of the given type * @throws IllegalArgumentException if given a package type - * @jls3 4.6 Type Erasure + * @jls 4.6 Type Erasure */ TypeMirror erasure(TypeMirror t); @@ -146,7 +146,7 @@ public interface Types { * * @param p the primitive type to be converted * @return the class of a boxed value of type {@code p} - * @jls3 5.1.7 Boxing Conversion + * @jls 5.1.7 Boxing Conversion */ TypeElement boxedClass(PrimitiveType p); @@ -158,7 +158,7 @@ public interface Types { * @return the type of an unboxed value of type {@code t} * @throws IllegalArgumentException if the given type has no * unboxing conversion - * @jls3 5.1.8 Unboxing Conversion + * @jls 5.1.8 Unboxing Conversion */ PrimitiveType unboxedType(TypeMirror t); @@ -168,7 +168,7 @@ public interface Types { * @param t the type to be converted * @return the result of applying capture conversion * @throws IllegalArgumentException if given an executable or package type - * @jls3 5.1.10 Capture Conversion + * @jls 5.1.10 Capture Conversion */ TypeMirror capture(TypeMirror t); diff --git a/src/share/classes/javax/tools/JavaCompiler.java b/src/share/classes/javax/tools/JavaCompiler.java index 7bc019a6..8d0dcf92 100644 --- a/src/share/classes/javax/tools/JavaCompiler.java +++ b/src/share/classes/javax/tools/JavaCompiler.java @@ -58,9 +58,11 @@ import javax.annotation.processing.Processor; * standard file manager such as the one returned by {@linkplain * #getStandardFileManager getStandardFileManager}. * - * <p>An instance implementing this interface must conform to the Java - * Language Specification and generate class files conforming to the - * Java Virtual Machine specification. The versions of these + * <p>An instance implementing this interface must conform to + * <cite>The Java™ Language Specification</cite> + * and generate class files conforming to + * <cite>The Java™ Virtual Machine Specification</cite>. + * The versions of these * specifications are defined in the {@linkplain Tool} interface. * * Additionally, an instance of this interface supporting {@link diff --git a/src/share/classes/javax/tools/JavaFileManager.java b/src/share/classes/javax/tools/JavaFileManager.java index f289d095..d519a5c9 100644 --- a/src/share/classes/javax/tools/JavaFileManager.java +++ b/src/share/classes/javax/tools/JavaFileManager.java @@ -49,17 +49,16 @@ import static javax.tools.JavaFileObject.Kind; * names must be given in the Java Virtual Machine internal form of * fully qualified class and interface names. For convenience '.' * and '/' are interchangeable. The internal form is defined in - * chapter four of the - * <a href="http://java.sun.com/docs/books/vmspec/2nd-edition/jvms-maintenance.html">Java - * Virtual Machine Specification</a>. + * chapter four of + * <cite>The Java™ Virtual Machine Specification</cite>. * <blockquote><p> * <i>Discussion:</i> this means that the names * "java/lang.package-info", "java/lang/package-info", * "java.lang.package-info", are valid and equivalent. Compare to - * binary name as defined in the - * <a href="http://java.sun.com/docs/books/jls/">Java Language - * Specification (JLS)</a> section 13.1 "The Form of a Binary". + * binary name as defined in + * <cite>The Java™ Language Specification</cite>, + * section 13.1 "The Form of a Binary". * </p></blockquote> * * <p>The case of names is significant. All names should be treated @@ -173,7 +172,8 @@ public interface JavaFileManager extends Closeable, Flushable, OptionChecker { /** * Infers a binary name of a file object based on a location. The - * binary name returned might not be a valid JLS binary name. + * binary name returned might not be a valid binary name according to + * <cite>The Java™ Language Specification</cite>. * * @param location a location * @param file a file object diff --git a/src/share/classes/javax/tools/JavaFileObject.java b/src/share/classes/javax/tools/JavaFileObject.java index 21d0d075..9e84b3c5 100644 --- a/src/share/classes/javax/tools/JavaFileObject.java +++ b/src/share/classes/javax/tools/JavaFileObject.java @@ -99,9 +99,9 @@ public interface JavaFileObject extends FileObject { /** * Checks if this file object is compatible with the specified * simple name and kind. A simple name is a single identifier - * (not qualified) as defined in the <a - * href="http://java.sun.com/docs/books/jls/">Java Language - * Specification</a> 3rd ed., section 6.2 "Names and Identifiers". + * (not qualified) as defined in + * <cite>The Java™ Language Specification</cite>, + * section 6.2 "Names and Identifiers". * * @param simpleName a simple name of a class * @param kind a kind diff --git a/src/share/sample/javac/processing/src/CheckNamesProcessor.java b/src/share/sample/javac/processing/src/CheckNamesProcessor.java index 280acfdc..dc224f01 100644 --- a/src/share/sample/javac/processing/src/CheckNamesProcessor.java +++ b/src/share/sample/javac/processing/src/CheckNamesProcessor.java @@ -152,7 +152,8 @@ public class CheckNamesProcessor extends AbstractProcessor { * Provide checks that an element and its enclosed elements follow * the usual naming conventions. * - * <p> Conventions from JLSv3 section 6.8: + * <p> Conventions from section 6.8 of + * <cite>The Java™ Language Specification</cite> * * <ul> * <li> Classes and interfaces: camel case, first letter is uppercase @@ -163,7 +164,8 @@ public class CheckNamesProcessor extends AbstractProcessor { * <li> non-final: camel case, initial lowercase * <li> constant: uppercase separated by underscores * </ul> - * <li> Packages: checks left as exercise for the reader, see JLSv3 section 7.7 + * <li> Packages: checks left as exercise for the reader, see section 7.7 of + * <cite>The Java™ Language Specification</cite>. * </ul> */ private static class NameChecker { @@ -286,7 +288,7 @@ public class CheckNamesProcessor extends AbstractProcessor { public Void visitPackage(PackageElement e, Void p) { /* * Implementing the checks of package names is left - * as an exercise for the reader, see JLSv3 section + * as an exercise for the reader, see JLS section * 7.7 for conventions. */ |