Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/javadoc/Tag.java	Tue Oct 09 19:10:00 2012 -0700
     1.2 +++ b/src/share/classes/com/sun/javadoc/Tag.java	Tue Oct 09 19:31:58 2012 -0700
     1.3 @@ -70,14 +70,14 @@
     1.4       * than one tag of a given kind:
     1.5       * <p>
     1.6       * <table border="1" cellpadding="4" cellspacing="0">
     1.7 -     * <tr><th><tt> kind()  </th>  <th><tt> name()      </th></tr>
     1.8 -     * <tr><td><tt> @throws </td>  <td><tt> @throws     </td></tr>
     1.9 -     * <tr><td><tt> @throws </td>  <td><tt> @exception  </td></tr>
    1.10 -     * <tr><td><tt> @see    </td>  <td><tt> @see        </td></tr>
    1.11 -     * <tr><td><tt> @see    </td>  <td><tt> @link       </td></tr>
    1.12 -     * <tr><td><tt> @see    </td>  <td><tt> @linkplain  </td></tr>
    1.13 -     * <tr><td><tt> @serial </td>  <td><tt> @serial     </td></tr>
    1.14 -     * <tr><td><tt> @serial </td>  <td><tt> @serialData </td></tr>
    1.15 +     * <tr><th><tt> kind()  </tt></th>  <th><tt> name()      </tt></th></tr>
    1.16 +     * <tr><td><tt> @throws </tt></td>  <td><tt> @throws     </tt></td></tr>
    1.17 +     * <tr><td><tt> @throws </tt></td>  <td><tt> @exception  </tt></td></tr>
    1.18 +     * <tr><td><tt> @see    </tt></td>  <td><tt> @see        </tt></td></tr>
    1.19 +     * <tr><td><tt> @see    </tt></td>  <td><tt> @link       </tt></td></tr>
    1.20 +     * <tr><td><tt> @see    </tt></td>  <td><tt> @linkplain  </tt></td></tr>
    1.21 +     * <tr><td><tt> @serial </tt></td>  <td><tt> @serial     </tt></td></tr>
    1.22 +     * <tr><td><tt> @serial </tt></td>  <td><tt> @serialData </tt></td></tr>
    1.23       * </table>
    1.24       */
    1.25      String kind();

     2.1 --- a/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java	Tue Oct 09 19:10:00 2012 -0700
     2.2 +++ b/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java	Tue Oct 09 19:31:58 2012 -0700
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
     2.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8   *
     2.9   * This code is free software; you can redistribute it and/or modify it
    2.10 @@ -28,8 +28,8 @@
    2.11  import java.io.IOException;
    2.12  
    2.13  /**
    2.14 - * See JVMS <TBD>
    2.15 - * http://cr.openjdk.java.net/~jrose/pres/indy-javadoc-mlvm/
    2.16 + * See JVMS 4.7.21
    2.17 + * http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.7.21
    2.18   *
    2.19   *  <p><b>This is NOT part of any supported API.
    2.20   *  If you write code that depends on this, you do so at your own risk.

     3.1 --- a/src/share/classes/com/sun/tools/classfile/Dependencies.java	Tue Oct 09 19:10:00 2012 -0700
     3.2 +++ b/src/share/classes/com/sun/tools/classfile/Dependencies.java	Tue Oct 09 19:31:58 2012 -0700
     3.3 @@ -98,7 +98,7 @@
     3.4           * Get the ClassFile object for a specified class.
     3.5           * @param className the name of the class to be returned.
     3.6           * @return the ClassFile for the given class
     3.7 -         * @throws Dependencies#ClassFileNotFoundException if the classfile cannot be
     3.8 +         * @throws Dependencies.ClassFileNotFoundException if the classfile cannot be
     3.9           *   found
    3.10           */
    3.11          public ClassFile getClassFile(String className)

     4.1 --- a/src/share/classes/com/sun/tools/classfile/Instruction.java	Tue Oct 09 19:10:00 2012 -0700
     4.2 +++ b/src/share/classes/com/sun/tools/classfile/Instruction.java	Tue Oct 09 19:31:58 2012 -0700
     4.3 @@ -1,5 +1,5 @@
     4.4  /*
     4.5 - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
     4.6 + * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
     4.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8   *
     4.9   * This code is free software; you can redistribute it and/or modify it
    4.10 @@ -103,7 +103,7 @@
    4.11          R visitConstantPoolRefAndValue(Instruction instr, int index, int value, P p);
    4.12          /** See {@link Kind#LOCAL}. */
    4.13          R visitLocal(Instruction instr, int index, P p);
    4.14 -        /** See {@link Kind#LOCAL_UBYTE}. */
    4.15 +        /** See {@link Kind#LOCAL_BYTE}. */
    4.16          R visitLocalAndValue(Instruction instr, int index, int value, P p);
    4.17          /** See {@link Kind#DYNAMIC}. */
    4.18          R visitLookupSwitch(Instruction instr, int default_, int npairs, int[] matches, int[] offsets, P p);

     5.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java	Tue Oct 09 19:10:00 2012 -0700
     5.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java	Tue Oct 09 19:31:58 2012 -0700
     5.3 @@ -1,5 +1,5 @@
     5.4  /*
     5.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
     5.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
     5.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     5.8   *
     5.9   * This code is free software; you can redistribute it and/or modify it
    5.10 @@ -81,7 +81,7 @@
    5.11       * Add the summary link for the member.
    5.12       *
    5.13       * @param context the id of the context where the link will be printed
    5.14 -     * @param classDoc the classDoc that we should link to
    5.15 +     * @param cd the classDoc that we should link to
    5.16       * @param member the member being linked to
    5.17       * @param tdSummary the content tree to which the link will be added
    5.18       */
    5.19 @@ -101,7 +101,7 @@
    5.20      /**
    5.21       * Add the inherited summary link for the member.
    5.22       *
    5.23 -     * @param classDoc the classDoc that we should link to
    5.24 +     * @param cd the classDoc that we should link to
    5.25       * @param member the member being linked to
    5.26       * @param linksTree the content tree to which the link will be added
    5.27       */
    5.28 @@ -138,7 +138,7 @@
    5.29       * Add all the parameters for the executable member.
    5.30       *
    5.31       * @param member the member to write parameters for.
    5.32 -     * @param tree the content tree to which the parameters information will be added.
    5.33 +     * @param htmltree the content tree to which the parameters information will be added.
    5.34       */
    5.35      protected void addParameters(ExecutableMemberDoc member, Content htmltree) {
    5.36          addParameters(member, true, htmltree);
    5.37 @@ -149,7 +149,7 @@
    5.38       *
    5.39       * @param member the member to write parameters for.
    5.40       * @param includeAnnotations true if annotation information needs to be added.
    5.41 -     * @param tree the content tree to which the parameters information will be added.
    5.42 +     * @param htmltree the content tree to which the parameters information will be added.
    5.43       */
    5.44      protected void addParameters(ExecutableMemberDoc member,
    5.45              boolean includeAnnotations, Content htmltree) {

     6.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java	Tue Oct 09 19:10:00 2012 -0700
     6.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java	Tue Oct 09 19:31:58 2012 -0700
     6.3 @@ -365,7 +365,7 @@
     6.4       * Add the comment for the given member.
     6.5       *
     6.6       * @param member the member being documented.
     6.7 -     * @param contentTree the content tree to which the comment will be added.
     6.8 +     * @param htmltree the content tree to which the comment will be added.
     6.9       */
    6.10      protected void addComment(ProgramElementDoc member, Content htmltree) {
    6.11          if (member.inlineTags().length > 0) {

     7.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java	Tue Oct 09 19:10:00 2012 -0700
     7.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java	Tue Oct 09 19:31:58 2012 -0700
     7.3 @@ -188,8 +188,8 @@
     7.4      // ClassWriter.
     7.5  
     7.6      /**
     7.7 -     * Constructor. Initialises resource for the
     7.8 -     * {@link com.sun.tools.doclets.MessageRetriever}.
     7.9 +     * Constructor. Initializes resource for the
    7.10 +     * {@link com.sun.tools.doclets.internal.toolkit.util.MessageRetriever MessageRetriever}.
    7.11       */
    7.12      private ConfigurationImpl() {
    7.13          standardmessage = new MessageRetriever(this,

     8.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java	Tue Oct 09 19:10:00 2012 -0700
     8.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java	Tue Oct 09 19:31:58 2012 -0700
     8.3 @@ -208,7 +208,7 @@
     8.4       *
     8.5       * @param builder the deprecated list builder
     8.6       * @param type the type of list being documented
     8.7 -     * @param contentTree the content tree to which the anchor will be added
     8.8 +     * @param htmlTree the content tree to which the anchor will be added
     8.9       */
    8.10      private void addAnchor(DeprecatedAPIListBuilder builder, int type, Content htmlTree) {
    8.11          if (builder.hasDocumentation(type)) {

     9.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Tue Oct 09 19:10:00 2012 -0700
     9.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Tue Oct 09 19:31:58 2012 -0700
     9.3 @@ -1407,7 +1407,7 @@
     9.4      /**
     9.5       * Returns a package name label.
     9.6       *
     9.7 -     * @param parsedName the package name
     9.8 +     * @param packageName the package name
     9.9       * @return the package name content
    9.10       */
    9.11      public Content getPackageLabel(String packageName) {
    9.12 @@ -2635,7 +2635,7 @@
    9.13      /**
    9.14       * Adds the annotatation types for the given doc.
    9.15       *
    9.16 -     * @param packageDoc the package to write annotations for
    9.17 +     * @param doc the package to write annotations for
    9.18       * @param htmltree the content tree to which the annotation types will be added
    9.19       */
    9.20      public void addAnnotationInfo(ProgramElementDoc doc, Content htmltree) {

    10.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java	Tue Oct 09 19:10:00 2012 -0700
    10.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java	Tue Oct 09 19:31:58 2012 -0700
    10.3 @@ -121,10 +121,10 @@
    10.4      /**
    10.5       * Add the member header.
    10.6       *
    10.7 -     * @param fieldsType the class document to be listed
    10.8 -     * @param fieldTypeStr the string for the filed type to be documented
    10.9 +     * @param fieldType the class document to be listed
   10.10 +     * @param fieldTypeStr the string for the field type to be documented
   10.11       * @param fieldDimensions the dimensions of the field string to be added
   10.12 -     * @param firldName name of the field to be added
   10.13 +     * @param fieldName name of the field to be added
   10.14       * @param contentTree the content tree to which the member header will be added
   10.15       */
   10.16      public void addMemberHeader(ClassDoc fieldType, String fieldTypeStr,

    11.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java	Tue Oct 09 19:10:00 2012 -0700
    11.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java	Tue Oct 09 19:31:58 2012 -0700
    11.3 @@ -155,7 +155,6 @@
    11.4       * "../../java/lang/Object.html"
    11.5       *
    11.6       * @param linkInfo the information about the link.
    11.7 -     * @param fileName the file name, to which path string is.
    11.8       */
    11.9      private String pathString(LinkInfoImpl linkInfo) {
   11.10          if (linkInfo.context == LinkInfoImpl.PACKAGE_FRAME) {

    12.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java	Tue Oct 09 19:10:00 2012 -0700
    12.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java	Tue Oct 09 19:31:58 2012 -0700
    12.3 @@ -229,7 +229,7 @@
    12.4       * Adds the lower navigation bar and the bottom text
    12.5       * (from the -bottom option) at the bottom of page.
    12.6       *
    12.7 -     * @param the documentation tree to which the navigation bar footer will be added
    12.8 +     * @param body the documentation tree to which the navigation bar footer will be added
    12.9       */
   12.10      protected void addNavigationBarFooter(Content body) {
   12.11          addNavLinks(false, body);

    13.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java	Tue Oct 09 19:10:00 2012 -0700
    13.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java	Tue Oct 09 19:31:58 2012 -0700
    13.3 @@ -1,5 +1,5 @@
    13.4  /*
    13.5 - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
    13.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
    13.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    13.8   *
    13.9   * This code is free software; you can redistribute it and/or modify it
   13.10 @@ -29,6 +29,7 @@
   13.11  import com.sun.javadoc.*;
   13.12  import com.sun.tools.doclets.formats.html.markup.*;
   13.13  import com.sun.tools.doclets.internal.toolkit.*;
   13.14 +import com.sun.tools.doclets.internal.toolkit.util.DocletAbortException;
   13.15  
   13.16  /**
   13.17   * Generate the Serialized Form Information Page.

    14.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java	Tue Oct 09 19:10:00 2012 -0700
    14.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java	Tue Oct 09 19:31:58 2012 -0700
    14.3 @@ -1,5 +1,5 @@
    14.4  /*
    14.5 - * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
    14.6 + * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
    14.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    14.8   *
    14.9   * This code is free software; you can redistribute it and/or modify it
   14.10 @@ -423,9 +423,9 @@
   14.11      /**
   14.12       * Generates a META tag with the http-equiv, content and charset attributes.
   14.13       *
   14.14 -     * @param http-equiv http equiv attribute for the META tag
   14.15 +     * @param httpEquiv http equiv attribute for the META tag
   14.16       * @param content type of content
   14.17 -     * @param charset character set used
   14.18 +     * @param charSet character set used
   14.19       * @return an HtmlTree object for the META tag
   14.20       */
   14.21      public static HtmlTree META(String httpEquiv, String content, String charSet) {

    15.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Tue Oct 09 19:10:00 2012 -0700
    15.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Tue Oct 09 19:31:58 2012 -0700
    15.3 @@ -1,5 +1,5 @@
    15.4  /*
    15.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
    15.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    15.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    15.8   *
    15.9   * This code is free software; you can redistribute it and/or modify it
   15.10 @@ -158,7 +158,7 @@
   15.11       * @param docencoding Encoding to be used for this file.
   15.12       * @exception IOException Exception raised by the FileWriter is passed on
   15.13       * to next level.
   15.14 -     * @exception UnSupportedEncodingException Exception raised by the
   15.15 +     * @exception UnsupportedEncodingException Exception raised by the
   15.16       * OutputStreamWriter is passed on to next level.
   15.17       */
   15.18      public HtmlWriter(Configuration configuration,

    16.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/EnumConstantWriter.java	Tue Oct 09 19:10:00 2012 -0700
    16.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/EnumConstantWriter.java	Tue Oct 09 19:31:58 2012 -0700
    16.3 @@ -1,5 +1,5 @@
    16.4  /*
    16.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    16.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    16.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    16.8   *
    16.9   * This code is free software; you can redistribute it and/or modify it
   16.10 @@ -56,7 +56,7 @@
   16.11       * Get the enum constants documentation tree header.
   16.12       *
   16.13       * @param enumConstant the enum constant being documented
   16.14 -     * @param enumConstantDetailsTree the content tree representing enum constant details
   16.15 +     * @param enumConstantsDetailsTree the content tree representing enum constant details
   16.16       * @return content tree for the enum constant documentation header
   16.17       */
   16.18      public Content getEnumConstantsTreeHeader(FieldDoc enumConstant,

    17.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java	Tue Oct 09 19:10:00 2012 -0700
    17.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java	Tue Oct 09 19:31:58 2012 -0700
    17.3 @@ -346,7 +346,6 @@
    17.4  
    17.5          /**
    17.6           * Return the list of visible constant fields for the given classdoc.
    17.7 -         * @param cd the classdoc to examine.
    17.8           * @return the list of visible constant fields for the given classdoc.
    17.9           */
   17.10          protected List<FieldDoc> members() {

    18.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java	Tue Oct 09 19:10:00 2012 -0700
    18.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java	Tue Oct 09 19:31:58 2012 -0700
    18.3 @@ -166,7 +166,6 @@
    18.4       * This information can be used for doclet specific documentation
    18.5       * generation.
    18.6       *
    18.7 -     * @param classDoc the {@link ClassDoc} we want to check.
    18.8       * @param type the type of members to return.
    18.9       * @return a list of methods that will be documented.
   18.10       * @see VisibleMemberMap

    19.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java	Tue Oct 09 19:10:00 2012 -0700
    19.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java	Tue Oct 09 19:31:58 2012 -0700
    19.3 @@ -183,7 +183,7 @@
    19.4       * Given an array of <code>ParamTag</code>s,return its string representation.
    19.5       * Try to inherit the param tags that are missing.
    19.6       *
    19.7 -     * @param doc               the doc that holds the param tags.
    19.8 +     * @param holder            the doc that holds the param tags.
    19.9       * @param writer            the TagletWriter that will write this tag.
   19.10       * @param formalParameters  The array of parmeters (from type or executable
   19.11       *                          member) to check.
   19.12 @@ -256,7 +256,7 @@
   19.13       *        been documented.
   19.14       * @param rankMap a {@link java.util.Map} which holds ordering
   19.15       *                    information about the parameters.
   19.16 -     * @param nameMap a {@link java.util.Map} which holds a mapping
   19.17 +     * @param rankMap a {@link java.util.Map} which holds a mapping
   19.18       *                of a rank of a parameter to its name.  This is
   19.19       *                used to ensure that the right name is used
   19.20       *                when parameter documentation is inherited.

    20.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java	Tue Oct 09 19:10:00 2012 -0700
    20.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java	Tue Oct 09 19:31:58 2012 -0700
    20.3 @@ -108,7 +108,7 @@
    20.4       * @param config the current configuration of the doclet.
    20.5       * @param tag the value tag.
    20.6       * @param name the name of the field to search for.  The name should be in
    20.7 -     * <qualified class name>#<field name> format. If the class name is omitted,
    20.8 +     * {@code <qualified class name>#<field name>} format. If the class name is omitted,
    20.9       * it is assumed that the field is in the current class.
   20.10       *
   20.11       * @return the corresponding FieldDoc. If the name is null or empty string,

    21.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java	Tue Oct 09 19:10:00 2012 -0700
    21.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java	Tue Oct 09 19:31:58 2012 -0700
    21.3 @@ -1,5 +1,5 @@
    21.4  /*
    21.5 - * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
    21.6 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
    21.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    21.8   *
    21.9   * This code is free software; you can redistribute it and/or modify it
   21.10 @@ -184,7 +184,7 @@
   21.11        /**
   21.12         * Return all of the classes specified on the command-line that
   21.13         * belong to the given package.
   21.14 -       * @param packageDoc the package to return the classes for.
   21.15 +       * @param pkgDoc the package to return the classes for.
   21.16         */
   21.17        public ClassDoc[] allClasses(PackageDoc pkgDoc) {
   21.18            return pkgDoc.isIncluded() ?

    22.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java	Tue Oct 09 19:10:00 2012 -0700
    22.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java	Tue Oct 09 19:31:58 2012 -0700
    22.3 @@ -146,7 +146,7 @@
    22.4      /**
    22.5       * Return the list of deprecated Doc objects of a given type.
    22.6       *
    22.7 -     * @param the constant representing the type of list being returned.
    22.8 +     * @param type the constant representing the type of list being returned.
    22.9       */
   22.10      public List<Doc> getList(int type) {
   22.11          return deprecatedLists.get(type);

    23.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java	Tue Oct 09 19:10:00 2012 -0700
    23.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java	Tue Oct 09 19:31:58 2012 -0700
    23.3 @@ -91,7 +91,7 @@
    23.4           * If the same package name is found in the map, then the first mapped
    23.5           * Item object or offline location will be retained.
    23.6           *
    23.7 -         * @param packagename Package name found in the "package-list" file.
    23.8 +         * @param packageName Package name found in the "package-list" file.
    23.9           * @param path        URL or Directory path from where the "package-list"
   23.10           * file is picked.
   23.11           * @param relative    True if path is URL, false if directory path.
   23.12 @@ -179,7 +179,7 @@
   23.13      /**
   23.14       * Get the Extern Item object associated with this package name.
   23.15       *
   23.16 -     * @param pkgname Package name.
   23.17 +     * @param pkgName Package name.
   23.18       */
   23.19      private Item findPackageItem(String pkgName) {
   23.20          if (packageToItemMap == null) {

    24.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java	Tue Oct 09 19:10:00 2012 -0700
    24.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java	Tue Oct 09 19:31:58 2012 -0700
    24.3 @@ -126,7 +126,7 @@
    24.4       * Return the package private members inherited by the class.  Only return
    24.5       * if parent is package private and not documented.
    24.6       *
    24.7 -     * @param configuation the current configuration of the doclet.
    24.8 +     * @param configuration the current configuration of the doclet.
    24.9       * @return the package private members inherited by the class.
   24.10       */
   24.11      private List<ProgramElementDoc> getInheritedPackagePrivateMethods(Configuration configuration) {
   24.12 @@ -149,7 +149,7 @@
   24.13       * end of the list members that are inherited by inaccessible parents. We
   24.14       * document these members in the child because the parent is not documented.
   24.15       *
   24.16 -     * @param configuation the current configuration of the doclet.
   24.17 +     * @param configuration the current configuration of the doclet.
   24.18       */
   24.19      public List<ProgramElementDoc> getLeafClassMembers(Configuration configuration) {
   24.20          List<ProgramElementDoc> result = getMembersFor(classdoc);

    25.1 --- a/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java	Tue Oct 09 19:10:00 2012 -0700
    25.2 +++ b/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java	Tue Oct 09 19:31:58 2012 -0700
    25.3 @@ -1,5 +1,5 @@
    25.4  /*
    25.5 - * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
    25.6 + * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
    25.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    25.8   *
    25.9   * This code is free software; you can redistribute it and/or modify it
   25.10 @@ -138,7 +138,7 @@
   25.11          /**
   25.12           * Configure the set of diagnostic parts that should be displayed
   25.13           * by the formatter.
   25.14 -         * @param options options to set
   25.15 +         * @param visibleParts the parts to be set
   25.16           */
   25.17          public void setVisible(Set<DiagnosticPart> visibleParts);
   25.18  

    26.1 --- a/src/share/classes/com/sun/tools/javac/api/JavacTool.java	Tue Oct 09 19:10:00 2012 -0700
    26.2 +++ b/src/share/classes/com/sun/tools/javac/api/JavacTool.java	Tue Oct 09 19:31:58 2012 -0700
    26.3 @@ -1,5 +1,5 @@
    26.4  /*
    26.5 - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
    26.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
    26.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    26.8   *
    26.9   * This code is free software; you can redistribute it and/or modify it
   26.10 @@ -66,7 +66,7 @@
   26.11       * Constructor used by service provider mechanism.  The recommended way to
   26.12       * obtain an instance of this class is by using {@link #create} or the
   26.13       * service provider mechanism.
   26.14 -     * @see javax.tools.JavaCompilerTool
   26.15 +     * @see javax.tools.JavaCompiler
   26.16       * @see javax.tools.ToolProvider
   26.17       * @see #create
   26.18       */

    27.1 --- a/src/share/classes/com/sun/tools/javac/code/Printer.java	Tue Oct 09 19:10:00 2012 -0700
    27.2 +++ b/src/share/classes/com/sun/tools/javac/code/Printer.java	Tue Oct 09 19:31:58 2012 -0700
    27.3 @@ -124,7 +124,7 @@
    27.4      /**
    27.5       * Get a localized string represenation for a given type.
    27.6       *
    27.7 -     * @param ts type to be displayed
    27.8 +     * @param t type to be displayed
    27.9       * @param locale the locale in which the string is to be rendered
   27.10       * @return localized string representation
   27.11       */
   27.12 @@ -135,7 +135,7 @@
   27.13      /**
   27.14       * Get a localized string represenation for a given symbol.
   27.15       *
   27.16 -     * @param ts symbol to be displayed
   27.17 +     * @param s symbol to be displayed
   27.18       * @param locale the locale in which the string is to be rendered
   27.19       * @return localized string representation
   27.20       */

    28.1 --- a/src/share/classes/com/sun/tools/javac/code/Symtab.java	Tue Oct 09 19:10:00 2012 -0700
    28.2 +++ b/src/share/classes/com/sun/tools/javac/code/Symtab.java	Tue Oct 09 19:31:58 2012 -0700
    28.3 @@ -301,7 +301,7 @@
    28.4      }
    28.5  
    28.6      /** Enter a class into symbol table.
    28.7 -     *  @param    The name of the class.
    28.8 +     *  @param s The name of the class.
    28.9       */
   28.10      private Type enterClass(String s) {
   28.11          return reader.enterClass(names.fromString(s)).type;

    29.1 --- a/src/share/classes/com/sun/tools/javac/code/TypeTags.java	Tue Oct 09 19:10:00 2012 -0700
    29.2 +++ b/src/share/classes/com/sun/tools/javac/code/TypeTags.java	Tue Oct 09 19:31:58 2012 -0700
    29.3 @@ -1,5 +1,5 @@
    29.4  /*
    29.5 - * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
    29.6 + * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
    29.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    29.8   *
    29.9   * This code is free software; you can redistribute it and/or modify it
   29.10 @@ -106,7 +106,7 @@
   29.11       */
   29.12      public static final int DEFERRED = FORALL+1;
   29.13  
   29.14 -    /** The tag of the bottom type <null>.
   29.15 +    /** The tag of the bottom type {@code <null>}.
   29.16       */
   29.17      public static final int BOT = DEFERRED+1;
   29.18  

    30.1 --- a/src/share/classes/com/sun/tools/javac/code/Types.java	Tue Oct 09 19:10:00 2012 -0700
    30.2 +++ b/src/share/classes/com/sun/tools/javac/code/Types.java	Tue Oct 09 19:31:58 2012 -0700
    30.3 @@ -1427,8 +1427,8 @@
    30.4       * conservative in that it is allowed to say that two types are
    30.5       * not disjoint, even though they actually are.
    30.6       *
    30.7 -     * The type C<X> is castable to C<Y> exactly if X and Y are not
    30.8 -     * disjoint.
    30.9 +     * The type {@code C<X>} is castable to {@code C<Y>} exactly if
   30.10 +     * {@code X} and {@code Y} are not disjoint.
   30.11       */
   30.12      public boolean disjointType(Type t, Type s) {
   30.13          return disjointType.visit(t, s);
   30.14 @@ -1523,7 +1523,7 @@
   30.15       * something of type `t' can be a subtype of `s'? This is
   30.16       * different from the question "is `t' not a subtype of `s'?"
   30.17       * when type variables are involved: Integer is not a subtype of T
   30.18 -     * where <T extends Number> but it is not true that Integer cannot
   30.19 +     * where {@code <T extends Number>} but it is not true that Integer cannot
   30.20       * possibly be a subtype of T.
   30.21       */
   30.22      public boolean notSoftSubtype(Type t, Type s) {

    31.1 --- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Tue Oct 09 19:10:00 2012 -0700
    31.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Tue Oct 09 19:31:58 2012 -0700
    31.3 @@ -740,7 +740,7 @@
    31.4       *  @param env         The env for the const value
    31.5       *  @param initializer The initializer for the const value
    31.6       *  @param type        The expected type, or null
    31.7 -     *  @see VarSymbol#setlazyConstValue
    31.8 +     *  @see VarSymbol#setLazyConstValue
    31.9       */
   31.10      public Object attribLazyConstantValue(Env<AttrContext> env,
   31.11                                        JCTree.JCExpression initializer,

    32.1 --- a/src/share/classes/com/sun/tools/javac/comp/Check.java	Tue Oct 09 19:10:00 2012 -0700
    32.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Check.java	Tue Oct 09 19:31:58 2012 -0700
    32.3 @@ -230,7 +230,6 @@
    32.4  
    32.5      /** Warn about unsafe vararg method decl.
    32.6       *  @param pos        Position to be used for error reporting.
    32.7 -     *  @param sym        The deprecated symbol.
    32.8       */
    32.9      void warnUnsafeVararg(DiagnosticPosition pos, String key, Object... args) {
   32.10          if (lint.isEnabled(LintCategory.VARARGS) && allowSimplifiedVarargs)
   32.11 @@ -397,7 +396,7 @@
   32.12   **************************************************************************/
   32.13  
   32.14      /** Return name of local class.
   32.15 -     *  This is of the form    <enclClass> $ n <classname>
   32.16 +     *  This is of the form   {@code <enclClass> $ n <classname> }
   32.17       *  where
   32.18       *    enclClass is the flat name of the enclosing class,
   32.19       *    classname is the simple name of the local class
   32.20 @@ -600,11 +599,10 @@
   32.21  
   32.22      /** Check that a type is within some bounds.
   32.23       *
   32.24 -     *  Used in TypeApply to verify that, e.g., X in V<X> is a valid
   32.25 +     *  Used in TypeApply to verify that, e.g., X in {@code V<X>} is a valid
   32.26       *  type argument.
   32.27 -     *  @param pos           Position to be used for error reporting.
   32.28       *  @param a             The type that should be bounded by bs.
   32.29 -     *  @param bs            The bound.
   32.30 +     *  @param bound         The bound.
   32.31       */
   32.32      private boolean checkExtends(Type a, Type bound) {
   32.33           if (a.isUnbound()) {
   32.34 @@ -1262,8 +1260,10 @@
   32.35       *  their bounds. This must be done in a second phase after type attributon
   32.36       *  since a class might have a subclass as type parameter bound. E.g:
   32.37       *
   32.38 +     *  <pre>{@code
   32.39       *  class B<A extends C> { ... }
   32.40       *  class C extends B<C> { ... }
   32.41 +     *  }</pre>
   32.42       *
   32.43       *  and we can't make sure that the bound is already attributed because
   32.44       *  of possible cycles.
   32.45 @@ -2574,7 +2574,7 @@
   32.46       * 'pos'.
   32.47       *
   32.48       * @param s The (annotation)type declaration annotated with a @ContainedBy
   32.49 -     * @param containerAnno the @ContainedBy on 's'
   32.50 +     * @param containedBy the @ContainedBy on 's'
   32.51       * @param pos where to report errors
   32.52       */
   32.53      public void validateContainedBy(TypeSymbol s, Attribute.Compound containedBy, DiagnosticPosition pos) {
   32.54 @@ -3181,7 +3181,6 @@
   32.55       *  @param pos           Position for error reporting.
   32.56       *  @param sym           The symbol.
   32.57       *  @param s             The scope
   32.58 -     *  @param staticImport  Whether or not this was a static import
   32.59       */
   32.60      boolean checkUniqueStaticImport(DiagnosticPosition pos, Symbol sym, Scope s) {
   32.61          return checkUniqueImport(pos, sym, s, true);

    33.1 --- a/src/share/classes/com/sun/tools/javac/comp/Flow.java	Tue Oct 09 19:10:00 2012 -0700
    33.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Flow.java	Tue Oct 09 19:31:58 2012 -0700
    33.3 @@ -148,7 +148,7 @@
    33.4   *  exception to this [no pun intended] is that checked exceptions that
    33.5   *  are known to be caught or declared to be caught in the enclosing
    33.6   *  method are not recorded in the queue, but instead are recorded in a
    33.7 - *  global variable "Set<Type> thrown" that records the type of all
    33.8 + *  global variable "{@code Set<Type> thrown}" that records the type of all
    33.9   *  exceptions that can be thrown.
   33.10   *
   33.11   *  <p>Other minor issues the treatment of members of other classes

    34.1 --- a/src/share/classes/com/sun/tools/javac/comp/Lower.java	Tue Oct 09 19:10:00 2012 -0700
    34.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Lower.java	Tue Oct 09 19:31:58 2012 -0700
    34.3 @@ -671,7 +671,7 @@
    34.4      };
    34.5  
    34.6      /** Look up a synthetic name in a given scope.
    34.7 -     *  @param scope        The scope.
    34.8 +     *  @param s            The scope.
    34.9       *  @param name         The name.
   34.10       */
   34.11      private Symbol lookupSynthetic(Name name, Scope s) {
   34.12 @@ -747,7 +747,7 @@
   34.13       *  This numbering scheme is used by the backend to decide whether
   34.14       *  to issue an invokevirtual or invokespecial call.
   34.15       *
   34.16 -     *  @see Gen.visitSelect(Select tree)
   34.17 +     *  @see Gen#visitSelect(JCFieldAccess tree)
   34.18       */
   34.19      private static final int
   34.20          DEREFcode = 0,

    35.1 --- a/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java	Tue Oct 09 19:10:00 2012 -0700
    35.2 +++ b/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java	Tue Oct 09 19:31:58 2012 -0700
    35.3 @@ -128,8 +128,7 @@
    35.4      /** Import all classes of a class or package on demand.
    35.5       *  @param pos           Position to be used for error reporting.
    35.6       *  @param tsym          The class or package the members of which are imported.
    35.7 -     *  @param toScope   The (import) scope in which imported classes
    35.8 -     *               are entered.
    35.9 +     *  @param env           The env in which the imported classes will be entered.
   35.10       */
   35.11      private void importAll(int pos,
   35.12                             final TypeSymbol tsym,
   35.13 @@ -150,8 +149,7 @@
   35.14      /** Import all static members of a class or package on demand.
   35.15       *  @param pos           Position to be used for error reporting.
   35.16       *  @param tsym          The class or package the members of which are imported.
   35.17 -     *  @param toScope   The (import) scope in which imported classes
   35.18 -     *               are entered.
   35.19 +     *  @param env           The env in which the imported classes will be entered.
   35.20       */
   35.21      private void importStaticAll(int pos,
   35.22                                   final TypeSymbol tsym,

    36.1 --- a/src/share/classes/com/sun/tools/javac/comp/TransTypes.java	Tue Oct 09 19:10:00 2012 -0700
    36.2 +++ b/src/share/classes/com/sun/tools/javac/comp/TransTypes.java	Tue Oct 09 19:31:58 2012 -0700
    36.3 @@ -132,17 +132,21 @@
    36.4       *  Then, coerce to some given target type unless target type is null.
    36.5       *  This operation is used in situations like the following:
    36.6       *
    36.7 +     *  <pre>{@code
    36.8       *  class Cell<A> { A value; }
    36.9       *  ...
   36.10       *  Cell<Integer> cell;
   36.11       *  Integer x = cell.value;
   36.12 +     *  }</pre>
   36.13       *
   36.14       *  Since the erasure of Cell.value is Object, but the type
   36.15       *  of cell.value in the assignment is Integer, we need to
   36.16       *  adjust the original type of cell.value to Object, and insert
   36.17       *  a cast to Integer. That is, the last assignment becomes:
   36.18       *
   36.19 +     *  <pre>{@code
   36.20       *  Integer x = (Integer)cell.value;
   36.21 +     *  }</pre>
   36.22       *
   36.23       *  @param tree       The expression tree whose type might need adjustment.
   36.24       *  @param erasedType The expression's type after erasure.

    37.1 --- a/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java	Tue Oct 09 19:10:00 2012 -0700
    37.2 +++ b/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java	Tue Oct 09 19:31:58 2012 -0700
    37.3 @@ -1,5 +1,5 @@
    37.4  /*
    37.5 - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
    37.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
    37.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    37.8   *
    37.9   * This code is free software; you can redistribute it and/or modify it
   37.10 @@ -805,8 +805,8 @@
   37.11      }
   37.12  
   37.13      /**
   37.14 -     * Enforces the specification of a "relative" URI as used in
   37.15 -     * {@linkplain #getFileForInput(Location,String,URI)
   37.16 +     * Enforces the specification of a "relative" name as used in
   37.17 +     * {@linkplain #getFileForInput(Location,String,String)
   37.18       * getFileForInput}.  This method must follow the rules defined in
   37.19       * that method, do not make any changes without consulting the
   37.20       * specification.

    38.1 --- a/src/share/classes/com/sun/tools/javac/file/Locations.java	Tue Oct 09 19:10:00 2012 -0700
    38.2 +++ b/src/share/classes/com/sun/tools/javac/file/Locations.java	Tue Oct 09 19:31:58 2012 -0700
    38.3 @@ -53,13 +53,14 @@
    38.4  import com.sun.tools.javac.util.Options;
    38.5  
    38.6  import javax.tools.JavaFileManager;
    38.7 +import javax.tools.StandardJavaFileManager;
    38.8  import static javax.tools.StandardLocation.*;
    38.9  import static com.sun.tools.javac.main.Option.*;
   38.10  
   38.11  /** This class converts command line arguments, environment variables
   38.12   *  and system properties (in File.pathSeparator-separated String form)
   38.13   *  into a boot class path, user class path, and source path (in
   38.14 - *  Collection<String> form).
   38.15 + *  {@code Collection<String>} form).
   38.16   *
   38.17   *  <p><b>This is NOT part of any supported API.
   38.18   *  If you write code that depends on this, you do so at your own risk.
   38.19 @@ -342,11 +343,11 @@
   38.20              }
   38.21          }
   38.22  
   38.23 -        /** @see JavaFileManager#handleOption. */
   38.24 +        /** @see JavaFileManager#handleOption */
   38.25          abstract boolean handleOption(Option option, String value);
   38.26 -        /** @see JavaFileManager#getLocation. */
   38.27 +        /** @see StandardJavaFileManager#getLocation */
   38.28          abstract Collection<File> getLocation();
   38.29 -        /** @see JavaFileManager#setLocation. */
   38.30 +        /** @see StandardJavaFileManager#setLocation */
   38.31          abstract void setLocation(Iterable<? extends File> files) throws IOException;
   38.32      }
   38.33  

    39.1 --- a/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java	Tue Oct 09 19:10:00 2012 -0700
    39.2 +++ b/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java	Tue Oct 09 19:31:58 2012 -0700
    39.3 @@ -59,7 +59,7 @@
    39.4   * the command line.)
    39.5   *
    39.6   * Location where to look for/generate optimized zip index files can be
    39.7 - * provided using "-XDcachezipindexdir=<directory>". If this flag is not
    39.8 + * provided using "{@code -XDcachezipindexdir=<directory>}". If this flag is not
    39.9   * provided, the default location is the value of the "java.io.tmpdir" system
   39.10   * property.
   39.11   *

    40.1 --- a/src/share/classes/com/sun/tools/javac/jvm/Gen.java	Tue Oct 09 19:10:00 2012 -0700
    40.2 +++ b/src/share/classes/com/sun/tools/javac/jvm/Gen.java	Tue Oct 09 19:31:58 2012 -0700
    40.3 @@ -446,7 +446,7 @@
    40.4   * Normalizing class-members.
    40.5   *************************************************************************/
    40.6  
    40.7 -    /** Distribute member initializer code into constructors and <clinit>
    40.8 +    /** Distribute member initializer code into constructors and {@code <clinit>}
    40.9       *  method.
   40.10       *  @param defs         The list of class member declarations.
   40.11       *  @param c            The enclosing class.
   40.12 @@ -689,7 +689,7 @@
   40.13       *  should be emitted, if so, put a new entry into CRTable
   40.14       *  and call method to generate bytecode.
   40.15       *  If not, just call method to generate bytecode.
   40.16 -     *  @see    #genStat(Tree, Env)
   40.17 +     *  @see    #genStat(JCTree, Env)
   40.18       *
   40.19       *  @param  tree     The tree to be visited.
   40.20       *  @param  env      The environment to use.
   40.21 @@ -756,7 +756,7 @@
   40.22       *  should be emitted, if so, put a new entry into CRTable
   40.23       *  and call method to generate bytecode.
   40.24       *  If not, just call method to generate bytecode.
   40.25 -     *  @see    #genCond(Tree,boolean)
   40.26 +     *  @see    #genCond(JCTree,boolean)
   40.27       *
   40.28       *  @param  tree     The tree to be visited.
   40.29       *  @param  crtFlags The CharacterRangeTable flags

    41.1 --- a/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java	Tue Oct 09 19:10:00 2012 -0700
    41.2 +++ b/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java	Tue Oct 09 19:31:58 2012 -0700
    41.3 @@ -607,7 +607,7 @@
    41.4  
    41.5      /** Parse contents of input stream.
    41.6       *  @param filename     The name of the file from which input stream comes.
    41.7 -     *  @param input        The input stream to be parsed.
    41.8 +     *  @param content      The characters to be parsed.
    41.9       */
   41.10      protected JCCompilationUnit parse(JavaFileObject filename, CharSequence content) {
   41.11          long msec = now();
   41.12 @@ -755,8 +755,6 @@
   41.13      /** Complete compiling a source file that has been accessed
   41.14       *  by the class file reader.
   41.15       *  @param c          The class the source file of which needs to be compiled.
   41.16 -     *  @param filename   The name of the source file.
   41.17 -     *  @param f          An input stream that reads the source file.
   41.18       */
   41.19      public void complete(ClassSymbol c) throws CompletionFailure {
   41.20  //      System.err.println("completing " + c);//DEBUG

    42.1 --- a/src/share/classes/com/sun/tools/javac/nio/PathFileManager.java	Tue Oct 09 19:10:00 2012 -0700
    42.2 +++ b/src/share/classes/com/sun/tools/javac/nio/PathFileManager.java	Tue Oct 09 19:31:58 2012 -0700
    42.3 @@ -1,5 +1,5 @@
    42.4  /*
    42.5 - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
    42.6 + * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
    42.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    42.8   *
    42.9   * This code is free software; you can redistribute it and/or modify it
   42.10 @@ -27,13 +27,14 @@
   42.11  
   42.12  import java.io.IOException;
   42.13  import java.nio.file.FileSystem;
   42.14 +import java.nio.file.FileSystems;
   42.15  import java.nio.file.Path;
   42.16  import javax.tools.FileObject;
   42.17  import javax.tools.JavaFileManager;
   42.18  import javax.tools.JavaFileObject;
   42.19  
   42.20  /**
   42.21 - *  File manager based on {@linkplain File java.nio.file.Path}.
   42.22 + *  File manager based on {@link java.nio.file.Path}.
   42.23   *
   42.24   *  Eventually, this should be moved to javax.tools.
   42.25   *  Also, JavaCompiler might reasonably provide a method getPathFileManager,

    43.1 --- a/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java	Tue Oct 09 19:10:00 2012 -0700
    43.2 +++ b/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java	Tue Oct 09 19:31:58 2012 -0700
    43.3 @@ -108,8 +108,7 @@
    43.4       * {@code input[input.length -1]} is a white space character.
    43.5       *
    43.6       * @param fac the factory which created this Scanner
    43.7 -     * @param input the input, might be modified
    43.8 -     * @param inputLength the size of the input.
    43.9 +     * @param buf the input, might be modified
   43.10       * Must be positive and less than or equal to input.length.
   43.11       */
   43.12      protected JavaTokenizer(ScannerFactory fac, CharBuffer buf) {

    44.1 --- a/src/share/classes/com/sun/tools/javac/parser/Scanner.java	Tue Oct 09 19:10:00 2012 -0700
    44.2 +++ b/src/share/classes/com/sun/tools/javac/parser/Scanner.java	Tue Oct 09 19:31:58 2012 -0700
    44.3 @@ -1,5 +1,5 @@
    44.4  /*
    44.5 - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
    44.6 + * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
    44.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44.8   *
    44.9   * This code is free software; you can redistribute it and/or modify it
   44.10 @@ -66,8 +66,7 @@
   44.11       * {@code input[input.length -1]} is a white space character.
   44.12       *
   44.13       * @param fac the factory which created this Scanner
   44.14 -     * @param input the input, might be modified
   44.15 -     * @param inputLength the size of the input.
   44.16 +     * @param buf the input, might be modified
   44.17       * Must be positive and less than or equal to input.length.
   44.18       */
   44.19      protected Scanner(ScannerFactory fac, CharBuffer buf) {

    45.1 --- a/src/share/classes/com/sun/tools/javac/parser/UnicodeReader.java	Tue Oct 09 19:10:00 2012 -0700
    45.2 +++ b/src/share/classes/com/sun/tools/javac/parser/UnicodeReader.java	Tue Oct 09 19:31:58 2012 -0700
    45.3 @@ -77,9 +77,8 @@
    45.4       * that {@code inputLength < input.length} or
    45.5       * {@code input[input.length -1]} is a white space character.
    45.6       *
    45.7 -     * @param fac the factory which created this Scanner
    45.8 -     * @param input the input, might be modified
    45.9 -     * @param inputLength the size of the input.
   45.10 +     * @param sf the factory which created this Scanner
   45.11 +     * @param buffer the input, might be modified
   45.12       * Must be positive and less than or equal to input.length.
   45.13       */
   45.14      protected UnicodeReader(ScannerFactory sf, CharBuffer buffer) {
   45.15 @@ -255,16 +254,16 @@
   45.16  
   45.17      /**
   45.18       * Returns a copy of a character array subset of the input buffer.
   45.19 -     * The returned array begins at the <code>beginIndex</code> and
   45.20 -     * extends to the character at index <code>endIndex - 1</code>.
   45.21 -     * Thus the length of the substring is <code>endIndex-beginIndex</code>.
   45.22 +     * The returned array begins at the {@code beginIndex} and
   45.23 +     * extends to the character at index {@code endIndex - 1}.
   45.24 +     * Thus the length of the substring is {@code endIndex-beginIndex}.
   45.25       * This behavior is like
   45.26 -     * <code>String.substring(beginIndex, endIndex)</code>.
   45.27 +     * {@code String.substring(beginIndex, endIndex)}.
   45.28       * Unicode escape sequences are not translated.
   45.29       *
   45.30       * @param beginIndex the beginning index, inclusive.
   45.31       * @param endIndex the ending index, exclusive.
   45.32 -     * @throws IndexOutOfBounds if either offset is outside of the
   45.33 +     * @throws ArrayIndexOutOfBoundsException if either offset is outside of the
   45.34       *         array bounds
   45.35       */
   45.36      public char[] getRawCharacters(int beginIndex, int endIndex) {

    46.1 --- a/src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java	Tue Oct 09 19:10:00 2012 -0700
    46.2 +++ b/src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java	Tue Oct 09 19:31:58 2012 -0700
    46.3 @@ -1,5 +1,5 @@
    46.4  /*
    46.5 - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
    46.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
    46.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    46.8   *
    46.9   * This code is free software; you can redistribute it and/or modify it
   46.10 @@ -105,7 +105,7 @@
   46.11       * Only type elements <i>included</i> in this round of annotation
   46.12       * processing, or declarations of members, parameters, or type
   46.13       * parameters declared within those, are returned.  Included type
   46.14 -     * elements are {@linkplain #getSpecifiedTypeElements specified
   46.15 +     * elements are {@linkplain #getRootElements specified
   46.16       * types} and any types nested within them.
   46.17       *
   46.18       * @param a  annotation type being requested

    47.1 --- a/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java	Tue Oct 09 19:10:00 2012 -0700
    47.2 +++ b/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java	Tue Oct 09 19:31:58 2012 -0700
    47.3 @@ -1,5 +1,5 @@
    47.4  /*
    47.5 - * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
    47.6 + * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
    47.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    47.8   *
    47.9   * This code is free software; you can redistribute it and/or modify it
   47.10 @@ -72,7 +72,7 @@
   47.11       *         The service class for which providers are being sought;
   47.12       *         used to construct error detail strings
   47.13       *
   47.14 -     * @param  url
   47.15 +     * @param  u
   47.16       *         The URL naming the configuration file to be parsed
   47.17       *
   47.18       * @return true if the name of a service is found

    48.1 --- a/src/share/classes/com/sun/tools/javac/tree/JCTree.java	Tue Oct 09 19:10:00 2012 -0700
    48.2 +++ b/src/share/classes/com/sun/tools/javac/tree/JCTree.java	Tue Oct 09 19:31:58 2012 -0700
    48.3 @@ -464,32 +464,29 @@
    48.4      }
    48.5  
    48.6      /**
    48.7 -     * Everything in one source file is kept in a TopLevel structure.
    48.8 -     * @param pid              The tree representing the package clause.
    48.9 -     * @param sourcefile       The source file name.
   48.10 -     * @param defs             All definitions in this file (ClassDef, Import, and Skip)
   48.11 -     * @param packge           The package it belongs to.
   48.12 -     * @param namedImportScope A scope for all named imports.
   48.13 -     * @param starImportScope  A scope for all import-on-demands.
   48.14 -     * @param lineMap          Line starting positions, defined only
   48.15 -     *                         if option -g is set.
   48.16 -     * @param docComments      A hashtable that stores all documentation comments
   48.17 -     *                         indexed by the tree nodes they refer to.
   48.18 -     *                         defined only if option -s is set.
   48.19 -     * @param endPositions     An object encapsulating ending positions of source
   48.20 -     *                         ranges indexed by the tree nodes they belong to.
   48.21 -     *                         Defined only if option -Xjcov is set.
   48.22 +     * Everything in one source file is kept in a {@linkplain JCCompilationUnit} structure.
   48.23       */
   48.24      public static class JCCompilationUnit extends JCTree implements CompilationUnitTree {
   48.25          public List<JCAnnotation> packageAnnotations;
   48.26 +        /** The tree representing the package clause. */
   48.27          public JCExpression pid;
   48.28 +        /** All definitions in this file (ClassDef, Import, and Skip) */
   48.29          public List<JCTree> defs;
   48.30 +        /* The source file name. */
   48.31          public JavaFileObject sourcefile;
   48.32 +        /** The package to which this compilation unit belongs. */
   48.33          public PackageSymbol packge;
   48.34 +        /** A scope for all named imports. */
   48.35          public ImportScope namedImportScope;
   48.36 +        /** A scope for all import-on-demands. */
   48.37          public StarImportScope starImportScope;
   48.38 +        /** Line starting positions, defined only if option -g is set. */
   48.39          public Position.LineMap lineMap = null;
   48.40 +        /** A table that stores all documentation comments indexed by the tree
   48.41 +         * nodes they refer to. defined only if option -s is set. */
   48.42          public DocCommentTable docComments = null;
   48.43 +        /* An object encapsulating ending positions of source ranges indexed by
   48.44 +         * the tree nodes they belong to. Defined only if option -Xjcov is set. */
   48.45          public EndPosTable endPositions = null;
   48.46          protected JCCompilationUnit(List<JCAnnotation> packageAnnotations,
   48.47                          JCExpression pid,
   48.48 @@ -550,10 +547,10 @@
   48.49  
   48.50      /**
   48.51       * An import clause.
   48.52 -     * @param qualid    The imported class(es).
   48.53       */
   48.54      public static class JCImport extends JCTree implements ImportTree {
   48.55          public boolean staticImport;
   48.56 +        /** The imported class(es). */
   48.57          public JCTree qualid;
   48.58          protected JCImport(JCTree qualid, boolean importStatic) {
   48.59              this.qualid = qualid;
   48.60 @@ -605,21 +602,21 @@
   48.61  
   48.62      /**
   48.63       * A class definition.
   48.64 -     * @param modifiers the modifiers
   48.65 -     * @param name the name of the class
   48.66 -     * @param typarams formal class parameters
   48.67 -     * @param extending the classes this class extends
   48.68 -     * @param implementing the interfaces implemented by this class
   48.69 -     * @param defs all variables and methods defined in this class
   48.70 -     * @param sym the symbol
   48.71       */
   48.72      public static class JCClassDecl extends JCStatement implements ClassTree {
   48.73 +        /** the modifiers */
   48.74          public JCModifiers mods;
   48.75 +        /** the name of the class */
   48.76          public Name name;
   48.77 +        /** formal class parameters */
   48.78          public List<JCTypeParameter> typarams;
   48.79 +        /** the classes this class extends */
   48.80          public JCExpression extending;
   48.81 +        /** the interfaces implemented by this class */
   48.82          public List<JCExpression> implementing;
   48.83 +        /** all variables and methods defined in this class */
   48.84          public List<JCTree> defs;
   48.85 +        /** the symbol */
   48.86          public ClassSymbol sym;
   48.87          protected JCClassDecl(JCModifiers mods,
   48.88                             Name name,
   48.89 @@ -676,24 +673,25 @@
   48.90  
   48.91      /**
   48.92       * A method definition.
   48.93 -     * @param modifiers method modifiers
   48.94 -     * @param name method name
   48.95 -     * @param restype type of method return value
   48.96 -     * @param typarams type parameters
   48.97 -     * @param params value parameters
   48.98 -     * @param thrown exceptions thrown by this method
   48.99 -     * @param stats statements in the method
  48.100 -     * @param sym method symbol
  48.101       */
  48.102      public static class JCMethodDecl extends JCTree implements MethodTree {
  48.103 +        /** method modifiers */
  48.104          public JCModifiers mods;
  48.105 +        /** method name */
  48.106          public Name name;
  48.107 +        /** type of method return value */
  48.108          public JCExpression restype;
  48.109 +        /** type parameters */
  48.110          public List<JCTypeParameter> typarams;
  48.111 +        /** value parameters */
  48.112          public List<JCVariableDecl> params;
  48.113 +        /** exceptions thrown by this method */
  48.114          public List<JCExpression> thrown;
  48.115 +        /** statements in the method */
  48.116          public JCBlock body;
  48.117 -        public JCExpression defaultValue; // for annotation types
  48.118 +        /** default value, for annotation types */
  48.119 +        public JCExpression defaultValue;
  48.120 +        /** method symbol */
  48.121          public MethodSymbol sym;
  48.122          protected JCMethodDecl(JCModifiers mods,
  48.123                              Name name,
  48.124 @@ -748,17 +746,17 @@
  48.125  
  48.126      /**
  48.127       * A variable definition.
  48.128 -     * @param modifiers variable modifiers
  48.129 -     * @param name variable name
  48.130 -     * @param vartype type of the variable
  48.131 -     * @param init variables initial value
  48.132 -     * @param sym symbol
  48.133       */
  48.134      public static class JCVariableDecl extends JCStatement implements VariableTree {
  48.135 +        /** variable modifiers */
  48.136          public JCModifiers mods;
  48.137 +        /** variable name */
  48.138          public Name name;
  48.139 +        /** type of the variable */
  48.140          public JCExpression vartype;
  48.141 +        /** variable's initial value */
  48.142          public JCExpression init;
  48.143 +        /** symbol */
  48.144          public VarSymbol sym;
  48.145          protected JCVariableDecl(JCModifiers mods,
  48.146                           Name name,
  48.147 @@ -815,11 +813,11 @@
  48.148  
  48.149      /**
  48.150       * A statement block.
  48.151 -     * @param stats statements
  48.152 -     * @param flags flags
  48.153       */
  48.154      public static class JCBlock extends JCStatement implements BlockTree {
  48.155 +        /** flags */
  48.156          public long flags;
  48.157 +        /** statements */
  48.158          public List<JCStatement> stats;
  48.159          /** Position of closing brace, optional. */
  48.160          public int endpos = Position.NOPOS;
  48.161 @@ -1206,9 +1204,9 @@
  48.162  
  48.163      /**
  48.164       * an expression statement
  48.165 -     * @param expr expression structure
  48.166       */
  48.167      public static class JCExpressionStatement extends JCStatement implements ExpressionStatementTree {
  48.168 +        /** expression structure */
  48.169          public JCExpression expr;
  48.170          protected JCExpressionStatement(JCExpression expr)
  48.171          {
  48.172 @@ -1776,13 +1774,13 @@
  48.173  
  48.174      /**
  48.175       * Selects through packages and classes
  48.176 -     * @param selected selected Tree hierarchie
  48.177 -     * @param selector name of field to select thru
  48.178 -     * @param sym symbol of the selected class
  48.179       */
  48.180      public static class JCFieldAccess extends JCExpression implements MemberSelectTree {
  48.181 +        /** selected Tree hierarchy */
  48.182          public JCExpression selected;
  48.183 +        /** name of field to select thru */
  48.184          public Name name;
  48.185 +        /** symbol of the selected class */
  48.186          public Symbol sym;
  48.187          protected JCFieldAccess(JCExpression selected, Name name, Symbol sym) {
  48.188              this.selected = selected;
  48.189 @@ -1885,11 +1883,11 @@
  48.190  
  48.191      /**
  48.192       * An identifier
  48.193 -     * @param idname the name
  48.194 -     * @param sym the symbol
  48.195       */
  48.196      public static class JCIdent extends JCExpression implements IdentifierTree {
  48.197 +        /** the name */
  48.198          public Name name;
  48.199 +        /** the symbol */
  48.200          public Symbol sym;
  48.201          protected JCIdent(Name name, Symbol sym) {
  48.202              this.name = name;
  48.203 @@ -1912,10 +1910,10 @@
  48.204  
  48.205      /**
  48.206       * A constant value given literally.
  48.207 -     * @param value value representation
  48.208       */
  48.209      public static class JCLiteral extends JCExpression implements LiteralTree {
  48.210          public int typetag;
  48.211 +        /** value representation */
  48.212          public Object value;
  48.213          protected JCLiteral(int typetag, Object value) {
  48.214              this.typetag = typetag;
  48.215 @@ -1978,10 +1976,10 @@
  48.216  
  48.217      /**
  48.218       * Identifies a basic type.
  48.219 -     * @param tag the basic type id
  48.220       * @see TypeTags
  48.221       */
  48.222      public static class JCPrimitiveTypeTree extends JCExpression implements PrimitiveTypeTree {
  48.223 +        /** the basic type id */
  48.224          public int typetag;
  48.225          protected JCPrimitiveTypeTree(int typetag) {
  48.226              this.typetag = typetag;
  48.227 @@ -2105,11 +2103,11 @@
  48.228  
  48.229      /**
  48.230       * A formal class parameter.
  48.231 -     * @param name name
  48.232 -     * @param bounds bounds
  48.233       */
  48.234      public static class JCTypeParameter extends JCTree implements TypeParameterTree {
  48.235 +        /** name */
  48.236          public Name name;
  48.237 +        /** bounds */
  48.238          public List<JCExpression> bounds;
  48.239          protected JCTypeParameter(Name name, List<JCExpression> bounds) {
  48.240              this.name = name;

    49.1 --- a/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java	Tue Oct 09 19:10:00 2012 -0700
    49.2 +++ b/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java	Tue Oct 09 19:31:58 2012 -0700
    49.3 @@ -1,5 +1,5 @@
    49.4  /*
    49.5 - * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
    49.6 + * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
    49.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    49.8   *
    49.9   * This code is free software; you can redistribute it and/or modify it
   49.10 @@ -484,7 +484,7 @@
   49.11          /**
   49.12           * Tells whether the caret display is active or not.
   49.13           *
   49.14 -         * @param caretEnabled if true the caret is enabled
   49.15 +         * @return true if the caret is enabled
   49.16           */
   49.17          public boolean isCaretEnabled() {
   49.18              return caretEnabled;

    50.1 --- a/src/share/classes/com/sun/tools/javac/util/AbstractLog.java	Tue Oct 09 19:10:00 2012 -0700
    50.2 +++ b/src/share/classes/com/sun/tools/javac/util/AbstractLog.java	Tue Oct 09 19:31:58 2012 -0700
    50.3 @@ -1,5 +1,5 @@
    50.4  /*
    50.5 - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
    50.6 + * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
    50.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    50.8   *
    50.9   * This code is free software; you can redistribute it and/or modify it
   50.10 @@ -132,7 +132,6 @@
   50.11  
   50.12      /** Report a warning, unless suppressed by the  -nowarn option or the
   50.13       *  maximum number of warnings has been reached.
   50.14 -     *  @param pos    The source position at which to report the warning.
   50.15       *  @param key    The key for the localized warning message.
   50.16       *  @param args   Fields of the warning message.
   50.17       */

    51.1 --- a/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java	Tue Oct 09 19:10:00 2012 -0700
    51.2 +++ b/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java	Tue Oct 09 19:31:58 2012 -0700
    51.3 @@ -1,5 +1,5 @@
    51.4  /*
    51.5 - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
    51.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
    51.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    51.8   *
    51.9   * This code is free software; you can redistribute it and/or modify it
   51.10 @@ -69,7 +69,7 @@
   51.11      /**
   51.12       * Create a basic formatter based on the supplied options.
   51.13       *
   51.14 -     * @param opts list of command-line options
   51.15 +     * @param options list of command-line options
   51.16       * @param msgs JavacMessages object used for i18n
   51.17       */
   51.18      public BasicDiagnosticFormatter(Options options, JavacMessages msgs) {
   51.19 @@ -329,7 +329,7 @@
   51.20           * Set the indentation level for various element of a given diagnostic -
   51.21           * this might lead to more readable diagnostics
   51.22           *
   51.23 -         * @param indentationKind kind of indentation to be set
   51.24 +         * @param diagPart
   51.25           * @param nSpaces amount of spaces for the specified diagnostic part
   51.26           */
   51.27          public void setIndentation(DiagnosticPart diagPart, int nSpaces) {
   51.28 @@ -384,7 +384,7 @@
   51.29          /**
   51.30           * Get a metachar string for a specific format
   51.31           *
   51.32 -         * @param sourcePos a positioning value for source line
   51.33 +         * @param kind the format kind for which to get the metachar string
   51.34           */
   51.35          public String getFormat(BasicFormatKind kind) {
   51.36              return availableFormats.get(kind);

    52.1 --- a/src/share/classes/com/sun/tools/javac/util/Context.java	Tue Oct 09 19:10:00 2012 -0700
    52.2 +++ b/src/share/classes/com/sun/tools/javac/util/Context.java	Tue Oct 09 19:31:58 2012 -0700
    52.3 @@ -44,7 +44,7 @@
    52.4   * instance method that is overridden in extended components.  A base
    52.5   * phase supporting extension would look something like this:
    52.6   *
    52.7 - * <p><pre>
    52.8 + * <p><pre>{@code
    52.9   * public class Phase {
   52.10   *     protected static final Context.Key<Phase> phaseKey =
   52.11   *         new Context.Key<Phase>();
   52.12 @@ -62,7 +62,7 @@
   52.13   *         // other intitialization follows...
   52.14   *     }
   52.15   * }
   52.16 - * </pre>
   52.17 + * }</pre>
   52.18   *
   52.19   * <p>In the compiler, we simply use Phase.instance(context) to get
   52.20   * the reference to the phase.  But in extensions of the compiler, we
   52.21 @@ -70,7 +70,7 @@
   52.22   * and this must be done before any reference to the phase is accessed
   52.23   * using Phase.instance().  An extended phase might be declared thus:
   52.24   *
   52.25 - * <p><pre>
   52.26 + * <p><pre>{@code
   52.27   * public class NewPhase extends Phase {
   52.28   *     protected NewPhase(Context context) {
   52.29   *         super(context);
   52.30 @@ -83,7 +83,7 @@
   52.31   *         });
   52.32   *     }
   52.33   * }
   52.34 - * </pre>
   52.35 + * }</pre>
   52.36   *
   52.37   * <p>And is registered early in the extended compiler like this
   52.38   *

    53.1 --- a/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java	Tue Oct 09 19:10:00 2012 -0700
    53.2 +++ b/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java	Tue Oct 09 19:31:58 2012 -0700
    53.3 @@ -213,7 +213,6 @@
    53.4           * Create a new diagnostic of the given kind, which is not mandatory and which has
    53.5           * no lint category.
    53.6           *  @param kind        The diagnostic kind
    53.7 -         *  @param ls          The lint category, if applicable, or null
    53.8           *  @param source      The source of the compilation unit, if any, in which to report the message.
    53.9           *  @param pos         The source position at which to report the message.
   53.10           *  @param key         The key for the localized message.
   53.11 @@ -228,7 +227,7 @@
   53.12           * Create a new diagnostic of the given kind.
   53.13           *  @param kind        The diagnostic kind
   53.14           *  @param lc          The lint category, if applicable, or null
   53.15 -         *  @param isMandatory is diagnostic mandatory?
   53.16 +         *  @param flags       The set of flags for the diagnostic
   53.17           *  @param source      The source of the compilation unit, if any, in which to report the message.
   53.18           *  @param pos         The source position at which to report the message.
   53.19           *  @param key         The key for the localized message.
   53.20 @@ -363,7 +362,7 @@
   53.21  
   53.22      /**
   53.23       * Create a diagnostic object.
   53.24 -     * @param fomatter the formatter to use for the diagnostic
   53.25 +     * @param formatter the formatter to use for the diagnostic
   53.26       * @param dt the type of diagnostic
   53.27       * @param lc     the lint category for the diagnostic
   53.28       * @param source the name of the source file, or null if none.

    54.1 --- a/src/share/classes/com/sun/tools/javac/util/Position.java	Tue Oct 09 19:10:00 2012 -0700
    54.2 +++ b/src/share/classes/com/sun/tools/javac/util/Position.java	Tue Oct 09 19:31:58 2012 -0700
    54.3 @@ -80,11 +80,11 @@
    54.4  
    54.5      /** Encode line and column numbers in an integer as:
    54.6       *  {@code line-number << LINESHIFT + column-number }.
    54.7 -     *  {@link Position.NOPOS} represents an undefined position.
    54.8 +     *  {@link Position#NOPOS} represents an undefined position.
    54.9       *
   54.10       * @param  line  number of line (first is 1)
   54.11       * @param  col   number of character on line (first is 1)
   54.12 -     * @return       an encoded position or {@link Position.NOPOS}
   54.13 +     * @return       an encoded position or {@link Position#NOPOS}
   54.14       *               if the line or column number is too big to
   54.15       *               represent in the encoded format
   54.16       * @throws IllegalArgumentException if line or col is less than 1

    55.1 --- a/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java	Tue Oct 09 19:10:00 2012 -0700
    55.2 +++ b/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java	Tue Oct 09 19:31:58 2012 -0700
    55.3 @@ -1,5 +1,5 @@
    55.4  /*
    55.5 - * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
    55.6 + * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
    55.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55.8   *
    55.9   * This code is free software; you can redistribute it and/or modify it
   55.10 @@ -52,7 +52,7 @@
   55.11  
   55.12      /**
   55.13       * Create a formatter based on the supplied options.
   55.14 -     * @param msgs
   55.15 +     * @param options
   55.16       */
   55.17      public RawDiagnosticFormatter(Options options) {
   55.18          super(null, new SimpleConfiguration(options,

    56.1 --- a/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java	Tue Oct 09 19:10:00 2012 -0700
    56.2 +++ b/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java	Tue Oct 09 19:31:58 2012 -0700
    56.3 @@ -844,7 +844,7 @@
    56.4       * Note that this is not necessarily what the compiler would do!
    56.5       *
    56.6       * @param methodName the unqualified name to search for.
    56.7 -     * @param paramTypeArray the array of Strings for method parameter types.
    56.8 +     * @param paramTypes the array of Strings for method parameter types.
    56.9       * @return the first MethodDocImpl which matches, null if not found.
   56.10       */
   56.11      public MethodDocImpl findMethod(String methodName, String[] paramTypes) {
   56.12 @@ -971,7 +971,7 @@
   56.13       * Find constructor in this class.
   56.14       *
   56.15       * @param constrName the unqualified name to search for.
   56.16 -     * @param paramTypeArray the array of Strings for constructor parameters.
   56.17 +     * @param paramTypes the array of Strings for constructor parameters.
   56.18       * @return the first ConstructorDocImpl which matches, null if not found.
   56.19       */
   56.20      public ConstructorDoc findConstructor(String constrName,

    57.1 --- a/src/share/classes/com/sun/tools/javadoc/DocImpl.java	Tue Oct 09 19:10:00 2012 -0700
    57.2 +++ b/src/share/classes/com/sun/tools/javadoc/DocImpl.java	Tue Oct 09 19:31:58 2012 -0700
    57.3 @@ -262,7 +262,7 @@
    57.4       * <p>
    57.5       * Included so that Doc item are java.lang.Comparable.
    57.6       *
    57.7 -     * @param   o the <code>Object</code> to be compared.
    57.8 +     * @param   obj the {@code Object} to be compared.
    57.9       * @return  a negative integer, zero, or a positive integer as this Object
   57.10       *          is less than, equal to, or greater than the given Object.
   57.11       * @exception ClassCastException the specified Object's type prevents it

    58.1 --- a/src/share/classes/com/sun/tools/javadoc/JavadocTool.java	Tue Oct 09 19:10:00 2012 -0700
    58.2 +++ b/src/share/classes/com/sun/tools/javadoc/JavadocTool.java	Tue Oct 09 19:31:58 2012 -0700
    58.3 @@ -1,5 +1,5 @@
    58.4  /*
    58.5 - * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
    58.6 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
    58.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    58.8   *
    58.9   * This code is free software; you can redistribute it and/or modify it
   58.10 @@ -386,7 +386,7 @@
   58.11      /**
   58.12       * Return true if given file name is a valid class name
   58.13       * (including "package-info").
   58.14 -     * @param clazzname the name of the class to check.
   58.15 +     * @param s the name of the class to check.
   58.16       * @return true if given class name is a valid class name
   58.17       * and false otherwise.
   58.18       */

    59.1 --- a/src/share/classes/com/sun/tools/javadoc/ModifierFilter.java	Tue Oct 09 19:10:00 2012 -0700
    59.2 +++ b/src/share/classes/com/sun/tools/javadoc/ModifierFilter.java	Tue Oct 09 19:31:58 2012 -0700
    59.3 @@ -1,5 +1,5 @@
    59.4  /*
    59.5 - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
    59.6 + * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
    59.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    59.8   *
    59.9   * This code is free software; you can redistribute it and/or modify it
   59.10 @@ -32,7 +32,7 @@
   59.11   *   Filtering is done by returning boolean values.
   59.12   *   Classes, methods and fields can be filtered, or filtering
   59.13   *   can be done directly on modifier bits.
   59.14 - *   @see com.sun.tools.javac.code.Flags;
   59.15 + *   @see com.sun.tools.javac.code.Flags
   59.16   *   @author Robert Field
   59.17   */
   59.18  

    60.1 --- a/src/share/classes/com/sun/tools/javadoc/ParamTagImpl.java	Tue Oct 09 19:10:00 2012 -0700
    60.2 +++ b/src/share/classes/com/sun/tools/javadoc/ParamTagImpl.java	Tue Oct 09 19:31:58 2012 -0700
    60.3 @@ -1,5 +1,5 @@
    60.4  /*
    60.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
    60.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    60.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    60.8   *
    60.9   * This code is free software; you can redistribute it and/or modify it
   60.10 @@ -101,8 +101,8 @@
   60.11       * TagImpls consisting of SeeTagImpl(s) and text containing TagImpl(s).
   60.12       *
   60.13       * @return TagImpl[] Array of tags with inline SeeTagImpls.
   60.14 -     * @see TagImpl#inlineTagImpls()
   60.15 -     * @see ThrowsTagImpl#inlineTagImpls()
   60.16 +     * @see TagImpl#inlineTags()
   60.17 +     * @see ThrowsTagImpl#inlineTags()
   60.18       */
   60.19      @Override
   60.20      public Tag[] inlineTags() {

    61.1 --- a/src/share/classes/com/sun/tools/javadoc/ThrowsTagImpl.java	Tue Oct 09 19:10:00 2012 -0700
    61.2 +++ b/src/share/classes/com/sun/tools/javadoc/ThrowsTagImpl.java	Tue Oct 09 19:31:58 2012 -0700
    61.3 @@ -1,5 +1,5 @@
    61.4  /*
    61.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
    61.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    61.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    61.8   *
    61.9   * This code is free software; you can redistribute it and/or modify it
   61.10 @@ -108,8 +108,8 @@
   61.11       * TagImpls consisting of SeeTagImpl(s) and text containing TagImpl(s).
   61.12       *
   61.13       * @return TagImpl[] Array of tags with inline SeeTagImpls.
   61.14 -     * @see TagImpl#inlineTagImpls()
   61.15 -     * @see ParamTagImpl#inlineTagImpls()
   61.16 +     * @see TagImpl#inlineTags()
   61.17 +     * @see ParamTagImpl#inlineTags()
   61.18       */
   61.19      @Override
   61.20      public Tag[] inlineTags() {

    62.1 --- a/src/share/classes/com/sun/tools/javah/NativeHeaderTool.java	Tue Oct 09 19:10:00 2012 -0700
    62.2 +++ b/src/share/classes/com/sun/tools/javah/NativeHeaderTool.java	Tue Oct 09 19:31:58 2012 -0700
    62.3 @@ -1,5 +1,5 @@
    62.4  /*
    62.5 - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
    62.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
    62.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    62.8   *
    62.9   * This code is free software; you can redistribute it and/or modify it
   62.10 @@ -29,11 +29,13 @@
   62.11  import java.nio.charset.Charset;
   62.12  import java.util.Locale;
   62.13  import java.util.concurrent.Callable;
   62.14 +import javax.tools.Diagnostic;
   62.15  import javax.tools.DiagnosticListener;
   62.16  import javax.tools.JavaFileManager;
   62.17  import javax.tools.JavaFileObject;
   62.18  import javax.tools.OptionChecker;
   62.19  import javax.tools.StandardJavaFileManager;
   62.20 +import javax.tools.StandardLocation;
   62.21  import javax.tools.Tool;
   62.22  
   62.23  /**

    63.1 --- a/src/share/classes/com/sun/tools/javap/DisassemblerTool.java	Tue Oct 09 19:10:00 2012 -0700
    63.2 +++ b/src/share/classes/com/sun/tools/javap/DisassemblerTool.java	Tue Oct 09 19:31:58 2012 -0700
    63.3 @@ -1,5 +1,5 @@
    63.4  /*
    63.5 - * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
    63.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
    63.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    63.8   *
    63.9   * This code is free software; you can redistribute it and/or modify it
   63.10 @@ -29,11 +29,13 @@
   63.11  import java.nio.charset.Charset;
   63.12  import java.util.Locale;
   63.13  import java.util.concurrent.Callable;
   63.14 +import javax.tools.Diagnostic;
   63.15  import javax.tools.DiagnosticListener;
   63.16  import javax.tools.JavaFileManager;
   63.17  import javax.tools.JavaFileObject;
   63.18  import javax.tools.OptionChecker;
   63.19  import javax.tools.StandardJavaFileManager;
   63.20 +import javax.tools.StandardLocation;
   63.21  import javax.tools.Tool;
   63.22  
   63.23  /**
   63.24 @@ -69,9 +71,7 @@
   63.25       * @param options compiler options, {@code null} means no options
   63.26       * @param classes class names (for annotation processing), {@code
   63.27       * null} means no class names
   63.28 -     * @param compilationUnits the compilation units to compile, {@code
   63.29 -     * null} means no compilation units
   63.30 -     * @return an object representing the compilation
   63.31 +     * @return a task to perform the disassembly
   63.32       * @throws RuntimeException if an unrecoverable error
   63.33       * occurred in a user supplied component.  The
   63.34       * {@linkplain Throwable#getCause() cause} will be the error in