diff options
Diffstat (limited to 'src/share/classes/javax')
14 files changed, 57 insertions, 54 deletions
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 |