Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/make/build.properties	Thu Apr 21 15:33:25 2011 -0700
     1.2 +++ b/make/build.properties	Mon Apr 25 15:45:49 2011 -0700
     1.3 @@ -71,9 +71,18 @@
     1.4  javac.lint.opts = -Xlint:all,-deprecation -Werror
     1.5  
     1.6  # options for the <javadoc> task for javac
     1.7 -javadoc.jls3.url=http://java.sun.com/docs/books/jls/
     1.8 -javadoc.jls3.cite=&lt;a href=&quot;${javadoc.jls3.url}&quot;&gt;The Java Language Specification, Third Edition&lt;/a&gt;
     1.9 -javadoc.jls3.option=-tag "jls3:a:See &lt;cite&gt;${javadoc.jls3.cite}&lt;/cite&gt;:"
    1.10 +#javadoc.jls3.url=http://java.sun.com/docs/books/jls/
    1.11 +#javadoc.jls3.cite=&lt;a href=&quot;${javadoc.jls3.url}&quot;&gt;The Java Language Specification, Third Edition&lt;/a&gt;
    1.12 +#javadoc.jls3.option=-tag "jls3:a:See &lt;cite&gt;${javadoc.jls3.cite}&lt;/cite&gt;:"
    1.13 +
    1.14 +
    1.15 +javadoc.jls.cite=The Java&trade; Language Specification
    1.16 +
    1.17 +javadoc.jls.option=-tag "jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"
    1.18 +
    1.19 +
    1.20 +
    1.21 +
    1.22  
    1.23  # jtreg, used to run the JDK regression tests
    1.24  # See http://openjdk.java.net/jtreg/

     2.1 --- a/make/build.xml	Thu Apr 21 15:33:25 2011 -0700
     2.2 +++ b/make/build.xml	Mon Apr 25 15:45:49 2011 -0700
     2.3 @@ -464,7 +464,7 @@
     2.4      </target>
     2.5  
     2.6      <target name="javadoc-javac" depends="build-javac,-def-javadoc-tool">
     2.7 -        <javadoc-tool name="javac" includes="${javac.includes}" options="${javadoc.jls3.option}"/>
     2.8 +        <javadoc-tool name="javac" includes="${javac.includes}" options="${javadoc.jls.option}"/>
     2.9      </target>
    2.10  
    2.11      <target name="jtreg-javac" depends="build-javac,build-javap,-def-jtreg">

     3.1 --- a/src/share/classes/com/sun/javadoc/ClassDoc.java	Thu Apr 21 15:33:25 2011 -0700
     3.2 +++ b/src/share/classes/com/sun/javadoc/ClassDoc.java	Mon Apr 25 15:45:49 2011 -0700
     3.3 @@ -311,8 +311,8 @@
     3.4  
     3.5      /**
     3.6       * Get the list of classes and interfaces declared as imported.
     3.7 -     * These are called "single-type-import declarations" in the
     3.8 -     * Java Language Specification.
     3.9 +     * These are called "single-type-import declarations" in
    3.10 +     * <cite>The Java&trade; Language Specification</cite>.
    3.11       *
    3.12       * @return an array of ClassDoc representing the imported classes.
    3.13       *
    3.14 @@ -325,8 +325,8 @@
    3.15  
    3.16      /**
    3.17       * Get the list of packages declared as imported.
    3.18 -     * These are called "type-import-on-demand declarations" in the
    3.19 -     * Java Language Specification.
    3.20 +     * These are called "type-import-on-demand declarations" in
    3.21 +     * <cite>The Java&trade; Language Specification</cite>.
    3.22       *
    3.23       * @return an array of PackageDoc representing the imported packages.
    3.24       *

     4.1 --- a/src/share/classes/com/sun/source/tree/AnnotationTree.java	Thu Apr 21 15:33:25 2011 -0700
     4.2 +++ b/src/share/classes/com/sun/source/tree/AnnotationTree.java	Mon Apr 25 15:45:49 2011 -0700
     4.3 @@ -36,7 +36,7 @@
     4.4   *    {@code @}<em>annotationType</em> ( <em>arguments</em> )
     4.5   * </pre>
     4.6   *
     4.7 - * @see "The Java Language Specification, 3rd ed, section 9.7"
     4.8 + * @jls section 9.7
     4.9   *
    4.10   * @author Peter von der Ah&eacute;
    4.11   * @author Jonathan Gibbons

     5.1 --- a/src/share/classes/com/sun/source/tree/ArrayAccessTree.java	Thu Apr 21 15:33:25 2011 -0700
     5.2 +++ b/src/share/classes/com/sun/source/tree/ArrayAccessTree.java	Mon Apr 25 15:45:49 2011 -0700
     5.3 @@ -33,7 +33,7 @@
     5.4   *   <em>expression</em> [ <em>index</em> ]
     5.5   * </pre>
     5.6   *
     5.7 - * @see "The Java Language Specification, 3rd ed, section 15.13"
     5.8 + * @jls section 15.13
     5.9   *
    5.10   * @author Peter von der Ah&eacute;
    5.11   * @author Jonathan Gibbons

     6.1 --- a/src/share/classes/com/sun/source/tree/ArrayTypeTree.java	Thu Apr 21 15:33:25 2011 -0700
     6.2 +++ b/src/share/classes/com/sun/source/tree/ArrayTypeTree.java	Mon Apr 25 15:45:49 2011 -0700
     6.3 @@ -33,7 +33,7 @@
     6.4   *   <em>type</em> []
     6.5   * </pre>
     6.6   *
     6.7 - * @see "The Java Language Specification, 3rd ed, section 10.1"
     6.8 + * @jls section 10.1
     6.9   *
    6.10   * @author Peter von der Ah&eacute;
    6.11   * @author Jonathan Gibbons

     7.1 --- a/src/share/classes/com/sun/source/tree/AssertTree.java	Thu Apr 21 15:33:25 2011 -0700
     7.2 +++ b/src/share/classes/com/sun/source/tree/AssertTree.java	Mon Apr 25 15:45:49 2011 -0700
     7.3 @@ -35,7 +35,7 @@
     7.4   *   assert <em>condition</em> : <em>detail</em> ;
     7.5   * </pre>
     7.6   *
     7.7 - * @see "The Java Language Specification, 3rd ed, section 14.10"
     7.8 + * @jls section 14.10
     7.9   *
    7.10   * @author Peter von der Ah&eacute;
    7.11   * @author Jonathan Gibbons

     8.1 --- a/src/share/classes/com/sun/source/tree/AssignmentTree.java	Thu Apr 21 15:33:25 2011 -0700
     8.2 +++ b/src/share/classes/com/sun/source/tree/AssignmentTree.java	Mon Apr 25 15:45:49 2011 -0700
     8.3 @@ -33,7 +33,7 @@
     8.4   *   <em>variable</em> = <em>expression</em>
     8.5   * </pre>
     8.6   *
     8.7 - * @see "The Java Language Specification, 3rd ed, section 15.26.1"
     8.8 + * @jls section 15.26.1
     8.9   *
    8.10   * @author Peter von der Ah&eacute;
    8.11   * @author Jonathan Gibbons

     9.1 --- a/src/share/classes/com/sun/source/tree/BinaryTree.java	Thu Apr 21 15:33:25 2011 -0700
     9.2 +++ b/src/share/classes/com/sun/source/tree/BinaryTree.java	Mon Apr 25 15:45:49 2011 -0700
     9.3 @@ -34,7 +34,7 @@
     9.4   *   <em>leftOperand</em> <em>operator</em> <em>rightOperand</em>
     9.5   * </pre>
     9.6   *
     9.7 - * @see "The Java Language Specification, 3rd ed, sections 15.17 to 15.24"
     9.8 + * @jls sections 15.17 to 15.24
     9.9   *
    9.10   * @author Peter von der Ah&eacute;
    9.11   * @author Jonathan Gibbons

    10.1 --- a/src/share/classes/com/sun/source/tree/BlockTree.java	Thu Apr 21 15:33:25 2011 -0700
    10.2 +++ b/src/share/classes/com/sun/source/tree/BlockTree.java	Mon Apr 25 15:45:49 2011 -0700
    10.3 @@ -39,7 +39,7 @@
    10.4   *   static { <em>statements</em> }
    10.5   * </pre>
    10.6   *
    10.7 - * @see "The Java Language Specification, 3rd ed, section 14.2"
    10.8 + * @jls section 14.2
    10.9   *
   10.10   * @author Peter von der Ah&eacute;
   10.11   * @author Jonathan Gibbons

    11.1 --- a/src/share/classes/com/sun/source/tree/BreakTree.java	Thu Apr 21 15:33:25 2011 -0700
    11.2 +++ b/src/share/classes/com/sun/source/tree/BreakTree.java	Mon Apr 25 15:45:49 2011 -0700
    11.3 @@ -37,7 +37,7 @@
    11.4   *   break <em>label</em> ;
    11.5   * </pre>
    11.6   *
    11.7 - * @see "The Java Language Specification, 3rd ed, section 14.15"
    11.8 + * @jls section 14.15
    11.9   *
   11.10   * @author Peter von der Ah&eacute;
   11.11   * @author Jonathan Gibbons

    12.1 --- a/src/share/classes/com/sun/source/tree/CaseTree.java	Thu Apr 21 15:33:25 2011 -0700
    12.2 +++ b/src/share/classes/com/sun/source/tree/CaseTree.java	Mon Apr 25 15:45:49 2011 -0700
    12.3 @@ -39,7 +39,7 @@
    12.4   *       <em>statements</em>
    12.5   * </pre>
    12.6   *
    12.7 - * @see "The Java Language Specification, 3rd ed, section 14.11"
    12.8 + * @jls section 14.11
    12.9   *
   12.10   * @author Peter von der Ah&eacute;
   12.11   * @author Jonathan Gibbons

    13.1 --- a/src/share/classes/com/sun/source/tree/CatchTree.java	Thu Apr 21 15:33:25 2011 -0700
    13.2 +++ b/src/share/classes/com/sun/source/tree/CatchTree.java	Mon Apr 25 15:45:49 2011 -0700
    13.3 @@ -34,7 +34,7 @@
    13.4   *       <em>block</em>
    13.5   * </pre>
    13.6   *
    13.7 - * @see "The Java Language Specification, 3rd ed, section 14.20"
    13.8 + * @jls section 14.20
    13.9   *
   13.10   * @author Peter von der Ah&eacute;
   13.11   * @author Jonathan Gibbons

    14.1 --- a/src/share/classes/com/sun/source/tree/ClassTree.java	Thu Apr 21 15:33:25 2011 -0700
    14.2 +++ b/src/share/classes/com/sun/source/tree/ClassTree.java	Mon Apr 25 15:45:49 2011 -0700
    14.3 @@ -42,8 +42,7 @@
    14.4   *   }
    14.5   * </pre>
    14.6   *
    14.7 - * @see "The Java Language Specification, 3rd ed,
    14.8 - * sections 8.1, 8.9, 9.1, and 9.6"
    14.9 + * @jls sections 8.1, 8.9, 9.1, and 9.6
   14.10   *
   14.11   * @author Peter von der Ah&eacute;
   14.12   * @author Jonathan Gibbons

    15.1 --- a/src/share/classes/com/sun/source/tree/CompilationUnitTree.java	Thu Apr 21 15:33:25 2011 -0700
    15.2 +++ b/src/share/classes/com/sun/source/tree/CompilationUnitTree.java	Mon Apr 25 15:45:49 2011 -0700
    15.3 @@ -33,7 +33,7 @@
    15.4   * Represents the abstract syntax tree for compilation units (source
    15.5   * files) and package declarations (package-info.java).
    15.6   *
    15.7 - * @see "The Java Language Specification, 3rd ed, sections 7.3, and 7.4"
    15.8 + * @jls sections 7.3, and 7.4
    15.9   *
   15.10   * @author Peter von der Ahé
   15.11   * @since 1.6

    16.1 --- a/src/share/classes/com/sun/source/tree/CompoundAssignmentTree.java	Thu Apr 21 15:33:25 2011 -0700
    16.2 +++ b/src/share/classes/com/sun/source/tree/CompoundAssignmentTree.java	Mon Apr 25 15:45:49 2011 -0700
    16.3 @@ -34,7 +34,7 @@
    16.4   *   <em>variable</em> <em>operator</em> <em>expression</em>
    16.5   * </pre>
    16.6   *
    16.7 - * @see "The Java Language Specification, 3rd ed, section 15.26.2"
    16.8 + * @jls section 15.26.2
    16.9   *
   16.10   * @author Peter von der Ah&eacute;
   16.11   * @author Jonathan Gibbons

    17.1 --- a/src/share/classes/com/sun/source/tree/ConditionalExpressionTree.java	Thu Apr 21 15:33:25 2011 -0700
    17.2 +++ b/src/share/classes/com/sun/source/tree/ConditionalExpressionTree.java	Mon Apr 25 15:45:49 2011 -0700
    17.3 @@ -33,7 +33,7 @@
    17.4   *   <em>condition</em> ? <em>trueExpression</em> : <em>falseExpression</em>
    17.5   * </pre>
    17.6   *
    17.7 - * @see "The Java Language Specification, 3rd ed, section 15.25"
    17.8 + * @jls section 15.25
    17.9   *
   17.10   * @author Peter von der Ah&eacute;
   17.11   * @author Jonathan Gibbons

    18.1 --- a/src/share/classes/com/sun/source/tree/ContinueTree.java	Thu Apr 21 15:33:25 2011 -0700
    18.2 +++ b/src/share/classes/com/sun/source/tree/ContinueTree.java	Mon Apr 25 15:45:49 2011 -0700
    18.3 @@ -36,7 +36,7 @@
    18.4   *   continue <em>label</em> ;
    18.5   * </pre>
    18.6   *
    18.7 - * @see "The Java Language Specification, 3rd ed, section 14.16"
    18.8 + * @jls section 14.16
    18.9   *
   18.10   * @author Peter von der Ah&eacute;
   18.11   * @author Jonathan Gibbons

    19.1 --- a/src/share/classes/com/sun/source/tree/DisjunctiveTypeTree.java	Thu Apr 21 15:33:25 2011 -0700
    19.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.3 @@ -1,40 +0,0 @@
    19.4 -/*
    19.5 - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
    19.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    19.7 - *
    19.8 - * This code is free software; you can redistribute it and/or modify it
    19.9 - * under the terms of the GNU General Public License version 2 only, as
   19.10 - * published by the Free Software Foundation.  Oracle designates this
   19.11 - * particular file as subject to the "Classpath" exception as provided
   19.12 - * by Oracle in the LICENSE file that accompanied this code.
   19.13 - *
   19.14 - * This code is distributed in the hope that it will be useful, but WITHOUT
   19.15 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   19.16 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   19.17 - * version 2 for more details (a copy is included in the LICENSE file that
   19.18 - * accompanied this code).
   19.19 - *
   19.20 - * You should have received a copy of the GNU General Public License version
   19.21 - * 2 along with this work; if not, write to the Free Software Foundation,
   19.22 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   19.23 - *
   19.24 - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   19.25 - * or visit www.oracle.com if you need additional information or have any
   19.26 - * questions.
   19.27 - */
   19.28 -
   19.29 -package com.sun.source.tree;
   19.30 -
   19.31 -import java.util.List;
   19.32 -
   19.33 -/**
   19.34 - * A tree node for a disjunctive type expression in a multicatch var declaration.
   19.35 - *
   19.36 - *
   19.37 - * @author Maurizio Cimadamore
   19.38 - *
   19.39 - * @since 1.7
   19.40 - */
   19.41 -public interface DisjunctiveTypeTree extends Tree {
   19.42 -    List<? extends Tree> getTypeAlternatives();
   19.43 -}

    20.1 --- a/src/share/classes/com/sun/source/tree/DoWhileLoopTree.java	Thu Apr 21 15:33:25 2011 -0700
    20.2 +++ b/src/share/classes/com/sun/source/tree/DoWhileLoopTree.java	Mon Apr 25 15:45:49 2011 -0700
    20.3 @@ -35,7 +35,7 @@
    20.4   *   while ( <em>expression</em> );
    20.5   * </pre>
    20.6   *
    20.7 - * @see "The Java Language Specification, 3rd ed, section 14.13"
    20.8 + * @jls section 14.13
    20.9   *
   20.10   * @author Peter von der Ah&eacute;
   20.11   * @author Jonathan Gibbons

    21.1 --- a/src/share/classes/com/sun/source/tree/EmptyStatementTree.java	Thu Apr 21 15:33:25 2011 -0700
    21.2 +++ b/src/share/classes/com/sun/source/tree/EmptyStatementTree.java	Mon Apr 25 15:45:49 2011 -0700
    21.3 @@ -33,7 +33,7 @@
    21.4   *    ;
    21.5   * </pre>
    21.6   *
    21.7 - * @see "The Java Language Specification, 3rd ed, section 14.6"
    21.8 + * @jls section 14.6
    21.9   *
   21.10   * @author Peter von der Ah&eacute;
   21.11   * @author Jonathan Gibbons

    22.1 --- a/src/share/classes/com/sun/source/tree/EnhancedForLoopTree.java	Thu Apr 21 15:33:25 2011 -0700
    22.2 +++ b/src/share/classes/com/sun/source/tree/EnhancedForLoopTree.java	Mon Apr 25 15:45:49 2011 -0700
    22.3 @@ -34,7 +34,7 @@
    22.4   *       <em>statement</em>
    22.5   * </pre>
    22.6   *
    22.7 - * @see "The Java Language Specification, 3rd ed, section 14.14.2"
    22.8 + * @jls section 14.14.2
    22.9   *
   22.10   * @author Peter von der Ah&eacute;
   22.11   * @author Jonathan Gibbons

    23.1 --- a/src/share/classes/com/sun/source/tree/ExpressionStatementTree.java	Thu Apr 21 15:33:25 2011 -0700
    23.2 +++ b/src/share/classes/com/sun/source/tree/ExpressionStatementTree.java	Mon Apr 25 15:45:49 2011 -0700
    23.3 @@ -33,7 +33,7 @@
    23.4   *   <em>expression</em> ;
    23.5   * </pre>
    23.6   *
    23.7 - * @see "The Java Language Specification, 3rd ed, section 14.8"
    23.8 + * @jls section 14.8
    23.9   *
   23.10   * @author Peter von der Ah&eacute;
   23.11   * @author Jonathan Gibbons

    24.1 --- a/src/share/classes/com/sun/source/tree/ExpressionTree.java	Thu Apr 21 15:33:25 2011 -0700
    24.2 +++ b/src/share/classes/com/sun/source/tree/ExpressionTree.java	Mon Apr 25 15:45:49 2011 -0700
    24.3 @@ -29,7 +29,7 @@
    24.4   * A tree node used as the base class for the different types of
    24.5   * expressions.
    24.6   *
    24.7 - * @see "The Java Language Specification, 3rd ed, chapter 15"
    24.8 + * @jls chapter 15
    24.9   *
   24.10   * @author Peter von der Ahé
   24.11   * @author Jonathan Gibbons

    25.1 --- a/src/share/classes/com/sun/source/tree/ForLoopTree.java	Thu Apr 21 15:33:25 2011 -0700
    25.2 +++ b/src/share/classes/com/sun/source/tree/ForLoopTree.java	Mon Apr 25 15:45:49 2011 -0700
    25.3 @@ -36,7 +36,7 @@
    25.4   *       <em>statement</em>
    25.5   * </pre>
    25.6   *
    25.7 - * @see "The Java Language Specification, 3rd ed, section 14.14.1"
    25.8 + * @jls section 14.14.1
    25.9   *
   25.10   * @author Peter von der Ah&eacute;
   25.11   * @author Jonathan Gibbons

    26.1 --- a/src/share/classes/com/sun/source/tree/IdentifierTree.java	Thu Apr 21 15:33:25 2011 -0700
    26.2 +++ b/src/share/classes/com/sun/source/tree/IdentifierTree.java	Mon Apr 25 15:45:49 2011 -0700
    26.3 @@ -35,7 +35,7 @@
    26.4   *   <em>name</em>
    26.5   * </pre>
    26.6   *
    26.7 - * @see "The Java Language Specification, 3rd ed, section 6.5.6.1"
    26.8 + * @jls section 6.5.6.1
    26.9   *
   26.10   * @author Peter von der Ah&eacute;
   26.11   * @author Jonathan Gibbons

    27.1 --- a/src/share/classes/com/sun/source/tree/IfTree.java	Thu Apr 21 15:33:25 2011 -0700
    27.2 +++ b/src/share/classes/com/sun/source/tree/IfTree.java	Mon Apr 25 15:45:49 2011 -0700
    27.3 @@ -39,7 +39,7 @@
    27.4   *       <em>elseStatement</em>
    27.5   * </pre>
    27.6   *
    27.7 - * @see "The Java Language Specification, 3rd ed, section 14.9"
    27.8 + * @jls section 14.9
    27.9   *
   27.10   * @author Peter von der Ah&eacute;
   27.11   * @author Jonathan Gibbons

    28.1 --- a/src/share/classes/com/sun/source/tree/ImportTree.java	Thu Apr 21 15:33:25 2011 -0700
    28.2 +++ b/src/share/classes/com/sun/source/tree/ImportTree.java	Mon Apr 25 15:45:49 2011 -0700
    28.3 @@ -35,7 +35,7 @@
    28.4   *   static import <em>qualifiedIdentifier</em> ;
    28.5   * </pre>
    28.6   *
    28.7 - * @see "The Java Language Specification, 3rd ed, section 7.5"
    28.8 + * @jls section 7.5
    28.9   *
   28.10   * @author Peter von der Ah&eacute;
   28.11   * @author Jonathan Gibbons

    29.1 --- a/src/share/classes/com/sun/source/tree/InstanceOfTree.java	Thu Apr 21 15:33:25 2011 -0700
    29.2 +++ b/src/share/classes/com/sun/source/tree/InstanceOfTree.java	Mon Apr 25 15:45:49 2011 -0700
    29.3 @@ -33,7 +33,7 @@
    29.4   *   <em>expression</em> instanceof <em>type</em>
    29.5   * </pre>
    29.6   *
    29.7 - * @see "The Java Language Specification, 3rd ed, section 15.20.2"
    29.8 + * @jls section 15.20.2
    29.9   *
   29.10   * @author Peter von der Ah&eacute;
   29.11   * @author Jonathan Gibbons

    30.1 --- a/src/share/classes/com/sun/source/tree/LabeledStatementTree.java	Thu Apr 21 15:33:25 2011 -0700
    30.2 +++ b/src/share/classes/com/sun/source/tree/LabeledStatementTree.java	Mon Apr 25 15:45:49 2011 -0700
    30.3 @@ -35,7 +35,7 @@
    30.4   *   <em>label</em> : <em>statement</em>
    30.5   * </pre>
    30.6   *
    30.7 - * @see "The Java Language Specification, 3rd ed, section 14.7"
    30.8 + * @jls section 14.7
    30.9   *
   30.10   * @author Peter von der Ah&eacute;
   30.11   * @author Jonathan Gibbons

    31.1 --- a/src/share/classes/com/sun/source/tree/LiteralTree.java	Thu Apr 21 15:33:25 2011 -0700
    31.2 +++ b/src/share/classes/com/sun/source/tree/LiteralTree.java	Mon Apr 25 15:45:49 2011 -0700
    31.3 @@ -34,7 +34,7 @@
    31.4   *   <em>value</em>
    31.5   * </pre>
    31.6   *
    31.7 - * @see "The Java Language Specification, 3rd ed, section 15.28"
    31.8 + * @jls section 15.28
    31.9   *
   31.10   * @author Peter von der Ah&eacute;
   31.11   * @author Jonathan Gibbons

    32.1 --- a/src/share/classes/com/sun/source/tree/MemberSelectTree.java	Thu Apr 21 15:33:25 2011 -0700
    32.2 +++ b/src/share/classes/com/sun/source/tree/MemberSelectTree.java	Mon Apr 25 15:45:49 2011 -0700
    32.3 @@ -35,8 +35,7 @@
    32.4   *   <em>expression</em> . <em>identifier</em>
    32.5   * </pre>
    32.6   *
    32.7 - * @see "The Java Language Specification, 3rd ed, sections 6.5,
    32.8 - * 15.11, and 15.12"
    32.9 + * @jls sections 6.5, 15.11,and 15.12
   32.10   *
   32.11   * @author Peter von der Ah&eacute;
   32.12   * @author Jonathan Gibbons

    33.1 --- a/src/share/classes/com/sun/source/tree/MethodInvocationTree.java	Thu Apr 21 15:33:25 2011 -0700
    33.2 +++ b/src/share/classes/com/sun/source/tree/MethodInvocationTree.java	Mon Apr 25 15:45:49 2011 -0700
    33.3 @@ -37,7 +37,7 @@
    33.4   *   this . <em>typeArguments</em> <em>identifier</em> ( <em>arguments</em> )
    33.5   * </pre>
    33.6   *
    33.7 - * @see "The Java Language Specification, 3rd ed, section 15.12"
    33.8 + * @jls section 15.12
    33.9   *
   33.10   * @author Peter von der Ah&eacute;
   33.11   * @author Jonathan Gibbons

    34.1 --- a/src/share/classes/com/sun/source/tree/MethodTree.java	Thu Apr 21 15:33:25 2011 -0700
    34.2 +++ b/src/share/classes/com/sun/source/tree/MethodTree.java	Mon Apr 25 15:45:49 2011 -0700
    34.3 @@ -40,8 +40,7 @@
    34.4   *   <em>modifiers</em> <em>type</em> <em>name</em> () default <em>defaultValue</em>
    34.5   * </pre>
    34.6   *
    34.7 - * @see "The Java Language Specification, 3rd ed, sections 8.4, 8.6, 8.7,
    34.8 - * 9.4, and 9.6"
    34.9 + * @jls sections 8.4, 8.6, 8.7, 9.4, and 9.6
   34.10   *
   34.11   * @author Peter von der Ah&eacute;
   34.12   * @author Jonathan Gibbons

    35.1 --- a/src/share/classes/com/sun/source/tree/ModifiersTree.java	Thu Apr 21 15:33:25 2011 -0700
    35.2 +++ b/src/share/classes/com/sun/source/tree/ModifiersTree.java	Mon Apr 25 15:45:49 2011 -0700
    35.3 @@ -39,8 +39,7 @@
    35.4   *   <em>flags</em> <em>annotations</em>
    35.5   * </pre>
    35.6   *
    35.7 - * @see "The Java Language Specification, 3rd ed, sections
    35.8 - * 8.1.1, 8.3.1, 8.4.3, 8.5.1, 8.8.3, 9.1.1, and 9.7"
    35.9 + * @jls sections 8.1.1, 8.3.1, 8.4.3, 8.5.1, 8.8.3, 9.1.1, and 9.7
   35.10   *
   35.11   * @author Peter von der Ah&eacute;
   35.12   * @author Jonathan Gibbons

    36.1 --- a/src/share/classes/com/sun/source/tree/NewArrayTree.java	Thu Apr 21 15:33:25 2011 -0700
    36.2 +++ b/src/share/classes/com/sun/source/tree/NewArrayTree.java	Mon Apr 25 15:45:49 2011 -0700
    36.3 @@ -37,7 +37,7 @@
    36.4   *   new <em>type</em> <em>dimensions</em> [ ] <em>initializers</em>
    36.5   * </pre>
    36.6   *
    36.7 - * @see "The Java Language Specification, 3rd ed, section 15.10"
    36.8 + * @jls section 15.10
    36.9   *
   36.10   * @author Peter von der Ah&eacute;
   36.11   * @author Jonathan Gibbons

    37.1 --- a/src/share/classes/com/sun/source/tree/NewClassTree.java	Thu Apr 21 15:33:25 2011 -0700
    37.2 +++ b/src/share/classes/com/sun/source/tree/NewClassTree.java	Mon Apr 25 15:45:49 2011 -0700
    37.3 @@ -42,7 +42,7 @@
    37.4   *   <em>enclosingExpression</em>.new <em>identifier</em> ( <em>arguments</em> )
    37.5   * </pre>
    37.6   *
    37.7 - * @see "The Java Language Specification, 3rd ed, section 15.9"
    37.8 + * @jls section 15.9
    37.9   *
   37.10   * @author Peter von der Ah&eacute;
   37.11   * @author Jonathan Gibbons

    38.1 --- a/src/share/classes/com/sun/source/tree/ParameterizedTypeTree.java	Thu Apr 21 15:33:25 2011 -0700
    38.2 +++ b/src/share/classes/com/sun/source/tree/ParameterizedTypeTree.java	Mon Apr 25 15:45:49 2011 -0700
    38.3 @@ -35,7 +35,7 @@
    38.4   *   <em>type</em> &lt; <em>typeArguments</em> &gt;
    38.5   * </pre>
    38.6   *
    38.7 - * @see "The Java Language Specification, 3rd ed, section 4.5.1"
    38.8 + * @jls section 4.5.1
    38.9   *
   38.10   * @author Peter von der Ah&eacute;
   38.11   * @author Jonathan Gibbons

    39.1 --- a/src/share/classes/com/sun/source/tree/ParenthesizedTree.java	Thu Apr 21 15:33:25 2011 -0700
    39.2 +++ b/src/share/classes/com/sun/source/tree/ParenthesizedTree.java	Mon Apr 25 15:45:49 2011 -0700
    39.3 @@ -34,7 +34,7 @@
    39.4   *   ( <em>expression</em> )
    39.5   * </pre>
    39.6   *
    39.7 - * @see "The Java Language Specification, 3rd ed, section 15.8.5"
    39.8 + * @jls section 15.8.5
    39.9   *
   39.10   * @author Peter von der Ah&eacute;
   39.11   * @author Jonathan Gibbons

    40.1 --- a/src/share/classes/com/sun/source/tree/PrimitiveTypeTree.java	Thu Apr 21 15:33:25 2011 -0700
    40.2 +++ b/src/share/classes/com/sun/source/tree/PrimitiveTypeTree.java	Mon Apr 25 15:45:49 2011 -0700
    40.3 @@ -35,7 +35,7 @@
    40.4   *   <em>primitiveTypeKind</em>
    40.5   * </pre>
    40.6   *
    40.7 - * @see "The Java Language Specification, 3rd ed, section 4.2"
    40.8 + * @jls section 4.2
    40.9   *
   40.10   * @author Peter von der Ah&eacute;
   40.11   * @author Jonathan Gibbons

    41.1 --- a/src/share/classes/com/sun/source/tree/ReturnTree.java	Thu Apr 21 15:33:25 2011 -0700
    41.2 +++ b/src/share/classes/com/sun/source/tree/ReturnTree.java	Mon Apr 25 15:45:49 2011 -0700
    41.3 @@ -34,7 +34,7 @@
    41.4   *   return <em>expression</em>;
    41.5   * </pre>
    41.6   *
    41.7 - * @see "The Java Language Specification, 3rd ed, section 14.17"
    41.8 + * @jls section 14.17
    41.9   *
   41.10   * @author Peter von der Ah&eacute;
   41.11   * @author Jonathan Gibbons

    42.1 --- a/src/share/classes/com/sun/source/tree/StatementTree.java	Thu Apr 21 15:33:25 2011 -0700
    42.2 +++ b/src/share/classes/com/sun/source/tree/StatementTree.java	Mon Apr 25 15:45:49 2011 -0700
    42.3 @@ -29,7 +29,7 @@
    42.4   * A tree node used as the base class for the different kinds of
    42.5   * statements.
    42.6   *
    42.7 - * @see "The Java Language Specification, 3rd ed, chapter 14"
    42.8 + * @jls chapter 14
    42.9   *
   42.10   * @author Peter von der Ahé
   42.11   * @author Jonathan Gibbons

    43.1 --- a/src/share/classes/com/sun/source/tree/SwitchTree.java	Thu Apr 21 15:33:25 2011 -0700
    43.2 +++ b/src/share/classes/com/sun/source/tree/SwitchTree.java	Mon Apr 25 15:45:49 2011 -0700
    43.3 @@ -37,7 +37,7 @@
    43.4   *   }
    43.5   * </pre>
    43.6   *
    43.7 - * @see "The Java Language Specification, 3rd ed, section 14.11"
    43.8 + * @jls section 14.11
    43.9   *
   43.10   * @author Peter von der Ah&eacute;
   43.11   * @author Jonathan Gibbons

    44.1 --- a/src/share/classes/com/sun/source/tree/SynchronizedTree.java	Thu Apr 21 15:33:25 2011 -0700
    44.2 +++ b/src/share/classes/com/sun/source/tree/SynchronizedTree.java	Mon Apr 25 15:45:49 2011 -0700
    44.3 @@ -34,7 +34,7 @@
    44.4   *       </em>block</em>
    44.5   * </pre>
    44.6   *
    44.7 - * @see "The Java Language Specification, 3rd ed, section 14.19"
    44.8 + * @jls section 14.19
    44.9   *
   44.10   * @author Peter von der Ah&eacute;
   44.11   * @author Jonathan Gibbons

    45.1 --- a/src/share/classes/com/sun/source/tree/ThrowTree.java	Thu Apr 21 15:33:25 2011 -0700
    45.2 +++ b/src/share/classes/com/sun/source/tree/ThrowTree.java	Mon Apr 25 15:45:49 2011 -0700
    45.3 @@ -33,7 +33,7 @@
    45.4   *   throw <em>expression</em>;
    45.5   * </pre>
    45.6   *
    45.7 - * @see "The Java Language Specification, 3rd ed, section 14.18"
    45.8 + * @jls section 14.18
    45.9   *
   45.10   * @author Peter von der Ah&eacute;
   45.11   * @author Jonathan Gibbons

    46.1 --- a/src/share/classes/com/sun/source/tree/Tree.java	Thu Apr 21 15:33:25 2011 -0700
    46.2 +++ b/src/share/classes/com/sun/source/tree/Tree.java	Mon Apr 25 15:45:49 2011 -0700
    46.3 @@ -232,9 +232,9 @@
    46.4          PARAMETERIZED_TYPE(ParameterizedTypeTree.class),
    46.5  
    46.6          /**
    46.7 -         * Used for instances of {@link DisjunctiveTypeTree}.
    46.8 +         * Used for instances of {@link UnionTypeTree}.
    46.9           */
   46.10 -        DISJUNCTIVE_TYPE(DisjunctiveTypeTree.class),
   46.11 +        UNION_TYPE(UnionTypeTree.class),
   46.12  
   46.13          /**
   46.14           * Used for instances of {@link TypeCastTree}.

    47.1 --- a/src/share/classes/com/sun/source/tree/TreeVisitor.java	Thu Apr 21 15:33:25 2011 -0700
    47.2 +++ b/src/share/classes/com/sun/source/tree/TreeVisitor.java	Mon Apr 25 15:45:49 2011 -0700
    47.3 @@ -95,7 +95,7 @@
    47.4      R visitCompilationUnit(CompilationUnitTree node, P p);
    47.5      R visitTry(TryTree node, P p);
    47.6      R visitParameterizedType(ParameterizedTypeTree node, P p);
    47.7 -    R visitDisjunctiveType(DisjunctiveTypeTree node, P p);
    47.8 +    R visitUnionType(UnionTypeTree node, P p);
    47.9      R visitArrayType(ArrayTypeTree node, P p);
   47.10      R visitTypeCast(TypeCastTree node, P p);
   47.11      R visitPrimitiveType(PrimitiveTypeTree node, P p);

    48.1 --- a/src/share/classes/com/sun/source/tree/TryTree.java	Thu Apr 21 15:33:25 2011 -0700
    48.2 +++ b/src/share/classes/com/sun/source/tree/TryTree.java	Mon Apr 25 15:45:49 2011 -0700
    48.3 @@ -39,7 +39,7 @@
    48.4   *       <em>finallyBlock</em>
    48.5   * </pre>
    48.6   *
    48.7 - * @see "The Java Language Specification, 3rd ed, section 14.20"
    48.8 + * @jls section 14.20
    48.9   *
   48.10   * @author Peter von der Ah&eacute;
   48.11   * @author Jonathan Gibbons

    49.1 --- a/src/share/classes/com/sun/source/tree/TypeCastTree.java	Thu Apr 21 15:33:25 2011 -0700
    49.2 +++ b/src/share/classes/com/sun/source/tree/TypeCastTree.java	Mon Apr 25 15:45:49 2011 -0700
    49.3 @@ -33,7 +33,7 @@
    49.4   *   ( <em>type</em> ) <em>expression</em>
    49.5   * </pre>
    49.6   *
    49.7 - * @see "The Java Language Specification, 3rd ed, section 15.16"
    49.8 + * @jls section 15.16
    49.9   *
   49.10   * @author Peter von der Ah&eacute;
   49.11   * @author Jonathan Gibbons

    50.1 --- a/src/share/classes/com/sun/source/tree/TypeParameterTree.java	Thu Apr 21 15:33:25 2011 -0700
    50.2 +++ b/src/share/classes/com/sun/source/tree/TypeParameterTree.java	Mon Apr 25 15:45:49 2011 -0700
    50.3 @@ -38,7 +38,7 @@
    50.4   *   <em>name</em> extends <em>bounds</em>
    50.5   * </pre>
    50.6   *
    50.7 - * @see "The Java Language Specification, 3rd ed, section 4.4"
    50.8 + * @jls section 4.4
    50.9   *
   50.10   * @author Peter von der Ah&eacute;
   50.11   * @author Jonathan Gibbons

    51.1 --- a/src/share/classes/com/sun/source/tree/UnaryTree.java	Thu Apr 21 15:33:25 2011 -0700
    51.2 +++ b/src/share/classes/com/sun/source/tree/UnaryTree.java	Mon Apr 25 15:45:49 2011 -0700
    51.3 @@ -36,7 +36,7 @@
    51.4   *   <em>expression</em> <em>operator</em>
    51.5   * </pre>
    51.6   *
    51.7 - * @see "The Java Language Specification, 3rd ed, sections 15.14 and 15.15"
    51.8 + * @jls sections 15.14 and 15.15
    51.9   *
   51.10   * @author Peter von der Ah&eacute;
   51.11   * @author Jonathan Gibbons

    52.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    52.2 +++ b/src/share/classes/com/sun/source/tree/UnionTypeTree.java	Mon Apr 25 15:45:49 2011 -0700
    52.3 @@ -0,0 +1,39 @@
    52.4 +/*
    52.5 + * Copyright (c) 2010, 2011 Oracle and/or its affiliates. All rights reserved.
    52.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    52.7 + *
    52.8 + * This code is free software; you can redistribute it and/or modify it
    52.9 + * under the terms of the GNU General Public License version 2 only, as
   52.10 + * published by the Free Software Foundation.  Oracle designates this
   52.11 + * particular file as subject to the "Classpath" exception as provided
   52.12 + * by Oracle in the LICENSE file that accompanied this code.
   52.13 + *
   52.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   52.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   52.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   52.17 + * version 2 for more details (a copy is included in the LICENSE file that
   52.18 + * accompanied this code).
   52.19 + *
   52.20 + * You should have received a copy of the GNU General Public License version
   52.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   52.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   52.23 + *
   52.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   52.25 + * or visit www.oracle.com if you need additional information or have any
   52.26 + * questions.
   52.27 + */
   52.28 +
   52.29 +package com.sun.source.tree;
   52.30 +
   52.31 +import java.util.List;
   52.32 +
   52.33 +/**
   52.34 + * A tree node for a union type expression in a multicatch var declaration.
   52.35 + *
   52.36 + * @author Maurizio Cimadamore
   52.37 + *
   52.38 + * @since 1.7
   52.39 + */
   52.40 +public interface UnionTypeTree extends Tree {
   52.41 +    List<? extends Tree> getTypeAlternatives();
   52.42 +}

    53.1 --- a/src/share/classes/com/sun/source/tree/VariableTree.java	Thu Apr 21 15:33:25 2011 -0700
    53.2 +++ b/src/share/classes/com/sun/source/tree/VariableTree.java	Mon Apr 25 15:45:49 2011 -0700
    53.3 @@ -35,7 +35,7 @@
    53.4   *   <em>modifiers</em> <em>type</em> <em>name</em> <em>initializer</em> ;
    53.5   * </pre>
    53.6   *
    53.7 - * @see "The Java Language Specification, 3rd ed, sections 8.3 and 14.4"
    53.8 + * @jls sections 8.3 and 14.4
    53.9   *
   53.10   * @author Peter von der Ah&eacute;
   53.11   * @author Jonathan Gibbons

    54.1 --- a/src/share/classes/com/sun/source/tree/WhileLoopTree.java	Thu Apr 21 15:33:25 2011 -0700
    54.2 +++ b/src/share/classes/com/sun/source/tree/WhileLoopTree.java	Mon Apr 25 15:45:49 2011 -0700
    54.3 @@ -35,7 +35,7 @@
    54.4   * </pre>
    54.5   *
    54.6   *
    54.7 - * @see "The Java Language Specification, 3rd ed, section 14.12"
    54.8 + * @jls section 14.12
    54.9   *
   54.10   * @author Peter von der Ah&eacute;
   54.11   * @author Jonathan Gibbons

    55.1 --- a/src/share/classes/com/sun/source/tree/WildcardTree.java	Thu Apr 21 15:33:25 2011 -0700
    55.2 +++ b/src/share/classes/com/sun/source/tree/WildcardTree.java	Mon Apr 25 15:45:49 2011 -0700
    55.3 @@ -38,7 +38,7 @@
    55.4   *   ? super <em>bound</em>
    55.5   * </pre>
    55.6   *
    55.7 - * @see "The Java Language Specification, 3rd ed, section 4.5.1"
    55.8 + * @jls section 4.5.1
    55.9   *
   55.10   * @author Peter von der Ah&eacute;
   55.11   * @author Jonathan Gibbons

    56.1 --- a/src/share/classes/com/sun/source/util/SimpleTreeVisitor.java	Thu Apr 21 15:33:25 2011 -0700
    56.2 +++ b/src/share/classes/com/sun/source/util/SimpleTreeVisitor.java	Mon Apr 25 15:45:49 2011 -0700
    56.3 @@ -228,7 +228,7 @@
    56.4          return defaultAction(node, p);
    56.5      }
    56.6  
    56.7 -    public R visitDisjunctiveType(DisjunctiveTypeTree node, P p) {
    56.8 +    public R visitUnionType(UnionTypeTree node, P p) {
    56.9          return defaultAction(node, p);
   56.10      }
   56.11  

    57.1 --- a/src/share/classes/com/sun/source/util/TreeScanner.java	Thu Apr 21 15:33:25 2011 -0700
    57.2 +++ b/src/share/classes/com/sun/source/util/TreeScanner.java	Mon Apr 25 15:45:49 2011 -0700
    57.3 @@ -355,7 +355,7 @@
    57.4          return r;
    57.5      }
    57.6  
    57.7 -    public R visitDisjunctiveType(DisjunctiveTypeTree node, P p) {
    57.8 +    public R visitUnionType(UnionTypeTree node, P p) {
    57.9          return scan(node.getTypeAlternatives(), p);
   57.10      }
   57.11  

    58.1 --- a/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java	Thu Apr 21 15:33:25 2011 -0700
    58.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java	Mon Apr 25 15:45:49 2011 -0700
    58.3 @@ -67,7 +67,8 @@
    58.4  
    58.5      /**
    58.6       * {@inheritDoc}
    58.7 -     * See JLS 2 sections 8.3 and 8.4.6.
    58.8 +     * See sections 8.3 and 8.4.6 of
    58.9 +     * <cite>The Java&trade; Language Specification</cite>
   58.10       */
   58.11      public boolean hides(MemberDeclaration sub, MemberDeclaration sup) {
   58.12          Symbol hider = ((DeclarationImpl) sub).sym;
   58.13 @@ -107,7 +108,8 @@
   58.14  
   58.15      /**
   58.16       * {@inheritDoc}
   58.17 -     * See JLS 2 section 8.4.6.1.
   58.18 +     * See section 8.4.6.1 of
   58.19 +     * <cite>The Java&trade; Language Specification</cite>
   58.20       */
   58.21      public boolean overrides(MethodDeclaration sub, MethodDeclaration sup) {
   58.22          MethodSymbol overrider = ((MethodDeclarationImpl) sub).sym;

    59.1 --- a/src/share/classes/com/sun/tools/classfile/AccessFlags.java	Thu Apr 21 15:33:25 2011 -0700
    59.2 +++ b/src/share/classes/com/sun/tools/classfile/AccessFlags.java	Mon Apr 25 15:45:49 2011 -0700
    59.3 @@ -30,7 +30,7 @@
    59.4  import java.util.Set;
    59.5  
    59.6  /**
    59.7 - * See JVMS3, sections 4.2, 4.6, 4.7.
    59.8 + * See JVMS, sections 4.2, 4.6, 4.7.
    59.9   *
   59.10   *  <p><b>This is NOT part of any supported API.
   59.11   *  If you write code that depends on this, you do so at your own risk.

    60.1 --- a/src/share/classes/com/sun/tools/classfile/Annotation.java	Thu Apr 21 15:33:25 2011 -0700
    60.2 +++ b/src/share/classes/com/sun/tools/classfile/Annotation.java	Mon Apr 25 15:45:49 2011 -0700
    60.3 @@ -28,7 +28,7 @@
    60.4  import java.io.IOException;
    60.5  
    60.6  /**
    60.7 - * See JVMS3, section 4.8.16.
    60.8 + * See JVMS, section 4.8.16.
    60.9   *
   60.10   *  <p><b>This is NOT part of any supported API.
   60.11   *  If you write code that depends on this, you do so at your own risk.
   60.12 @@ -71,7 +71,7 @@
   60.13      public final element_value_pair element_value_pairs[];
   60.14  
   60.15      /**
   60.16 -     * See JVMS3, section 4.8.16.1.
   60.17 +     * See JVMS, section 4.8.16.1.
   60.18       */
   60.19      public static abstract class element_value {
   60.20          public static element_value read(ClassReader cr)

    61.1 --- a/src/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java	Thu Apr 21 15:33:25 2011 -0700
    61.2 +++ b/src/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java	Mon Apr 25 15:45:49 2011 -0700
    61.3 @@ -28,7 +28,7 @@
    61.4  import java.io.IOException;
    61.5  
    61.6  /**
    61.7 - * See JVMS3, section 4.8.15.
    61.8 + * See JVMS, section 4.8.15.
    61.9   *
   61.10   *  <p><b>This is NOT part of any supported API.
   61.11   *  If you write code that depends on this, you do so at your own risk.

    62.1 --- a/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java	Thu Apr 21 15:33:25 2011 -0700
    62.2 +++ b/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java	Mon Apr 25 15:45:49 2011 -0700
    62.3 @@ -28,7 +28,7 @@
    62.4  import java.io.IOException;
    62.5  
    62.6  /**
    62.7 - * See JVMS3 <TBD>
    62.8 + * See JVMS <TBD>
    62.9   * http://cr.openjdk.java.net/~jrose/pres/indy-javadoc-mlvm/
   62.10   *
   62.11   *  <p><b>This is NOT part of any supported API.

    63.1 --- a/src/share/classes/com/sun/tools/classfile/ClassFile.java	Thu Apr 21 15:33:25 2011 -0700
    63.2 +++ b/src/share/classes/com/sun/tools/classfile/ClassFile.java	Mon Apr 25 15:45:49 2011 -0700
    63.3 @@ -33,7 +33,7 @@
    63.4  import static com.sun.tools.classfile.AccessFlags.*;
    63.5  
    63.6  /**
    63.7 - * See JVMS3, section 4.2.
    63.8 + * See JVMS, section 4.2.
    63.9   *
   63.10   *  <p><b>This is NOT part of any supported API.
   63.11   *  If you write code that depends on this, you do so at your own risk.

    64.1 --- a/src/share/classes/com/sun/tools/classfile/Code_attribute.java	Thu Apr 21 15:33:25 2011 -0700
    64.2 +++ b/src/share/classes/com/sun/tools/classfile/Code_attribute.java	Mon Apr 25 15:45:49 2011 -0700
    64.3 @@ -30,7 +30,7 @@
    64.4  import java.util.NoSuchElementException;
    64.5  
    64.6  /**
    64.7 - * See JVMS3, section 4.8.3.
    64.8 + * See JVMS, section 4.8.3.
    64.9   *
   64.10   *  <p><b>This is NOT part of any supported API.
   64.11   *  If you write code that depends on this, you do so at your own risk.

    65.1 --- a/src/share/classes/com/sun/tools/classfile/ConstantPool.java	Thu Apr 21 15:33:25 2011 -0700
    65.2 +++ b/src/share/classes/com/sun/tools/classfile/ConstantPool.java	Mon Apr 25 15:45:49 2011 -0700
    65.3 @@ -31,7 +31,7 @@
    65.4  import java.util.Iterator;
    65.5  
    65.6  /**
    65.7 - * See JVMS3, section 4.5.
    65.8 + * See JVMS, section 4.5.
    65.9   *
   65.10   *  <p><b>This is NOT part of any supported API.
   65.11   *  If you write code that depends on this, you do so at your own risk.

    66.1 --- a/src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java	Thu Apr 21 15:33:25 2011 -0700
    66.2 +++ b/src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java	Mon Apr 25 15:45:49 2011 -0700
    66.3 @@ -28,7 +28,7 @@
    66.4  import java.io.IOException;
    66.5  
    66.6  /**
    66.7 - * See JVMS3, section 4.8.2.
    66.8 + * See JVMS, section 4.8.2.
    66.9   *
   66.10   *  <p><b>This is NOT part of any supported API.
   66.11   *  If you write code that depends on this, you do so at your own risk.

    67.1 --- a/src/share/classes/com/sun/tools/classfile/Deprecated_attribute.java	Thu Apr 21 15:33:25 2011 -0700
    67.2 +++ b/src/share/classes/com/sun/tools/classfile/Deprecated_attribute.java	Mon Apr 25 15:45:49 2011 -0700
    67.3 @@ -28,7 +28,7 @@
    67.4  import java.io.IOException;
    67.5  
    67.6  /**
    67.7 - * See JVMS3, section 4.8.15.
    67.8 + * See JVMS, section 4.8.15.
    67.9   *
   67.10   *  <p><b>This is NOT part of any supported API.
   67.11   *  If you write code that depends on this, you do so at your own risk.

    68.1 --- a/src/share/classes/com/sun/tools/classfile/Descriptor.java	Thu Apr 21 15:33:25 2011 -0700
    68.2 +++ b/src/share/classes/com/sun/tools/classfile/Descriptor.java	Mon Apr 25 15:45:49 2011 -0700
    68.3 @@ -29,7 +29,7 @@
    68.4  import java.io.IOException;
    68.5  
    68.6  /**
    68.7 - * See JVMS3, section 4.4.
    68.8 + * See JVMS, section 4.4.
    68.9   *
   68.10   *  <p><b>This is NOT part of any supported API.
   68.11   *  If you write code that depends on this, you do so at your own risk.

    69.1 --- a/src/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java	Thu Apr 21 15:33:25 2011 -0700
    69.2 +++ b/src/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java	Mon Apr 25 15:45:49 2011 -0700
    69.3 @@ -29,7 +29,7 @@
    69.4  import java.io.IOException;
    69.5  
    69.6  /**
    69.7 - * See JVMS3, section 4.8.7.
    69.8 + * See JVMS, section 4.8.7.
    69.9   *
   69.10   *  <p><b>This is NOT part of any supported API.
   69.11   *  If you write code that depends on this, you do so at your own risk.

    70.1 --- a/src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java	Thu Apr 21 15:33:25 2011 -0700
    70.2 +++ b/src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java	Mon Apr 25 15:45:49 2011 -0700
    70.3 @@ -28,7 +28,7 @@
    70.4  import java.io.IOException;
    70.5  
    70.6  /**
    70.7 - * See JVMS3, section 4.8.5.
    70.8 + * See JVMS, section 4.8.5.
    70.9   *
   70.10   *  <p><b>This is NOT part of any supported API.
   70.11   *  If you write code that depends on this, you do so at your own risk.

    71.1 --- a/src/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java	Thu Apr 21 15:33:25 2011 -0700
    71.2 +++ b/src/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java	Mon Apr 25 15:45:49 2011 -0700
    71.3 @@ -30,7 +30,7 @@
    71.4  import com.sun.tools.classfile.ConstantPool.*;
    71.5  
    71.6  /**
    71.7 - * See JVMS3, section 4.8.6.
    71.8 + * See JVMS, section 4.8.6.
    71.9   *
   71.10   *  <p><b>This is NOT part of any supported API.
   71.11   *  If you write code that depends on this, you do so at your own risk.

    72.1 --- a/src/share/classes/com/sun/tools/classfile/Instruction.java	Thu Apr 21 15:33:25 2011 -0700
    72.2 +++ b/src/share/classes/com/sun/tools/classfile/Instruction.java	Mon Apr 25 15:45:49 2011 -0700
    72.3 @@ -26,7 +26,7 @@
    72.4  package com.sun.tools.classfile;
    72.5  
    72.6  /**
    72.7 - * See JVMS3, chapter 6.
    72.8 + * See JVMS, chapter 6.
    72.9   *
   72.10   *  <p><b>This is NOT part of any supported API.
   72.11   *  If you write code that depends on this, you do so at your own risk.

    73.1 --- a/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java	Thu Apr 21 15:33:25 2011 -0700
    73.2 +++ b/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java	Mon Apr 25 15:45:49 2011 -0700
    73.3 @@ -28,7 +28,7 @@
    73.4  import java.io.IOException;
    73.5  
    73.6  /**
    73.7 - * See JVMS3, section 4.8.12.
    73.8 + * See JVMS, section 4.8.12.
    73.9   *
   73.10   *  <p><b>This is NOT part of any supported API.
   73.11   *  If you write code that depends on this, you do so at your own risk.

    74.1 --- a/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java	Thu Apr 21 15:33:25 2011 -0700
    74.2 +++ b/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java	Mon Apr 25 15:45:49 2011 -0700
    74.3 @@ -28,7 +28,7 @@
    74.4  import java.io.IOException;
    74.5  
    74.6  /**
    74.7 - * See JVMS3, section 4.8.13.
    74.8 + * See JVMS, section 4.8.13.
    74.9   *
   74.10   *  <p><b>This is NOT part of any supported API.
   74.11   *  If you write code that depends on this, you do so at your own risk.

    75.1 --- a/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java	Thu Apr 21 15:33:25 2011 -0700
    75.2 +++ b/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java	Mon Apr 25 15:45:49 2011 -0700
    75.3 @@ -28,7 +28,7 @@
    75.4  import java.io.IOException;
    75.5  
    75.6  /**
    75.7 - * See JVMS3, section 4.8.14.
    75.8 + * See JVMS, section 4.8.14.
    75.9   *
   75.10   *  <p><b>This is NOT part of any supported API.
   75.11   *  If you write code that depends on this, you do so at your own risk.

    76.1 --- a/src/share/classes/com/sun/tools/classfile/Opcode.java	Thu Apr 21 15:33:25 2011 -0700
    76.2 +++ b/src/share/classes/com/sun/tools/classfile/Opcode.java	Mon Apr 25 15:45:49 2011 -0700
    76.3 @@ -29,7 +29,7 @@
    76.4  import static com.sun.tools.classfile.Opcode.Set.*;
    76.5  
    76.6  /**
    76.7 - * See JVMS3, chapter 6.
    76.8 + * See JVMS, chapter 6.
    76.9   *
   76.10   * <p>In addition to providing all the standard opcodes defined in JVMS,
   76.11   * this class also provides legacy support for the PicoJava extensions.

    77.1 --- a/src/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java	Thu Apr 21 15:33:25 2011 -0700
    77.2 +++ b/src/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java	Mon Apr 25 15:45:49 2011 -0700
    77.3 @@ -28,7 +28,7 @@
    77.4  import java.io.IOException;
    77.5  
    77.6  /**
    77.7 - * See JVMS3, section 4.8.16 and 4.8.17.
    77.8 + * See JVMS, section 4.8.16 and 4.8.17.
    77.9   *
   77.10   *  <p><b>This is NOT part of any supported API.
   77.11   *  If you write code that depends on this, you do so at your own risk.

    78.1 --- a/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java	Thu Apr 21 15:33:25 2011 -0700
    78.2 +++ b/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java	Mon Apr 25 15:45:49 2011 -0700
    78.3 @@ -28,7 +28,7 @@
    78.4  import java.io.IOException;
    78.5  
    78.6  /**
    78.7 - * See JVMS3, section 4.8.17.
    78.8 + * See JVMS, section 4.8.17.
    78.9   *
   78.10   *  <p><b>This is NOT part of any supported API.
   78.11   *  If you write code that depends on this, you do so at your own risk.

    79.1 --- a/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java	Thu Apr 21 15:33:25 2011 -0700
    79.2 +++ b/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java	Mon Apr 25 15:45:49 2011 -0700
    79.3 @@ -28,7 +28,7 @@
    79.4  import java.io.IOException;
    79.5  
    79.6  /**
    79.7 - * See JVMS3, section 4.8.18.
    79.8 + * See JVMS, section 4.8.18.
    79.9   *
   79.10   *  <p><b>This is NOT part of any supported API.
   79.11   *  If you write code that depends on this, you do so at your own risk.

    80.1 --- a/src/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java	Thu Apr 21 15:33:25 2011 -0700
    80.2 +++ b/src/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java	Mon Apr 25 15:45:49 2011 -0700
    80.3 @@ -28,7 +28,7 @@
    80.4  import java.io.IOException;
    80.5  
    80.6  /**
    80.7 - * See JVMS3, section 4.8.18 and 4.8.19.
    80.8 + * See JVMS, section 4.8.18 and 4.8.19.
    80.9   *
   80.10   *  <p><b>This is NOT part of any supported API.
   80.11   *  If you write code that depends on this, you do so at your own risk.

    81.1 --- a/src/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java	Thu Apr 21 15:33:25 2011 -0700
    81.2 +++ b/src/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java	Mon Apr 25 15:45:49 2011 -0700
    81.3 @@ -28,7 +28,7 @@
    81.4  import java.io.IOException;
    81.5  
    81.6  /**
    81.7 - * See JVMS3, section 4.8.16.
    81.8 + * See JVMS, section 4.8.16.
    81.9   *
   81.10   *  <p><b>This is NOT part of any supported API.
   81.11   *  If you write code that depends on this, you do so at your own risk.

    82.1 --- a/src/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java	Thu Apr 21 15:33:25 2011 -0700
    82.2 +++ b/src/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java	Mon Apr 25 15:45:49 2011 -0700
    82.3 @@ -28,7 +28,7 @@
    82.4  import java.io.IOException;
    82.5  
    82.6  /**
    82.7 - * See JVMS3, section 4.8.18.
    82.8 + * See JVMS, section 4.8.18.
    82.9   *
   82.10   *  <p><b>This is NOT part of any supported API.
   82.11   *  If you write code that depends on this, you do so at your own risk.

    83.1 --- a/src/share/classes/com/sun/tools/classfile/Signature.java	Thu Apr 21 15:33:25 2011 -0700
    83.2 +++ b/src/share/classes/com/sun/tools/classfile/Signature.java	Mon Apr 25 15:45:49 2011 -0700
    83.3 @@ -30,7 +30,7 @@
    83.4  import com.sun.tools.classfile.Type.*;
    83.5  
    83.6  /**
    83.7 - * See JVMS3 4.4.4.
    83.8 + * See JVMS 4.4.4.
    83.9   *
   83.10   *  <p><b>This is NOT part of any supported API.
   83.11   *  If you write code that depends on this, you do so at your own risk.

    84.1 --- a/src/share/classes/com/sun/tools/classfile/Signature_attribute.java	Thu Apr 21 15:33:25 2011 -0700
    84.2 +++ b/src/share/classes/com/sun/tools/classfile/Signature_attribute.java	Mon Apr 25 15:45:49 2011 -0700
    84.3 @@ -28,7 +28,7 @@
    84.4  import java.io.IOException;
    84.5  
    84.6  /**
    84.7 - * See JVMS3, section 4.8.9.
    84.8 + * See JVMS, section 4.8.9.
    84.9   *
   84.10   *  <p><b>This is NOT part of any supported API.
   84.11   *  If you write code that depends on this, you do so at your own risk.

    85.1 --- a/src/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java	Thu Apr 21 15:33:25 2011 -0700
    85.2 +++ b/src/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java	Mon Apr 25 15:45:49 2011 -0700
    85.3 @@ -30,7 +30,7 @@
    85.4  import java.io.IOException;
    85.5  
    85.6  /**
    85.7 - * See JVMS3, section 4.8.15.
    85.8 + * See JVMS, section 4.8.15.
    85.9   *
   85.10   *  <p><b>This is NOT part of any supported API.
   85.11   *  If you write code that depends on this, you do so at your own risk.

    86.1 --- a/src/share/classes/com/sun/tools/classfile/SourceFile_attribute.java	Thu Apr 21 15:33:25 2011 -0700
    86.2 +++ b/src/share/classes/com/sun/tools/classfile/SourceFile_attribute.java	Mon Apr 25 15:45:49 2011 -0700
    86.3 @@ -28,7 +28,7 @@
    86.4  import java.io.IOException;
    86.5  
    86.6  /**
    86.7 - * See JVMS3, section 4.8.10.
    86.8 + * See JVMS, section 4.8.10.
    86.9   *
   86.10   *  <p><b>This is NOT part of any supported API.
   86.11   *  If you write code that depends on this, you do so at your own risk.

    87.1 --- a/src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java	Thu Apr 21 15:33:25 2011 -0700
    87.2 +++ b/src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java	Mon Apr 25 15:45:49 2011 -0700
    87.3 @@ -28,7 +28,7 @@
    87.4  import java.io.IOException;
    87.5  
    87.6  /**
    87.7 - * See JVMS3, section 4.8.4.
    87.8 + * See JVMS, section 4.8.4.
    87.9   *
   87.10   *  <p><b>This is NOT part of any supported API.
   87.11   *  If you write code that depends on this, you do so at your own risk.

    88.1 --- a/src/share/classes/com/sun/tools/classfile/Synthetic_attribute.java	Thu Apr 21 15:33:25 2011 -0700
    88.2 +++ b/src/share/classes/com/sun/tools/classfile/Synthetic_attribute.java	Mon Apr 25 15:45:49 2011 -0700
    88.3 @@ -28,7 +28,7 @@
    88.4  import java.io.IOException;
    88.5  
    88.6  /**
    88.7 - * See JVMS3, section 4.8.8.
    88.8 + * See JVMS, section 4.8.8.
    88.9   *
   88.10   *  <p><b>This is NOT part of any supported API.
   88.11   *  If you write code that depends on this, you do so at your own risk.

    89.1 --- a/src/share/classes/com/sun/tools/classfile/package.html	Thu Apr 21 15:33:25 2011 -0700
    89.2 +++ b/src/share/classes/com/sun/tools/classfile/package.html	Mon Apr 25 15:45:49 2011 -0700
    89.3 @@ -6,7 +6,7 @@
    89.4    </head>
    89.5    <body>
    89.6      A minimalist library to read and write class files into objects closely 
    89.7 -    based on the corresponding definitions in the Java Virtual Machine 
    89.8 -    Specification (JVMS).
    89.9 +    based on the corresponding definitions in 
   89.10 +    <cite>The Java&trade; Virtual Machine Specification</cite> (JVMS).
   89.11    </body>
   89.12  </html>

    90.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Thu Apr 21 15:33:25 2011 -0700
    90.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Mon Apr 25 15:45:49 2011 -0700
    90.3 @@ -2523,8 +2523,9 @@
    90.4      }
    90.5  
    90.6      /**
    90.7 -     * According to the Java Language Specifications, all the outer classes
    90.8 -     * and static nested classes are core classes.
    90.9 +     * According to
   90.10 +     * <cite>The Java&trade; Language Specification</cite>,
   90.11 +     * all the outer classes and static nested classes are core classes.
   90.12       */
   90.13      public boolean isCoreClass(ClassDoc cd) {
   90.14          return cd.containingClass() == null || cd.isStatic();

    91.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java	Thu Apr 21 15:33:25 2011 -0700
    91.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java	Mon Apr 25 15:45:49 2011 -0700
    91.3 @@ -175,8 +175,9 @@
    91.4      }
    91.5  
    91.6      /**
    91.7 -     * According to the Java Language Specifications, all the outer classes
    91.8 -     * and static inner classes are core classes.
    91.9 +     * According to
   91.10 +     * <cite>The Java&trade; Language Specification</cite>,
   91.11 +     * all the outer classes and static inner classes are core classes.
   91.12       */
   91.13      public static boolean isCoreClass(ClassDoc cd) {
   91.14          return cd.containingClass() == null || cd.isStatic();

    92.1 --- a/src/share/classes/com/sun/tools/javac/code/Flags.java	Thu Apr 21 15:33:25 2011 -0700
    92.2 +++ b/src/share/classes/com/sun/tools/javac/code/Flags.java	Mon Apr 25 15:45:49 2011 -0700
    92.3 @@ -231,9 +231,9 @@
    92.4      public static final long PROPRIETARY = 1L<<38;
    92.5  
    92.6      /**
    92.7 -     * Flag that marks a disjunction var in a multi-catch clause
    92.8 +     * Flag that marks a a multi-catch parameter
    92.9       */
   92.10 -    public static final long DISJUNCTION = 1L<<39;
   92.11 +    public static final long UNION = 1L<<39;
   92.12  
   92.13      /**
   92.14       * Flag that marks a signature-polymorphic invoke method.

    93.1 --- a/src/share/classes/com/sun/tools/javac/code/Symbol.java	Thu Apr 21 15:33:25 2011 -0700
    93.2 +++ b/src/share/classes/com/sun/tools/javac/code/Symbol.java	Mon Apr 25 15:45:49 2011 -0700
    93.3 @@ -1193,7 +1193,7 @@
    93.4          }
    93.5  
    93.6          private boolean isOverridableIn(TypeSymbol origin) {
    93.7 -            // JLS3 8.4.6.1
    93.8 +            // JLS 8.4.6.1
    93.9              switch ((int)(flags_field & Flags.AccessFlags)) {
   93.10              case Flags.PRIVATE:
   93.11                  return false;

    94.1 --- a/src/share/classes/com/sun/tools/javac/code/Types.java	Thu Apr 21 15:33:25 2011 -0700
    94.2 +++ b/src/share/classes/com/sun/tools/javac/code/Types.java	Mon Apr 25 15:45:49 2011 -0700
    94.3 @@ -1985,7 +1985,7 @@
    94.4       * signature</em> of the other.  This is <b>not</b> an equivalence
    94.5       * relation.
    94.6       *
    94.7 -     * @see "The Java Language Specification, Third Ed. (8.4.2)."
    94.8 +     * @jls section 8.4.2.
    94.9       * @see #overrideEquivalent(Type t, Type s)
   94.10       * @param t first signature (possibly raw).
   94.11       * @param s second signature (could be subjected to erasure).
   94.12 @@ -2004,7 +2004,7 @@
   94.13       * equivalence</em>.  This is the natural extension of
   94.14       * isSubSignature to an equivalence relation.
   94.15       *
   94.16 -     * @see "The Java Language Specification, Third Ed. (8.4.2)."
   94.17 +     * @jls section 8.4.2.
   94.18       * @see #isSubSignature(Type t, Type s)
   94.19       * @param t a signature (possible raw, could be subjected to
   94.20       * erasure).
   94.21 @@ -2309,7 +2309,7 @@
   94.22              if (elemtype == t.elemtype)
   94.23                  return t;
   94.24              else
   94.25 -                return new ArrayType(upperBound(elemtype), t.tsym);
   94.26 +                return new ArrayType(elemtype, t.tsym);
   94.27          }
   94.28  
   94.29          @Override
   94.30 @@ -3049,8 +3049,7 @@
   94.31  
   94.32      /**
   94.33       * Return-Type-Substitutable.
   94.34 -     * @see <a href="http://java.sun.com/docs/books/jls/">The Java
   94.35 -     * Language Specification, Third Ed. (8.4.5)</a>
   94.36 +     * @jls section 8.4.5
   94.37       */
   94.38      public boolean returnTypeSubstitutable(Type r1, Type r2) {
   94.39          if (hasSameArgs(r1, r2))
   94.40 @@ -3130,7 +3129,7 @@
   94.41  
   94.42      // <editor-fold defaultstate="collapsed" desc="Capture conversion">
   94.43      /*
   94.44 -     * JLS 3rd Ed. 5.1.10 Capture Conversion:
   94.45 +     * JLS 5.1.10 Capture Conversion:
   94.46       *
   94.47       * Let G name a generic type declaration with n formal type
   94.48       * parameters A1 ... An with corresponding bounds U1 ... Un. There
   94.49 @@ -3163,7 +3162,7 @@
   94.50       * Capture conversion is not applied recursively.
   94.51       */
   94.52      /**
   94.53 -     * Capture conversion as specified by JLS 3rd Ed.
   94.54 +     * Capture conversion as specified by the JLS.
   94.55       */
   94.56  
   94.57      public List<Type> capture(List<Type> ts) {

    95.1 --- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Thu Apr 21 15:33:25 2011 -0700
    95.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Mon Apr 25 15:45:49 2011 -0700
    95.3 @@ -1112,7 +1112,7 @@
    95.4              Type ctype = attribStat(c.param, catchEnv);
    95.5              if (TreeInfo.isMultiCatch(c)) {
    95.6                  //multi-catch parameter is implicitly marked as final
    95.7 -                c.param.sym.flags_field |= FINAL | DISJUNCTION;
    95.8 +                c.param.sym.flags_field |= FINAL | UNION;
    95.9              }
   95.10              if (c.param.sym.kind == Kinds.VAR) {
   95.11                  c.param.sym.setData(ElementKind.EXCEPTION_PARAMETER);
   95.12 @@ -2632,10 +2632,10 @@
   95.13           * @param tree    The tree making up the variable reference.
   95.14           * @param env     The current environment.
   95.15           * @param v       The variable's symbol.
   95.16 -         * @see JLS 3rd Ed. (8.9 Enums)
   95.17 +         * @jls  section 8.9 Enums
   95.18           */
   95.19          private void checkEnumInitializer(JCTree tree, Env<AttrContext> env, VarSymbol v) {
   95.20 -            // JLS 3rd Ed.:
   95.21 +            // JLS:
   95.22              //
   95.23              // "It is a compile-time error to reference a static field
   95.24              // of an enum type that is not a compile-time constant
   95.25 @@ -2908,7 +2908,7 @@
   95.26          result = check(tree, owntype, TYP, pkind, pt);
   95.27      }
   95.28  
   95.29 -    public void visitTypeDisjunction(JCTypeDisjunction tree) {
   95.30 +    public void visitTypeUnion(JCTypeUnion tree) {
   95.31          ListBuffer<Type> multicatchTypes = ListBuffer.lb();
   95.32          for (JCExpression typeTree : tree.alternatives) {
   95.33              Type ctype = attribType(typeTree, env);
   95.34 @@ -2916,7 +2916,7 @@
   95.35                            chk.checkClassType(typeTree.pos(), ctype),
   95.36                            syms.throwableType);
   95.37              if (!ctype.isErroneous()) {
   95.38 -                //check that alternatives of a disjunctive type are pairwise
   95.39 +                //check that alternatives of a union type are pairwise
   95.40                  //unrelated w.r.t. subtyping
   95.41                  if (chk.intersects(ctype,  multicatchTypes.toList())) {
   95.42                      for (Type t : multicatchTypes) {

    96.1 --- a/src/share/classes/com/sun/tools/javac/comp/Check.java	Thu Apr 21 15:33:25 2011 -0700
    96.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Check.java	Mon Apr 25 15:45:49 2011 -0700
    96.3 @@ -2271,7 +2271,7 @@
    96.4       * that of any public or protected method declared in class Object
    96.5       * or in the interface annotation.Annotation."
    96.6       *
    96.7 -     * @jls3 9.6 Annotation Types
    96.8 +     * @jls 9.6 Annotation Types
    96.9       */
   96.10      void validateAnnotationMethod(DiagnosticPosition pos, MethodSymbol m) {
   96.11          for (Type sup = syms.annotationType; sup.tag == CLASS; sup = types.supertype(sup)) {

    97.1 --- a/src/share/classes/com/sun/tools/javac/comp/Flow.java	Thu Apr 21 15:33:25 2011 -0700
    97.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Flow.java	Mon Apr 25 15:45:49 2011 -0700
    97.3 @@ -51,7 +51,7 @@
    97.4   *  unassignment analysis ensures that no final variable is assigned
    97.5   *  more than once.
    97.6   *
    97.7 - *  <p>The second edition of the JLS has a number of problems in the
    97.8 + *  <p>The JLS has a number of problems in the
    97.9   *  specification of these flow analysis problems. This implementation
   97.10   *  attempts to address those issues.
   97.11   *
   97.12 @@ -126,7 +126,7 @@
   97.13   *  don't have to worry about the return expression because this
   97.14   *  concept is only used for construcrors.
   97.15   *
   97.16 - *  <p>There is no spec in JLS2 for when a variable is definitely
   97.17 + *  <p>There is no spec in the JLS for when a variable is definitely
   97.18   *  assigned at the end of a constructor, which is needed for final
   97.19   *  fields (8.3.1.2).  We implement the rule that V is DA at the end
   97.20   *  of the constructor iff it is DA and the end of the body of the
   97.21 @@ -381,7 +381,7 @@
   97.22          if (sym.adr >= firstadr && trackable(sym)) {
   97.23              if ((sym.flags() & FINAL) != 0) {
   97.24                  if ((sym.flags() & PARAMETER) != 0) {
   97.25 -                    if ((sym.flags() & DISJUNCTION) != 0) { //multi-catch parameter
   97.26 +                    if ((sym.flags() & UNION) != 0) { //multi-catch parameter
   97.27                          log.error(pos, "multicatch.parameter.may.not.be.assigned",
   97.28                                    sym);
   97.29                      }
   97.30 @@ -1003,7 +1003,7 @@
   97.31          thrown = List.nil();
   97.32          for (List<JCCatch> l = tree.catchers; l.nonEmpty(); l = l.tail) {
   97.33              List<JCExpression> subClauses = TreeInfo.isMultiCatch(l.head) ?
   97.34 -                    ((JCTypeDisjunction)l.head.param.vartype).alternatives :
   97.35 +                    ((JCTypeUnion)l.head.param.vartype).alternatives :
   97.36                      List.of(l.head.param.vartype);
   97.37              for (JCExpression ct : subClauses) {
   97.38                  caught = chk.incl(ct.type, caught);
   97.39 @@ -1075,7 +1075,7 @@
   97.40              alive = true;
   97.41              JCVariableDecl param = l.head.param;
   97.42              List<JCExpression> subClauses = TreeInfo.isMultiCatch(l.head) ?
   97.43 -                    ((JCTypeDisjunction)l.head.param.vartype).alternatives :
   97.44 +                    ((JCTypeUnion)l.head.param.vartype).alternatives :
   97.45                      List.of(l.head.param.vartype);
   97.46              List<Type> ctypes = List.nil();
   97.47              List<Type> rethrownTypes = chk.diff(thrownInTry, caughtInTry);

    98.1 --- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Thu Apr 21 15:33:25 2011 -0700
    98.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Mon Apr 25 15:45:49 2011 -0700
    98.3 @@ -346,7 +346,7 @@
    98.4          if (typeargtypes == null) typeargtypes = List.nil();
    98.5          if (mt.tag != FORALL && typeargtypes.nonEmpty()) {
    98.6              // This is not a polymorphic method, but typeargs are supplied
    98.7 -            // which is fine, see JLS3 15.12.2.1
    98.8 +            // which is fine, see JLS 15.12.2.1
    98.9          } else if (mt.tag == FORALL && typeargtypes.nonEmpty()) {
   98.10              ForAll pmt = (ForAll) mt;
   98.11              if (typeargtypes.length() != pmt.tvars.length())
   98.12 @@ -770,12 +770,9 @@
   98.13                      return ambiguityError(m1, m2);
   98.14                  // both abstract, neither overridden; merge throws clause and result type
   98.15                  Symbol mostSpecific;
   98.16 -                Type result2 = mt2.getReturnType();
   98.17 -                if (mt2.tag == FORALL)
   98.18 -                    result2 = types.subst(result2, ((ForAll)mt2).tvars, ((ForAll)mt1).tvars);
   98.19 -                if (types.isSubtype(mt1.getReturnType(), result2))
   98.20 +                if (types.returnTypeSubstitutable(mt1, mt2))
   98.21                      mostSpecific = m1;
   98.22 -                else if (types.isSubtype(result2, mt1.getReturnType()))
   98.23 +                else if (types.returnTypeSubstitutable(mt2, mt1))
   98.24                      mostSpecific = m2;
   98.25                  else {
   98.26                      // Theoretically, this can't happen, but it is possible
   98.27 @@ -1772,7 +1769,7 @@
   98.28  
   98.29      /**
   98.30       * Resolve an appropriate implicit this instance for t's container.
   98.31 -     * JLS2 8.8.5.1 and 15.9.2
   98.32 +     * JLS 8.8.5.1 and 15.9.2
   98.33       */
   98.34      Type resolveImplicitThis(DiagnosticPosition pos, Env<AttrContext> env, Type t) {
   98.35          return resolveImplicitThis(pos, env, t, false);

    99.1 --- a/src/share/classes/com/sun/tools/javac/jvm/Gen.java	Thu Apr 21 15:33:25 2011 -0700
    99.2 +++ b/src/share/classes/com/sun/tools/javac/jvm/Gen.java	Mon Apr 25 15:45:49 2011 -0700
    99.3 @@ -283,7 +283,7 @@
    99.4          }
    99.5  
    99.6          // leave alone methods inherited from Object
    99.7 -        // JLS2 13.1.
    99.8 +        // JLS 13.1.
    99.9          if (sym.owner == syms.objectType.tsym)
   99.10              return sym;
   99.11  
   99.12 @@ -1456,7 +1456,7 @@
   99.13                        List<Integer> gaps) {
   99.14              if (startpc != endpc) {
   99.15                  List<JCExpression> subClauses = TreeInfo.isMultiCatch(tree) ?
   99.16 -                        ((JCTypeDisjunction)tree.param.vartype).alternatives :
   99.17 +                        ((JCTypeUnion)tree.param.vartype).alternatives :
   99.18                          List.of(tree.param.vartype);
   99.19                  while (gaps.nonEmpty()) {
   99.20                      for (JCExpression subCatch : subClauses) {

   100.1 --- a/src/share/classes/com/sun/tools/javac/parser/JavacParser.java	Thu Apr 21 15:33:25 2011 -0700
   100.2 +++ b/src/share/classes/com/sun/tools/javac/parser/JavacParser.java	Mon Apr 25 15:45:49 2011 -0700
   100.3 @@ -1837,7 +1837,7 @@
   100.4          JCModifiers mods = optFinal(Flags.PARAMETER);
   100.5          List<JCExpression> catchTypes = catchTypes();
   100.6          JCExpression paramType = catchTypes.size() > 1 ?
   100.7 -                toP(F.at(catchTypes.head.getStartPosition()).TypeDisjunction(catchTypes)) :
   100.8 +                toP(F.at(catchTypes.head.getStartPosition()).TypeUnion(catchTypes)) :
   100.9                  catchTypes.head;
  100.10          JCVariableDecl formal = variableDeclaratorId(mods, paramType);
  100.11          accept(RPAREN);

   101.1 --- a/src/share/classes/com/sun/tools/javac/tree/JCTree.java	Thu Apr 21 15:33:25 2011 -0700
   101.2 +++ b/src/share/classes/com/sun/tools/javac/tree/JCTree.java	Mon Apr 25 15:45:49 2011 -0700
   101.3 @@ -236,13 +236,13 @@
   101.4       */
   101.5      public static final int TYPEAPPLY = TYPEARRAY + 1;
   101.6  
   101.7 -    /** Disjunction types, of type TypeDisjunction
   101.8 +    /** Union types, of type TypeUnion
   101.9       */
  101.10 -    public static final int TYPEDISJUNCTION = TYPEAPPLY + 1;
  101.11 +    public static final int TYPEUNION = TYPEAPPLY + 1;
  101.12  
  101.13      /** Formal type parameters, of type TypeParameter.
  101.14       */
  101.15 -    public static final int TYPEPARAMETER = TYPEDISJUNCTION + 1;
  101.16 +    public static final int TYPEPARAMETER = TYPEUNION + 1;
  101.17  
  101.18      /** Type argument.
  101.19       */
  101.20 @@ -1881,30 +1881,30 @@
  101.21      }
  101.22  
  101.23      /**
  101.24 -     * A disjunction type, T1 | T2 | ... Tn (used in multicatch statements)
  101.25 +     * A union type, T1 | T2 | ... Tn (used in multicatch statements)
  101.26       */
  101.27 -    public static class JCTypeDisjunction extends JCExpression implements DisjunctiveTypeTree {
  101.28 +    public static class JCTypeUnion extends JCExpression implements UnionTypeTree {
  101.29  
  101.30          public List<JCExpression> alternatives;
  101.31  
  101.32 -        protected JCTypeDisjunction(List<JCExpression> components) {
  101.33 +        protected JCTypeUnion(List<JCExpression> components) {
  101.34              this.alternatives = components;
  101.35          }
  101.36          @Override
  101.37 -        public void accept(Visitor v) { v.visitTypeDisjunction(this); }
  101.38 +        public void accept(Visitor v) { v.visitTypeUnion(this); }
  101.39  
  101.40 -        public Kind getKind() { return Kind.DISJUNCTIVE_TYPE; }
  101.41 +        public Kind getKind() { return Kind.UNION_TYPE; }
  101.42  
  101.43          public List<JCExpression> getTypeAlternatives() {
  101.44              return alternatives;
  101.45          }
  101.46          @Override
  101.47          public <R,D> R accept(TreeVisitor<R,D> v, D d) {
  101.48 -            return v.visitDisjunctiveType(this, d);
  101.49 +            return v.visitUnionType(this, d);
  101.50          }
  101.51          @Override
  101.52          public int getTag() {
  101.53 -            return TYPEDISJUNCTION;
  101.54 +            return TYPEUNION;
  101.55          }
  101.56      }
  101.57  
  101.58 @@ -2227,7 +2227,7 @@
  101.59          public void visitTypeIdent(JCPrimitiveTypeTree that) { visitTree(that); }
  101.60          public void visitTypeArray(JCArrayTypeTree that)     { visitTree(that); }
  101.61          public void visitTypeApply(JCTypeApply that)         { visitTree(that); }
  101.62 -        public void visitTypeDisjunction(JCTypeDisjunction that)   { visitTree(that); }
  101.63 +        public void visitTypeUnion(JCTypeUnion that)         { visitTree(that); }
  101.64          public void visitTypeParameter(JCTypeParameter that) { visitTree(that); }
  101.65          public void visitWildcard(JCWildcard that)           { visitTree(that); }
  101.66          public void visitTypeBoundKind(TypeBoundKind that)   { visitTree(that); }

   102.1 --- a/src/share/classes/com/sun/tools/javac/tree/Pretty.java	Thu Apr 21 15:33:25 2011 -0700
   102.2 +++ b/src/share/classes/com/sun/tools/javac/tree/Pretty.java	Mon Apr 25 15:45:49 2011 -0700
   102.3 @@ -1169,7 +1169,7 @@
   102.4          }
   102.5      }
   102.6  
   102.7 -    public void visitTypeDisjunction(JCTypeDisjunction tree) {
   102.8 +    public void visitTypeUnion(JCTypeUnion tree) {
   102.9          try {
  102.10              printExprs(tree.alternatives, " | ");
  102.11          } catch (IOException e) {

   103.1 --- a/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java	Thu Apr 21 15:33:25 2011 -0700
   103.2 +++ b/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java	Mon Apr 25 15:45:49 2011 -0700
   103.3 @@ -338,10 +338,10 @@
   103.4          return M.at(t.pos).TypeApply(clazz, arguments);
   103.5      }
   103.6  
   103.7 -    public JCTree visitDisjunctiveType(DisjunctiveTypeTree node, P p) {
   103.8 -        JCTypeDisjunction t = (JCTypeDisjunction) node;
   103.9 +    public JCTree visitUnionType(UnionTypeTree node, P p) {
  103.10 +        JCTypeUnion t = (JCTypeUnion) node;
  103.11          List<JCExpression> components = copy(t.alternatives, p);
  103.12 -        return M.at(t.pos).TypeDisjunction(components);
  103.13 +        return M.at(t.pos).TypeUnion(components);
  103.14      }
  103.15  
  103.16      public JCTree visitArrayType(ArrayTypeTree node, P p) {

   104.1 --- a/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java	Thu Apr 21 15:33:25 2011 -0700
   104.2 +++ b/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java	Mon Apr 25 15:45:49 2011 -0700
   104.3 @@ -119,7 +119,7 @@
   104.4      }
   104.5  
   104.6      public static boolean isMultiCatch(JCCatch catchClause) {
   104.7 -        return catchClause.param.vartype.getTag() == JCTree.TYPEDISJUNCTION;
   104.8 +        return catchClause.param.vartype.getTag() == JCTree.TYPEUNION;
   104.9      }
  104.10  
  104.11      /** Is statement an initializer for a synthetic field?

   105.1 --- a/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java	Thu Apr 21 15:33:25 2011 -0700
   105.2 +++ b/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java	Mon Apr 25 15:45:49 2011 -0700
   105.3 @@ -435,8 +435,8 @@
   105.4          return tree;
   105.5      }
   105.6  
   105.7 -    public JCTypeDisjunction TypeDisjunction(List<JCExpression> components) {
   105.8 -        JCTypeDisjunction tree = new JCTypeDisjunction(components);
   105.9 +    public JCTypeUnion TypeUnion(List<JCExpression> components) {
  105.10 +        JCTypeUnion tree = new JCTypeUnion(components);
  105.11          tree.pos = pos;
  105.12          return tree;
  105.13      }

   106.1 --- a/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java	Thu Apr 21 15:33:25 2011 -0700
   106.2 +++ b/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java	Mon Apr 25 15:45:49 2011 -0700
   106.3 @@ -272,7 +272,7 @@
   106.4          scan(tree.arguments);
   106.5      }
   106.6  
   106.7 -    public void visitTypeDisjunction(JCTypeDisjunction tree) {
   106.8 +    public void visitTypeUnion(JCTypeUnion tree) {
   106.9          scan(tree.alternatives);
  106.10      }
  106.11  

   107.1 --- a/src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java	Thu Apr 21 15:33:25 2011 -0700
   107.2 +++ b/src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java	Mon Apr 25 15:45:49 2011 -0700
   107.3 @@ -363,7 +363,7 @@
   107.4          result = tree;
   107.5      }
   107.6  
   107.7 -    public void visitTypeDisjunction(JCTypeDisjunction tree) {
   107.8 +    public void visitTypeUnion(JCTypeUnion tree) {
   107.9          tree.alternatives = translate(tree.alternatives);
  107.10          result = tree;
  107.11      }

   108.1 --- a/src/share/classes/javax/annotation/processing/Processor.java	Thu Apr 21 15:33:25 2011 -0700
   108.2 +++ b/src/share/classes/javax/annotation/processing/Processor.java	Mon Apr 25 15:45:49 2011 -0700
   108.3 @@ -225,12 +225,13 @@
   108.4       * </dl>
   108.5       * </blockquote>
   108.6       *
   108.7 -     * where <i>TypeName</i> is as defined in the <i>Java Language Specification</i>.
   108.8 +     * where <i>TypeName</i> is as defined in
   108.9 +     * <cite>The Java&trade; Language Specification</cite>.
  108.10       *
  108.11       * @return the names of the annotation types supported by this processor
  108.12       * @see javax.annotation.processing.SupportedAnnotationTypes
  108.13 -     * @jls3 3.8 Identifiers
  108.14 -     * @jls3 6.5.5 Meaning of Type Names
  108.15 +     * @jls 3.8 Identifiers
  108.16 +     * @jls 6.5.5 Meaning of Type Names
  108.17       */
  108.18      Set<String> getSupportedAnnotationTypes();
  108.19  

   109.1 --- a/src/share/classes/javax/lang/model/SourceVersion.java	Thu Apr 21 15:33:25 2011 -0700
   109.2 +++ b/src/share/classes/javax/lang/model/SourceVersion.java	Mon Apr 25 15:45:49 2011 -0700
   109.3 @@ -32,10 +32,9 @@
   109.4  /**
   109.5   * Source versions of the Java™ programming language.
   109.6   *
   109.7 - * See <a
   109.8 - * href="http://java.sun.com/docs/books/jls/">http://java.sun.com/docs/books/jls/</a>
   109.9 - * for information on editions of <i>The Java&trade; Language
  109.10 - * Specification</i>, including updates and clarifications.
  109.11 + * See the appropriate edition of
  109.12 + * <cite>The Java&trade; Language Specification</cite>
  109.13 + * for information about a particular source version.
  109.14   *
  109.15   * <p>Note that additional source version constants will be added to
  109.16   * model future releases of the language.
  109.17 @@ -59,17 +58,16 @@
  109.18      /**
  109.19       * The original version.
  109.20       *
  109.21 -     * The language described in the first edition of <i>The
  109.22 -     * Java&trade; Language Specification</i>.
  109.23 +     * The language described in
  109.24 +     * <cite>The Java&trade; Language Specification, First Edition</cite>.
  109.25       */
  109.26      RELEASE_0,
  109.27  
  109.28      /**
  109.29       * The version recognized by the Java Platform 1.1.
  109.30       *
  109.31 -     * The language is {@code RELEASE_0} <a
  109.32 -     * href="http://java.sun.com/docs/books/jls/first_edition/html/1.1Update.html">augmented</a>
  109.33 -     * with nested classes.
  109.34 +     * The language is {@code RELEASE_0} augmented with nested classes as described in the 1.1 update to
  109.35 +     * <cite>The Java&trade; Language Specification, First Edition</cite>.
  109.36       */
  109.37      RELEASE_1,
  109.38  
  109.39 @@ -77,8 +75,9 @@
  109.40       * The version recognized by the Java 2 Platform, Standard Edition,
  109.41       * v 1.2.
  109.42       *
  109.43 -     * The language described in <i>The Java&trade; Language
  109.44 -     * Specification, Second Edition</i>, which includes the {@code
  109.45 +     * The language described in
  109.46 +     * <cite>The Java&trade; Language Specification,
  109.47 +     * Second Edition</cite>, which includes the {@code
  109.48       * strictfp} modifier.
  109.49       */
  109.50      RELEASE_2,
  109.51 @@ -103,8 +102,9 @@
  109.52       * The version recognized by the Java 2 Platform, Standard
  109.53       * Edition 5.0.
  109.54       *
  109.55 -     * The language described in <i>The Java&trade; Language
  109.56 -     * Specification, Third Edition</i>.  First release to support
  109.57 +     * The language described in
  109.58 +     * <cite>The Java&trade; Language Specification,
  109.59 +     * Third Edition</cite>.  First release to support
  109.60       * generics, annotations, autoboxing, var-args, enhanced {@code
  109.61       * for} loop, and hexadecimal floating-point literals.
  109.62       */
  109.63 @@ -210,7 +210,7 @@
  109.64       * @param name the string to check
  109.65       * @return {@code true} if this string is a
  109.66       * syntactically valid name, {@code false} otherwise.
  109.67 -     * @jls3 6.2 Names and Identifiers
  109.68 +     * @jls 6.2 Names and Identifiers
  109.69       */
  109.70      public static boolean isName(CharSequence name) {
  109.71          String id = name.toString();

   110.1 --- a/src/share/classes/javax/lang/model/element/Element.java	Thu Apr 21 15:33:25 2011 -0700
   110.2 +++ b/src/share/classes/javax/lang/model/element/Element.java	Mon Apr 25 15:45:49 2011 -0700
   110.3 @@ -232,8 +232,8 @@
   110.4       *
   110.5       * @return the enclosed elements, or an empty list if none
   110.6       * @see Elements#getAllMembers
   110.7 -     * @jls3 8.8.9 Default Constructor
   110.8 -     * @jls3 8.9 Enums
   110.9 +     * @jls 8.8.9 Default Constructor
  110.10 +     * @jls 8.9 Enums
  110.11       */
  110.12      List<? extends Element> getEnclosedElements();
  110.13  

   111.1 --- a/src/share/classes/javax/lang/model/element/Modifier.java	Thu Apr 21 15:33:25 2011 -0700
   111.2 +++ b/src/share/classes/javax/lang/model/element/Modifier.java	Mon Apr 25 15:45:49 2011 -0700
   111.3 @@ -46,7 +46,7 @@
   111.4  
   111.5  public enum Modifier {
   111.6  
   111.7 -    // See JLS2 sections 8.1.1, 8.3.1, 8.4.3, 8.8.3, and 9.1.1.
   111.8 +    // See JLS sections 8.1.1, 8.3.1, 8.4.3, 8.8.3, and 9.1.1.
   111.9      // java.lang.reflect.Modifier includes INTERFACE, but that's a VMism.
  111.10  
  111.11      /** The modifier {@code public} */          PUBLIC,

   112.1 --- a/src/share/classes/javax/lang/model/element/PackageElement.java	Thu Apr 21 15:33:25 2011 -0700
   112.2 +++ b/src/share/classes/javax/lang/model/element/PackageElement.java	Mon Apr 25 15:45:49 2011 -0700
   112.3 @@ -43,7 +43,7 @@
   112.4       *
   112.5       * @return the fully qualified name of this package, or an
   112.6       * empty name if this is an unnamed package
   112.7 -     * @jls3 6.7 Fully Qualified Names and Canonical Names
   112.8 +     * @jls 6.7 Fully Qualified Names and Canonical Names
   112.9       */
  112.10      Name getQualifiedName();
  112.11  
  112.12 @@ -63,7 +63,7 @@
  112.13       *
  112.14       * @return {@code true} is this is an unnamed package and {@code
  112.15       * false} otherwise
  112.16 -     * @jls3 7.4.2 Unnamed Packages
  112.17 +     * @jls 7.4.2 Unnamed Packages
  112.18       */
  112.19      boolean isUnnamed();
  112.20  

   113.1 --- a/src/share/classes/javax/lang/model/element/TypeElement.java	Thu Apr 21 15:33:25 2011 -0700
   113.2 +++ b/src/share/classes/javax/lang/model/element/TypeElement.java	Mon Apr 25 15:45:49 2011 -0700
   113.3 @@ -101,7 +101,7 @@
   113.4       * an empty name if none
   113.5       *
   113.6       * @see Elements#getBinaryName
   113.7 -     * @jls3 6.7 Fully Qualified Names and Canonical Names
   113.8 +     * @jls 6.7 Fully Qualified Names and Canonical Names
   113.9       */
  113.10      Name getQualifiedName();
  113.11  

   114.1 --- a/src/share/classes/javax/lang/model/element/VariableElement.java	Thu Apr 21 15:33:25 2011 -0700
   114.2 +++ b/src/share/classes/javax/lang/model/element/VariableElement.java	Mon Apr 25 15:45:49 2011 -0700
   114.3 @@ -59,8 +59,8 @@
   114.4       * otherwise
   114.5       *
   114.6       * @see Elements#getConstantExpression(Object)
   114.7 -     * @jls3 15.28 Constant Expression
   114.8 -     * @jls3 4.12.4 final Variables
   114.9 +     * @jls 15.28 Constant Expression
  114.10 +     * @jls 4.12.4 final Variables
  114.11       */
  114.12      Object getConstantValue();
  114.13  }

   115.1 --- a/src/share/classes/javax/lang/model/type/DeclaredType.java	Thu Apr 21 15:33:25 2011 -0700
   115.2 +++ b/src/share/classes/javax/lang/model/type/DeclaredType.java	Mon Apr 25 15:45:49 2011 -0700
   115.3 @@ -79,8 +79,8 @@
   115.4       * enclosing instance.
   115.5       *
   115.6       * @return a type mirror for the enclosing type
   115.7 -     * @jls3 8.1.3 Inner Classes and Enclosing Instances
   115.8 -     * @jls3 15.9.2 Determining Enclosing Instances
   115.9 +     * @jls 8.1.3 Inner Classes and Enclosing Instances
  115.10 +     * @jls 15.9.2 Determining Enclosing Instances
  115.11       */
  115.12      TypeMirror getEnclosingType();
  115.13  

   116.1 --- a/src/share/classes/javax/lang/model/type/DisjunctiveType.java	Thu Apr 21 15:33:25 2011 -0700
   116.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   116.3 @@ -1,49 +0,0 @@
   116.4 -/*
   116.5 - * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
   116.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   116.7 - *
   116.8 - * This code is free software; you can redistribute it and/or modify it
   116.9 - * under the terms of the GNU General Public License version 2 only, as
  116.10 - * published by the Free Software Foundation.  Oracle designates this
  116.11 - * particular file as subject to the "Classpath" exception as provided
  116.12 - * by Oracle in the LICENSE file that accompanied this code.
  116.13 - *
  116.14 - * This code is distributed in the hope that it will be useful, but WITHOUT
  116.15 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  116.16 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  116.17 - * version 2 for more details (a copy is included in the LICENSE file that
  116.18 - * accompanied this code).
  116.19 - *
  116.20 - * You should have received a copy of the GNU General Public License version
  116.21 - * 2 along with this work; if not, write to the Free Software Foundation,
  116.22 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  116.23 - *
  116.24 - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  116.25 - * or visit www.oracle.com if you need additional information or have any
  116.26 - * questions.
  116.27 - */
  116.28 -
  116.29 -package javax.lang.model.type;
  116.30 -
  116.31 -import java.util.List;
  116.32 -
  116.33 -/**
  116.34 - * Represents a disjunctive type.
  116.35 - *
  116.36 - * As of the {@link javax.lang.model.SourceVersion#RELEASE_7
  116.37 - * RELEASE_7} source version, disjunctive types can appear as the type
  116.38 - * of a multi-catch exception parameter.
  116.39 - *
  116.40 - * @since 1.7
  116.41 - */
  116.42 -public interface DisjunctiveType extends TypeMirror {
  116.43 -
  116.44 -    /**
  116.45 -     * Return the alternatives comprising this disjunctive type.
  116.46 -     *
  116.47 -     * The alternatives are formally referred to as <i>disjuncts</i>.
  116.48 -     *
  116.49 -     * @return the alternatives comprising this disjunctive type.
  116.50 -     */
  116.51 -    List<? extends TypeMirror> getAlternatives();
  116.52 -}

   117.1 --- a/src/share/classes/javax/lang/model/type/TypeKind.java	Thu Apr 21 15:33:25 2011 -0700
   117.2 +++ b/src/share/classes/javax/lang/model/type/TypeKind.java	Mon Apr 25 15:45:49 2011 -0700
   117.3 @@ -140,11 +140,11 @@
   117.4      OTHER,
   117.5  
   117.6      /**
   117.7 -      * A disjunctive type.
   117.8 +      * A union type.
   117.9        *
  117.10        * @since 1.7
  117.11        */
  117.12 -    DISJUNCTIVE;
  117.13 +    UNION;
  117.14  
  117.15      /**
  117.16       * Returns {@code true} if this kind corresponds to a primitive

   118.1 --- a/src/share/classes/javax/lang/model/type/TypeVariable.java	Thu Apr 21 15:33:25 2011 -0700
   118.2 +++ b/src/share/classes/javax/lang/model/type/TypeVariable.java	Mon Apr 25 15:45:49 2011 -0700
   118.3 @@ -38,8 +38,8 @@
   118.4   * type, method, or constructor.
   118.5   * A type variable may also be declared implicitly, as by
   118.6   * the capture conversion of a wildcard type argument
   118.7 - * (see chapter 5 of <i>The Java Language Specification, Third
   118.8 - * Edition</i>).
   118.9 + * (see chapter 5 of
  118.10 + * <cite>The Java&trade; Language Specification</cite>).
  118.11   *
  118.12   * @author Joseph D. Darcy
  118.13   * @author Scott Seligman

   119.1 --- a/src/share/classes/javax/lang/model/type/TypeVisitor.java	Thu Apr 21 15:33:25 2011 -0700
   119.2 +++ b/src/share/classes/javax/lang/model/type/TypeVisitor.java	Mon Apr 25 15:45:49 2011 -0700
   119.3 @@ -164,12 +164,12 @@
   119.4      R visitUnknown(TypeMirror t, P p);
   119.5  
   119.6      /**
   119.7 -     * Visits a disjunctive type.
   119.8 +     * Visits a union type.
   119.9       *
  119.10       * @param t the type to visit
  119.11       * @param p a visitor-specified parameter
  119.12       * @return  a visitor-specified result
  119.13       * @since 1.7
  119.14       */
  119.15 -    R visitDisjunctive(DisjunctiveType t, P p);
  119.16 +    R visitUnion(UnionType t, P p);
  119.17  }

   120.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   120.2 +++ b/src/share/classes/javax/lang/model/type/UnionType.java	Mon Apr 25 15:45:49 2011 -0700
   120.3 @@ -0,0 +1,47 @@
   120.4 +/*
   120.5 + * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
   120.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   120.7 + *
   120.8 + * This code is free software; you can redistribute it and/or modify it
   120.9 + * under the terms of the GNU General Public License version 2 only, as
  120.10 + * published by the Free Software Foundation.  Oracle designates this
  120.11 + * particular file as subject to the "Classpath" exception as provided
  120.12 + * by Oracle in the LICENSE file that accompanied this code.
  120.13 + *
  120.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
  120.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  120.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  120.17 + * version 2 for more details (a copy is included in the LICENSE file that
  120.18 + * accompanied this code).
  120.19 + *
  120.20 + * You should have received a copy of the GNU General Public License version
  120.21 + * 2 along with this work; if not, write to the Free Software Foundation,
  120.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  120.23 + *
  120.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  120.25 + * or visit www.oracle.com if you need additional information or have any
  120.26 + * questions.
  120.27 + */
  120.28 +
  120.29 +package javax.lang.model.type;
  120.30 +
  120.31 +import java.util.List;
  120.32 +
  120.33 +/**
  120.34 + * Represents a union type.
  120.35 + *
  120.36 + * As of the {@link javax.lang.model.SourceVersion#RELEASE_7
  120.37 + * RELEASE_7} source version, union types can appear as the type
  120.38 + * of a multi-catch exception parameter.
  120.39 + *
  120.40 + * @since 1.7
  120.41 + */
  120.42 +public interface UnionType extends TypeMirror {
  120.43 +
  120.44 +    /**
  120.45 +     * Return the alternatives comprising this union type.
  120.46 +     *
  120.47 +     * @return the alternatives comprising this union type.
  120.48 +     */
  120.49 +    List<? extends TypeMirror> getAlternatives();
  120.50 +}

   121.1 --- a/src/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java	Thu Apr 21 15:33:25 2011 -0700
   121.2 +++ b/src/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java	Mon Apr 25 15:45:49 2011 -0700
   121.3 @@ -96,7 +96,7 @@
   121.4      }
   121.5  
   121.6      /**
   121.7 -     * Visits a {@code DisjunctiveType} element by calling {@code
   121.8 +     * Visits a {@code UnionType} element by calling {@code
   121.9       * visitUnknown}.
  121.10  
  121.11       * @param t  {@inheritDoc}
  121.12 @@ -105,7 +105,7 @@
  121.13       *
  121.14       * @since 1.7
  121.15       */
  121.16 -    public R visitDisjunctive(DisjunctiveType t, P p) {
  121.17 +    public R visitUnion(UnionType t, P p) {
  121.18          return visitUnknown(t, p);
  121.19      }
  121.20  

   122.1 --- a/src/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java	Thu Apr 21 15:33:25 2011 -0700
   122.2 +++ b/src/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java	Mon Apr 25 15:45:49 2011 -0700
   122.3 @@ -67,11 +67,11 @@
   122.4      }
   122.5  
   122.6      /**
   122.7 -     * Visits a {@code DisjunctiveType} in a manner defined by a subclass.
   122.8 +     * Visits a {@code UnionType} in a manner defined by a subclass.
   122.9       *
  122.10       * @param t  {@inheritDoc}
  122.11       * @param p  {@inheritDoc}
  122.12       * @return the result of the visit as defined by a subclass
  122.13       */
  122.14 -    public abstract R visitDisjunctive(DisjunctiveType t, P p);
  122.15 +    public abstract R visitUnion(UnionType t, P p);
  122.16  }

   123.1 --- a/src/share/classes/javax/lang/model/util/Elements.java	Thu Apr 21 15:33:25 2011 -0700
   123.2 +++ b/src/share/classes/javax/lang/model/util/Elements.java	Mon Apr 25 15:45:49 2011 -0700
   123.3 @@ -95,7 +95,7 @@
   123.4       * @param e  the element being examined
   123.5       * @return the documentation comment of the element, or {@code null}
   123.6       *          if there is none
   123.7 -     * @jls3 3.6 White Space
   123.8 +     * @jls 3.6 White Space
   123.9       */
  123.10      String getDocComment(Element e);
  123.11  
  123.12 @@ -114,7 +114,7 @@
  123.13       * @return the binary name
  123.14       *
  123.15       * @see TypeElement#getQualifiedName
  123.16 -     * @jls3 13.1 The Form of a Binary
  123.17 +     * @jls 13.1 The Form of a Binary
  123.18       */
  123.19      Name getBinaryName(TypeElement type);
  123.20  
  123.21 @@ -210,8 +210,8 @@
  123.22       * @param type   the type of which the first method is a member
  123.23       * @return {@code true} if and only if the first method overrides
  123.24       *          the second
  123.25 -     * @jls3 8.4.8 Inheritance, Overriding, and Hiding
  123.26 -     * @jls3 9.4.1 Inheritance and Overriding
  123.27 +     * @jls 8.4.8 Inheritance, Overriding, and Hiding
  123.28 +     * @jls 9.4.1 Inheritance and Overriding
  123.29       */
  123.30      boolean overrides(ExecutableElement overrider, ExecutableElement overridden,
  123.31                        TypeElement type);

   124.1 --- a/src/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java	Thu Apr 21 15:33:25 2011 -0700
   124.2 +++ b/src/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java	Mon Apr 25 15:45:49 2011 -0700
   124.3 @@ -91,7 +91,7 @@
   124.4      }
   124.5  
   124.6      /**
   124.7 -     * This implementation visits a {@code DisjunctiveType} by calling
   124.8 +     * This implementation visits a {@code UnionType} by calling
   124.9       * {@code defaultAction}.
  124.10       *
  124.11       * @param t  {@inheritDoc}
  124.12 @@ -99,7 +99,7 @@
  124.13       * @return the result of {@code defaultAction}
  124.14       */
  124.15      @Override
  124.16 -    public R visitDisjunctive(DisjunctiveType t, P p) {
  124.17 +    public R visitUnion(UnionType t, P p) {
  124.18          return defaultAction(t, p);
  124.19      }
  124.20  }

   125.1 --- a/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java	Thu Apr 21 15:33:25 2011 -0700
   125.2 +++ b/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java	Mon Apr 25 15:45:49 2011 -0700
   125.3 @@ -94,7 +94,7 @@
   125.4      }
   125.5  
   125.6      /**
   125.7 -     * This implementation visits a {@code DisjunctiveType} by calling
   125.8 +     * This implementation visits a {@code UnionType} by calling
   125.9       * {@code defaultAction}.
  125.10       *
  125.11       * @param t  {@inheritDoc}
  125.12 @@ -102,7 +102,7 @@
  125.13       * @return the result of {@code defaultAction}
  125.14       */
  125.15      @Override
  125.16 -    public R visitDisjunctive(DisjunctiveType t, P p) {
  125.17 +    public R visitUnion(UnionType t, P p) {
  125.18          return defaultAction(t, p);
  125.19      }
  125.20  }

   126.1 --- a/src/share/classes/javax/lang/model/util/Types.java	Thu Apr 21 15:33:25 2011 -0700
   126.2 +++ b/src/share/classes/javax/lang/model/util/Types.java	Mon Apr 25 15:45:49 2011 -0700
   126.3 @@ -81,7 +81,7 @@
   126.4       * @return {@code true} if and only if the first type is a subtype
   126.5       *          of the second
   126.6       * @throws IllegalArgumentException if given an executable or package type
   126.7 -     * @jls3 4.10 Subtyping
   126.8 +     * @jls 4.10 Subtyping
   126.9       */
  126.10      boolean isSubtype(TypeMirror t1, TypeMirror t2);
  126.11  
  126.12 @@ -93,7 +93,7 @@
  126.13       * @return {@code true} if and only if the first type is assignable
  126.14       *          to the second
  126.15       * @throws IllegalArgumentException if given an executable or package type
  126.16 -     * @jls3 5.2 Assignment Conversion
  126.17 +     * @jls 5.2 Assignment Conversion
  126.18       */
  126.19      boolean isAssignable(TypeMirror t1, TypeMirror t2);
  126.20  
  126.21 @@ -104,7 +104,7 @@
  126.22       * @param t2  the second type
  126.23       * @return {@code true} if and only if the first type contains the second
  126.24       * @throws IllegalArgumentException if given an executable or package type
  126.25 -     * @jls3 4.5.1.1 Type Argument Containment and Equivalence
  126.26 +     * @jls 4.5.1.1 Type Argument Containment and Equivalence
  126.27       */
  126.28      boolean contains(TypeMirror t1, TypeMirror t2);
  126.29  
  126.30 @@ -116,7 +116,7 @@
  126.31       * @param m2  the second method
  126.32       * @return {@code true} if and only if the first signature is a
  126.33       *          subsignature of the second
  126.34 -     * @jls3 8.4.2 Method Signature
  126.35 +     * @jls 8.4.2 Method Signature
  126.36       */
  126.37      boolean isSubsignature(ExecutableType m1, ExecutableType m2);
  126.38  
  126.39 @@ -136,7 +136,7 @@
  126.40       * @param t  the type to be erased
  126.41       * @return the erasure of the given type
  126.42       * @throws IllegalArgumentException if given a package type
  126.43 -     * @jls3 4.6 Type Erasure
  126.44 +     * @jls 4.6 Type Erasure
  126.45       */
  126.46      TypeMirror erasure(TypeMirror t);
  126.47  
  126.48 @@ -146,7 +146,7 @@
  126.49       *
  126.50       * @param p  the primitive type to be converted
  126.51       * @return the class of a boxed value of type {@code p}
  126.52 -     * @jls3 5.1.7 Boxing Conversion
  126.53 +     * @jls 5.1.7 Boxing Conversion
  126.54       */
  126.55      TypeElement boxedClass(PrimitiveType p);
  126.56  
  126.57 @@ -158,7 +158,7 @@
  126.58       * @return the type of an unboxed value of type {@code t}
  126.59       * @throws IllegalArgumentException if the given type has no
  126.60       *          unboxing conversion
  126.61 -     * @jls3 5.1.8 Unboxing Conversion
  126.62 +     * @jls 5.1.8 Unboxing Conversion
  126.63       */
  126.64      PrimitiveType unboxedType(TypeMirror t);
  126.65  
  126.66 @@ -168,7 +168,7 @@
  126.67       * @param t  the type to be converted
  126.68       * @return the result of applying capture conversion
  126.69       * @throws IllegalArgumentException if given an executable or package type
  126.70 -     * @jls3 5.1.10 Capture Conversion
  126.71 +     * @jls 5.1.10 Capture Conversion
  126.72       */
  126.73      TypeMirror capture(TypeMirror t);
  126.74  

   127.1 --- a/src/share/classes/javax/tools/JavaCompiler.java	Thu Apr 21 15:33:25 2011 -0700
   127.2 +++ b/src/share/classes/javax/tools/JavaCompiler.java	Mon Apr 25 15:45:49 2011 -0700
   127.3 @@ -58,9 +58,11 @@
   127.4   * standard file manager such as the one returned by {@linkplain
   127.5   * #getStandardFileManager getStandardFileManager}.
   127.6   *
   127.7 - * <p>An instance implementing this interface must conform to the Java
   127.8 - * Language Specification and generate class files conforming to the
   127.9 - * Java Virtual Machine specification.  The versions of these
  127.10 + * <p>An instance implementing this interface must conform to
  127.11 + * <cite>The Java&trade; Language Specification</cite>
  127.12 + * and generate class files conforming to
  127.13 + * <cite>The Java&trade; Virtual Machine Specification</cite>.
  127.14 + * The versions of these
  127.15   * specifications are defined in the {@linkplain Tool} interface.
  127.16   *
  127.17   * Additionally, an instance of this interface supporting {@link

   128.1 --- a/src/share/classes/javax/tools/JavaFileManager.java	Thu Apr 21 15:33:25 2011 -0700
   128.2 +++ b/src/share/classes/javax/tools/JavaFileManager.java	Mon Apr 25 15:45:49 2011 -0700
   128.3 @@ -49,17 +49,16 @@
   128.4   * names must be given in the Java Virtual Machine internal form of
   128.5   * fully qualified class and interface names.  For convenience '.'
   128.6   * and '/' are interchangeable.  The internal form is defined in
   128.7 - * chapter four of the
   128.8 - * <a href="http://java.sun.com/docs/books/vmspec/2nd-edition/jvms-maintenance.html">Java
   128.9 - * Virtual Machine Specification</a>.
  128.10 + * chapter four of
  128.11 + * <cite>The Java&trade; Virtual Machine Specification</cite>.
  128.12  
  128.13   * <blockquote><p>
  128.14   *   <i>Discussion:</i> this means that the names
  128.15   *   "java/lang.package-info", "java/lang/package-info",
  128.16   *   "java.lang.package-info", are valid and equivalent.  Compare to
  128.17 - *   binary name as defined in the
  128.18 - *   <a href="http://java.sun.com/docs/books/jls/">Java Language
  128.19 - *   Specification (JLS)</a> section 13.1 "The Form of a Binary".
  128.20 + *   binary name as defined in
  128.21 + *   <cite>The Java&trade; Language Specification</cite>,
  128.22 + *   section 13.1 "The Form of a Binary".
  128.23   * </p></blockquote>
  128.24   *
  128.25   * <p>The case of names is significant.  All names should be treated
  128.26 @@ -173,7 +172,8 @@
  128.27  
  128.28      /**
  128.29       * Infers a binary name of a file object based on a location.  The
  128.30 -     * binary name returned might not be a valid JLS binary name.
  128.31 +     * binary name returned might not be a valid binary name according to
  128.32 +     * <cite>The Java&trade; Language Specification</cite>.
  128.33       *
  128.34       * @param location a location
  128.35       * @param file a file object

   129.1 --- a/src/share/classes/javax/tools/JavaFileObject.java	Thu Apr 21 15:33:25 2011 -0700
   129.2 +++ b/src/share/classes/javax/tools/JavaFileObject.java	Mon Apr 25 15:45:49 2011 -0700
   129.3 @@ -99,9 +99,9 @@
   129.4      /**
   129.5       * Checks if this file object is compatible with the specified
   129.6       * simple name and kind.  A simple name is a single identifier
   129.7 -     * (not qualified) as defined in the <a
   129.8 -     * href="http://java.sun.com/docs/books/jls/">Java Language
   129.9 -     * Specification</a> 3rd ed., section 6.2 "Names and Identifiers".
  129.10 +     * (not qualified) as defined in
  129.11 +     * <cite>The Java&trade; Language Specification</cite>,
  129.12 +     * section 6.2 "Names and Identifiers".
  129.13       *
  129.14       * @param simpleName a simple name of a class
  129.15       * @param kind a kind

   130.1 --- a/src/share/sample/javac/processing/src/CheckNamesProcessor.java	Thu Apr 21 15:33:25 2011 -0700
   130.2 +++ b/src/share/sample/javac/processing/src/CheckNamesProcessor.java	Mon Apr 25 15:45:49 2011 -0700
   130.3 @@ -152,7 +152,8 @@
   130.4       * Provide checks that an element and its enclosed elements follow
   130.5       * the usual naming conventions.
   130.6       *
   130.7 -     * <p> Conventions from JLSv3 section 6.8:
   130.8 +     * <p> Conventions from section 6.8 of
   130.9 +     *     <cite>The Java&trade; Language Specification</cite>
  130.10       *
  130.11       * <ul>
  130.12       * <li> Classes and interfaces: camel case, first letter is uppercase
  130.13 @@ -163,7 +164,8 @@
  130.14       * <li> non-final: camel case, initial lowercase
  130.15       * <li> constant: uppercase separated by underscores
  130.16       * </ul>
  130.17 -     * <li> Packages: checks left as exercise for the reader, see JLSv3 section 7.7
  130.18 +     * <li> Packages: checks left as exercise for the reader, see section 7.7 of
  130.19 +     * <cite>The Java&trade; Language Specification</cite>.
  130.20       * </ul>
  130.21       */
  130.22      private static class NameChecker {
  130.23 @@ -286,7 +288,7 @@
  130.24              public Void visitPackage(PackageElement e, Void p) {
  130.25                  /*
  130.26                   * Implementing the checks of package names is left
  130.27 -                 * as an exercise for the reader, see JLSv3 section
  130.28 +                 * as an exercise for the reader, see JLS section
  130.29                   * 7.7 for conventions.
  130.30                   */
  130.31  

   131.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   131.2 +++ b/test/tools/javac/generics/7034019/T7034019a.java	Mon Apr 25 15:45:49 2011 -0700
   131.3 @@ -0,0 +1,46 @@
   131.4 +/*
   131.5 + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
   131.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   131.7 + *
   131.8 + * This code is free software; you can redistribute it and/or modify it
   131.9 + * under the terms of the GNU General Public License version 2 only, as
  131.10 + * published by the Free Software Foundation.
  131.11 + *
  131.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
  131.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  131.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  131.15 + * version 2 for more details (a copy is included in the LICENSE file that
  131.16 + * accompanied this code).
  131.17 + *
  131.18 + * You should have received a copy of the GNU General Public License version
  131.19 + * 2 along with this work; if not, write to the Free Software Foundation,
  131.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  131.21 + *
  131.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  131.23 + * or visit www.oracle.com if you need additional information or have any
  131.24 + * questions.
  131.25 + */
  131.26 +
  131.27 +/*
  131.28 + * @test
  131.29 + * @bug 7034019
  131.30 + * @summary ClassCastException in javac with conjunction types
  131.31 + *
  131.32 + * @compile T7034019a.java
  131.33 + */
  131.34 +
  131.35 +class T7034019a {
  131.36 +    interface A {
  131.37 +        abstract <T> void foo();
  131.38 +    }
  131.39 +
  131.40 +    interface B {
  131.41 +        abstract void foo();
  131.42 +    }
  131.43 +
  131.44 +    static class C<T extends A & B> {
  131.45 +        void test(T x) {
  131.46 +            x.foo();
  131.47 +        }
  131.48 +    }
  131.49 +}

   132.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   132.2 +++ b/test/tools/javac/generics/7034019/T7034019b.java	Mon Apr 25 15:45:49 2011 -0700
   132.3 @@ -0,0 +1,46 @@
   132.4 +/*
   132.5 + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
   132.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   132.7 + *
   132.8 + * This code is free software; you can redistribute it and/or modify it
   132.9 + * under the terms of the GNU General Public License version 2 only, as
  132.10 + * published by the Free Software Foundation.
  132.11 + *
  132.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
  132.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  132.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  132.15 + * version 2 for more details (a copy is included in the LICENSE file that
  132.16 + * accompanied this code).
  132.17 + *
  132.18 + * You should have received a copy of the GNU General Public License version
  132.19 + * 2 along with this work; if not, write to the Free Software Foundation,
  132.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  132.21 + *
  132.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  132.23 + * or visit www.oracle.com if you need additional information or have any
  132.24 + * questions.
  132.25 + */
  132.26 +
  132.27 +/*
  132.28 + * @test
  132.29 + * @bug 7034019
  132.30 + * @summary ClassCastException in javac with conjunction types
  132.31 + *
  132.32 + * @compile T7034019b.java
  132.33 + */
  132.34 +
  132.35 +class T7034019a {
  132.36 +    interface A {
  132.37 +        <T> void foo();
  132.38 +    }
  132.39 +
  132.40 +    interface B {
  132.41 +        void foo();
  132.42 +    }
  132.43 +
  132.44 +    static abstract class E implements A,B {
  132.45 +        void test() {
  132.46 +            foo();
  132.47 +        }
  132.48 +    }
  132.49 +}

   133.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   133.2 +++ b/test/tools/javac/generics/7034019/T7034019c.java	Mon Apr 25 15:45:49 2011 -0700
   133.3 @@ -0,0 +1,23 @@
   133.4 +/*
   133.5 + * @test /nodynamiccopyright/
   133.6 + * @bug 7034019
   133.7 + * @summary ClassCastException in javac with conjunction types
   133.8 + *
   133.9 + * @compile/fail/ref=T7034019c.out -XDrawDiagnostics T7034019c.java
  133.10 + */
  133.11 +
  133.12 +class T7034019c {
  133.13 +    interface A {
  133.14 +        abstract <T extends Number> T foo();
  133.15 +    }
  133.16 +
  133.17 +    interface B {
  133.18 +        abstract <T> T foo();
  133.19 +    }
  133.20 +
  133.21 +    static class C<T extends A & B> {
  133.22 +        void test(T x) {
  133.23 +            x.foo();
  133.24 +        }
  133.25 +    }
  133.26 +}

   134.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   134.2 +++ b/test/tools/javac/generics/7034019/T7034019c.out	Mon Apr 25 15:45:49 2011 -0700
   134.3 @@ -0,0 +1,3 @@
   134.4 +T7034019c.java:18:20: compiler.err.name.clash.same.erasure.no.override: <T>foo(), T7034019c.B, <T>foo(), T7034019c.A
   134.5 +T7034019c.java:20:14: compiler.err.ref.ambiguous: foo, kindname.method, <T>foo(), T7034019c.B, kindname.method, <T>foo(), T7034019c.A
   134.6 +2 errors

   135.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   135.2 +++ b/test/tools/javac/generics/7034019/T7034019d.java	Mon Apr 25 15:45:49 2011 -0700
   135.3 @@ -0,0 +1,23 @@
   135.4 +/*
   135.5 + * @test /nodynamiccopyright/
   135.6 + * @bug 7034019
   135.7 + * @summary ClassCastException in javac with conjunction types
   135.8 + *
   135.9 + * @compile/fail/ref=T7034019d.out -XDrawDiagnostics T7034019d.java
  135.10 + */
  135.11 +
  135.12 +class T7034019c {
  135.13 +    interface A {
  135.14 +        abstract <T extends Number> T foo();
  135.15 +    }
  135.16 +
  135.17 +    interface B {
  135.18 +        abstract <T> T foo();
  135.19 +    }
  135.20 +
  135.21 +    static abstract class E implements A,B {
  135.22 +        void test() {
  135.23 +            foo();
  135.24 +        }
  135.25 +    }
  135.26 +}

   136.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   136.2 +++ b/test/tools/javac/generics/7034019/T7034019d.out	Mon Apr 25 15:45:49 2011 -0700
   136.3 @@ -0,0 +1,3 @@
   136.4 +T7034019d.java:18:21: compiler.err.name.clash.same.erasure.no.override: <T>foo(), T7034019c.B, <T>foo(), T7034019c.A
   136.5 +T7034019d.java:20:13: compiler.err.ref.ambiguous: foo, kindname.method, <T>foo(), T7034019c.B, kindname.method, <T>foo(), T7034019c.A
   136.6 +2 errors

   137.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   137.2 +++ b/test/tools/javac/generics/7034511/T7034511a.java	Mon Apr 25 15:45:49 2011 -0700
   137.3 @@ -0,0 +1,21 @@
   137.4 +/*
   137.5 + * @test /nodynamiccopyright/
   137.6 + * @bug     7034511
   137.7 + * @summary Loophole in typesafety
   137.8 + * @compile/fail/ref=T7034511a.out -XDrawDiagnostics T7034511a.java
   137.9 + */
  137.10 +
  137.11 +class T7034511a {
  137.12 +
  137.13 +    interface A<T> {
  137.14 +        void foo(T x);
  137.15 +    }
  137.16 +
  137.17 +    interface B<T> extends A<T[]> { }
  137.18 +
  137.19 +    static abstract class C implements B<Integer> {
  137.20 +        <T extends B<?>> void test(T x, String[] ss) {
  137.21 +            x.foo(ss);
  137.22 +        }
  137.23 +    }
  137.24 +}

   138.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   138.2 +++ b/test/tools/javac/generics/7034511/T7034511a.out	Mon Apr 25 15:45:49 2011 -0700
   138.3 @@ -0,0 +1,2 @@
   138.4 +T7034511a.java:18:14: compiler.err.cant.apply.symbol.1: kindname.method, foo, compiler.misc.type.captureof: 1, ?[], java.lang.String[], kindname.interface, T7034511a.A<T>, (compiler.misc.no.conforming.assignment.exists: java.lang.String[], compiler.misc.type.captureof: 1, ?[])
   138.5 +1 error

   139.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   139.2 +++ b/test/tools/javac/generics/7034511/T7034511b.java	Mon Apr 25 15:45:49 2011 -0700
   139.3 @@ -0,0 +1,16 @@
   139.4 +/*
   139.5 + * @test /nodynamiccopyright/
   139.6 + * @bug     7034511
   139.7 + * @summary Loophole in typesafety
   139.8 + * @compile/fail/ref=T7034511b.out -XDrawDiagnostics T7034511b.java
   139.9 + */
  139.10 +
  139.11 +class T7034511b {
  139.12 +    static class MyList<E> {
  139.13 +        E toArray(E[] e) { return null; }
  139.14 +    }
  139.15 +
  139.16 +    void test(MyList<?> ml, Object o[]) {
  139.17 +        ml.toArray(o);
  139.18 +    }
  139.19 +}

   140.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   140.2 +++ b/test/tools/javac/generics/7034511/T7034511b.out	Mon Apr 25 15:45:49 2011 -0700
   140.3 @@ -0,0 +1,2 @@
   140.4 +T7034511b.java:14:11: compiler.err.cant.apply.symbol.1: kindname.method, toArray, compiler.misc.type.captureof: 1, ?[], java.lang.Object[], kindname.class, T7034511b.MyList<E>, (compiler.misc.no.conforming.assignment.exists: java.lang.Object[], compiler.misc.type.captureof: 1, ?[])
   140.5 +1 error