Mercurial > hg > openjdk > jdk9 > langtools
changeset 4127:fff0714129d8
8179299: Fix HTML 5 errors in java.compiler module
8179300: Fix HTML 5 errors in jdk.compiler module
8179301: Fix HTML 5 errors in jdk.javadoc module
8179303: Fix HTML 5 errors in jdk.jshell module
Reviewed-by: darcy
line wrap: on
line diff
--- a/src/java.compiler/share/classes/javax/lang/model/element/ModuleElement.java Tue Apr 25 16:14:35 2017 -0700 +++ b/src/java.compiler/share/classes/javax/lang/model/element/ModuleElement.java Tue Apr 25 18:35:24 2017 -0700 @@ -154,7 +154,7 @@ * pattern. Classes implementing this interface are used to operate * on a directive when the kind of directive is unknown at compile time. * When a visitor is passed to a directive's {@link Directive#accept - * accept} method, the <tt>visit<i>Xyz</i></tt> method applicable + * accept} method, the <code>visit<i>Xyz</i></code> method applicable * to that directive is invoked. * * <p> Classes implementing this interface may or may not throw a
--- a/src/java.compiler/share/classes/javax/tools/JavaFileManager.java Tue Apr 25 16:14:35 2017 -0700 +++ b/src/java.compiler/share/classes/javax/tools/JavaFileManager.java Tue Apr 25 18:35:24 2017 -0700 @@ -70,7 +70,7 @@ * java.io.File#getCanonicalFile} or similar means. If the system is * not case-aware, file objects must use other means to preserve case. * - * <p><em><a name="relative_name">Relative names</a>:</em> some + * <p><em><a id="relative_name">Relative names</a>:</em> some * methods in this interface use relative names. A relative name is a * non-null, non-empty sequence of path segments separated by '/'. * '.' or '..' are invalid path segments. A valid relative name must
--- a/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java Tue Apr 25 16:14:35 2017 -0700 +++ b/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java Tue Apr 25 18:35:24 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,7 +31,7 @@ * Classes implementing this interface are used to operate * on a tree when the kind of tree is unknown at compile time. * When a visitor is passed to an tree's {@link DocTree#accept - * accept} method, the <tt>visit<i>XYZ</i></tt> method most applicable + * accept} method, the <code>visit<i>Xyz</i></code> method most applicable * to that tree is invoked. * * <p> Classes implementing this interface may or may not throw a
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/LambdaExpressionTree.java Tue Apr 25 16:14:35 2017 -0700 +++ b/src/jdk.compiler/share/classes/com/sun/source/tree/LambdaExpressionTree.java Tue Apr 25 18:35:24 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -41,7 +41,7 @@ /** * Lambda expressions come in two forms: - * <ul compact> + * <ul> * <li> expression lambdas, whose body is an expression, and * <li> statement lambdas, whose body is a block * </ul>
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java Tue Apr 25 16:14:35 2017 -0700 +++ b/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java Tue Apr 25 18:35:24 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,7 +30,7 @@ * Classes implementing this interface are used to operate * on a tree when the kind of tree is unknown at compile time. * When a visitor is passed to an tree's {@link Tree#accept - * accept} method, the <tt>visit<i>XYZ</i></tt> method most applicable + * accept} method, the <code>visit<i>Xyz</i></code> method most applicable * to that tree is invoked. * * <p> Classes implementing this interface may or may not throw a
--- a/src/jdk.javadoc/share/classes/com/sun/javadoc/FieldDoc.java Tue Apr 25 16:14:35 2017 -0700 +++ b/src/jdk.javadoc/share/classes/com/sun/javadoc/FieldDoc.java Tue Apr 25 18:35:24 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -65,7 +65,7 @@ /** * Return the serialField tags in this FieldDoc item. * - * @return an array of <tt>SerialFieldTag</tt> objects containing + * @return an array of {@code SerialFieldTag} objects containing * all {@code @serialField} tags. */ SerialFieldTag[] serialFieldTags();
--- a/src/jdk.javadoc/share/classes/com/sun/javadoc/MethodDoc.java Tue Apr 25 16:14:35 2017 -0700 +++ b/src/jdk.javadoc/share/classes/com/sun/javadoc/MethodDoc.java Tue Apr 25 18:35:24 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -102,7 +102,7 @@ * also said to <i>implement</i> the other. * * @param meth the other method to examine - * @return <tt>true</tt> if this method overrides the other + * @return {@code true} if this method overrides the other * @since 1.5 */ boolean overrides(MethodDoc meth);
--- a/src/jdk.javadoc/share/classes/com/sun/javadoc/Tag.java Tue Apr 25 16:14:35 2017 -0700 +++ b/src/jdk.javadoc/share/classes/com/sun/javadoc/Tag.java Tue Apr 25 18:35:24 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -78,7 +78,8 @@ * the following table lists those cases where there is more * than one tag of a given kind: * - * <table border="1" cellpadding="4" cellspacing="0" summary="related tags"> + * <table border="1"> + * <caption>Related Tags</caption> * <tr><th>{@code kind() }</th> <th>{@code name() }</th></tr> * <tr><td>{@code @throws }</td> <td>{@code @throws }</td></tr> * <tr><td>{@code @throws }</td> <td>{@code @exception }</td></tr>
--- a/src/jdk.javadoc/share/classes/com/sun/javadoc/package-info.java Tue Apr 25 16:14:35 2017 -0700 +++ b/src/jdk.javadoc/share/classes/com/sun/javadoc/package-info.java Tue Apr 25 18:35:24 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -52,10 +52,10 @@ information can be extracted. <p> -<a name="terminology"></a> +<a id="terminology"></a> <h3>Terminology</h3> -<a name="included"></a> +<a id="included"></a> When calling javadoc, you pass in package names and source file names -- these are called the <em>specified</em> packages and classes. You also pass in Javadoc options; the <em>access control</em> Javadoc options @@ -66,7 +66,7 @@ {@link com.sun.javadoc.PackageDoc#allClasses(boolean) allClasses(false)}.) <p> -<a name="class"></a> +<a id="class"></a> Throughout this API, the term <em>class</em> is normally a shorthand for "class or interface", as in: {@link com.sun.javadoc.ClassDoc}, {@link com.sun.javadoc.PackageDoc#allClasses() allClasses()}, and @@ -82,13 +82,13 @@ describes explicitly which meaning is being used. <p> -<a name="qualified"></a> +<a id="qualified"></a> A <em>qualified</em> class or interface name is one that has its package name prepended to it, such as {@code java.lang.String}. A non-qualified name has no package name, such as {@code String}. <p> -<a name="example"></a> +<a id="example"></a> <h3>Example</h3> The following is an example doclet that
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/package-info.java Tue Apr 25 16:14:35 2017 -0700 +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/package-info.java Tue Apr 25 18:35:24 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -61,24 +61,24 @@ * described by {@link javax.lang.model Language Model API} to query Elements and Types. * <p> * - * <a name="terminology"></a> + * <a id="terminology"></a> * <h3>Terminology</h3> * * <dl> - * <dt><a name="selected"></a>Selected</dt> + * <dt><a id="selected"></a>Selected</dt> * <dd>An element is considered to be <em>selected</em>, if the * <em>selection controls</em> <a href="#options">allow</a> it * to be documented. (Note that synthetic elements are never * selected.) * </dd> * - * <dt><a name="specified"></a>Specified</dt> + * <dt><a id="specified"></a>Specified</dt> * <dd>The set of elements specified by the user are considered to be <em>specified * elements</em>. Specified elements provide the starting points * for determining the <em>included elements</em> to be documented. * </dd> * - * <dt><a name="included"></a>Included</dt> + * <dt><a id="included"></a>Included</dt> * <dd>An element is considered to be <em>included</em>, if it is * <em>specified</em> if it contains a <em>specified</em> element, * or it is enclosed in a <em>specified</em> element, and is <em>selected</em>. @@ -87,7 +87,7 @@ * * </dl> * <p> - * <a name="options"></a> + * <a id="options"></a> * <h3>Options</h3> * Javadoc <em>selection control</em> can be specified with these options * as follows: @@ -131,7 +131,7 @@ * <li>{@code sourcefilenames} can be used to specify source file names. * </ul> * <p> - * <a name="legacy-interactions"></a> + * <a id="legacy-interactions"></a> * <h4>Interactions with older options.</h4> * * The new {@code --show-*} options provide a more detailed replacement @@ -148,13 +148,13 @@ <tr><td>{@code -private}<td>private<td>private<td>all<td>all </table> * <p> - * <a name="qualified"></a> + * <a id="qualified"></a> * A <em>qualified</em> element name is one that has its package * name prepended to it, such as {@code java.lang.String}. A non-qualified * name has no package name, such as {@code String}. * <p> * - * <a name="example"></a> + * <a id="example"></a> * <h3>Example</h3> * * The following is an example doclet that displays information of a class @@ -274,7 +274,7 @@ * source-location/Example.java * </pre> * - * <h3><a name="migration">Migration Guide</a></h3> + * <h3><a id="migration">Migration Guide</a></h3> * * <p>Many of the types in the old {@code com.sun.javadoc} API do not have equivalents in this * package. Instead, types in the {@code javax.lang.model} and {@code com.sun.source} APIs
--- a/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiExecutionControlProvider.java Tue Apr 25 16:14:35 2017 -0700 +++ b/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiExecutionControlProvider.java Tue Apr 25 18:35:24 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -90,7 +90,8 @@ * {@code ExecutionControlProvider}. The map can optionally be modified; * Modified or unmodified it can be passed to * {@link #generate(jdk.jshell.spi.ExecutionEnv, java.util.Map) }. - * <table summary="Parameters"> + * <table> + * <caption>Parameters</caption> * <tr> * <th>Parameter</th> * <th>Description</th>