Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/make/build.xml	Thu Mar 28 10:55:14 2013 -0700
     1.2 +++ b/make/build.xml	Mon Apr 01 21:42:15 2013 -0700
     1.3 @@ -1,6 +1,6 @@
     1.4  <?xml version="1.0" encoding="UTF-8"?>
     1.5  <!--
     1.6 - Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
     1.7 + Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
     1.8   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.9  
    1.10   This code is free software; you can redistribute it and/or modify it
    1.11 @@ -432,6 +432,31 @@
    1.12          </zip>
    1.13      </target>
    1.14  
    1.15 +    <target name="doclint-api" depends="build-all-classes">
    1.16 +        <delete dir="${build.dir}/doclint/classes"/>
    1.17 +        <mkdir dir="${build.dir}/doclint/classes"/>
    1.18 +        <javac fork="true"
    1.19 +               executable="${boot.javac}"
    1.20 +               srcdir="${src.classes.dir}:${build.gensrc.dir}"
    1.21 +               destdir="${build.dir}/doclint/classes"
    1.22 +               includes="javax/lang/model/** com/sun/javadoc/** com/sun/source/**"
    1.23 +               excludes=""
    1.24 +               sourcepath="${javac.sourcepath}"
    1.25 +               classpath="${javac.classpath}"
    1.26 +               includeAntRuntime="no"
    1.27 +               source="${javac.source}"
    1.28 +               target="${javac.target}"
    1.29 +               debug="${javac.debug}"
    1.30 +               debuglevel="${javac.debuglevel}">
    1.31 +            <compilerarg value="-implicit:none"/>
    1.32 +            <compilerarg value="-Xprefer:source"/>
    1.33 +            <compilerarg value="-J-Xbootclasspath/p:${build.bootstrap.dir}/classes"/>
    1.34 +            <compilerarg line="${javac.no.jdk.warnings}"/>
    1.35 +            <compilerarg line="${javac.version.opt}"/>
    1.36 +            <compilerarg line="-Xdoclint:all/protected,-missing"/>
    1.37 +        </javac>
    1.38 +    </target>
    1.39 +
    1.40      <!--
    1.41      **** Debugging/diagnostic targets.
    1.42      -->
    1.43 @@ -678,7 +703,7 @@
    1.44                      jarclasspath="sjavac.jar"/>
    1.45          <build-tool name="sjavac"/>
    1.46      </target>
    1.47 -    
    1.48 +
    1.49      <!-- (no javadoc for javap) -->
    1.50  
    1.51      <target name="jtreg-sjavac" depends="build-sjavac,-def-jtreg">

     2.1 --- a/make/netbeans/langtools/nbproject/project.xml	Thu Mar 28 10:55:14 2013 -0700
     2.2 +++ b/make/netbeans/langtools/nbproject/project.xml	Mon Apr 01 21:42:15 2013 -0700
     2.3 @@ -29,15 +29,13 @@
     2.4   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
     2.5   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     2.6  -->
     2.7 -
     2.8 -<!DOCTYPE project [
     2.9 -    <!ENTITY standard-ide-actions SYSTEM "standard-ide-actions.ent">
    2.10 -    <!ENTITY standard-context-menu-items SYSTEM "standard-context-menu-items.ent">
    2.11 -]>
    2.12  <project xmlns="http://www.netbeans.org/ns/project/1">
    2.13      <type>org.netbeans.modules.ant.freeform</type>
    2.14      <configuration>
    2.15          <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
    2.16 +            <name>langtools</name>
    2.17 +        </general-data>
    2.18 +        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
    2.19              <!-- Do not use Project Properties customizer when editing this file manually. -->
    2.20              <name>langtools</name>
    2.21              <properties>
    2.22 @@ -49,11 +47,6 @@
    2.23                      <location>${root}</location>
    2.24                  </source-folder>
    2.25                  <source-folder>
    2.26 -                    <label>Source files</label>
    2.27 -                    <type>java</type>
    2.28 -                    <location>${root}/src/share/classes</location>
    2.29 -                </source-folder>
    2.30 -                <source-folder>
    2.31                      <label>Test files</label>
    2.32                      <type>tests</type>
    2.33                      <location>${root}/test</location>
    2.34 @@ -63,9 +56,169 @@
    2.35                      <type>build</type>
    2.36                      <location>${root}/make</location>
    2.37                  </source-folder>
    2.38 +                <source-folder>
    2.39 +                    <label>Source files</label>
    2.40 +                    <type>java</type>
    2.41 +                    <location>${root}/src/share/classes</location>
    2.42 +                </source-folder>
    2.43 +                <build-file>
    2.44 +                    <location>${root}/build/classes</location>
    2.45 +                </build-file>
    2.46              </folders>
    2.47              <ide-actions>
    2.48 -                &standard-ide-actions;
    2.49 +                <!--
    2.50 + Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
    2.51 +
    2.52 + Redistribution and use in source and binary forms, with or without
    2.53 + modification, are permitted provided that the following conditions
    2.54 + are met:
    2.55 +
    2.56 +   - Redistributions of source code must retain the above copyright
    2.57 +     notice, this list of conditions and the following disclaimer.
    2.58 +
    2.59 +   - Redistributions in binary form must reproduce the above copyright
    2.60 +     notice, this list of conditions and the following disclaimer in the
    2.61 +     documentation and/or other materials provided with the distribution.
    2.62 +
    2.63 +   - Neither the name of Oracle nor the names of its
    2.64 +     contributors may be used to endorse or promote products derived
    2.65 +     from this software without specific prior written permission.
    2.66 +
    2.67 + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
    2.68 + IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
    2.69 + THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
    2.70 + PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
    2.71 + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
    2.72 + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
    2.73 + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
    2.74 + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
    2.75 + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    2.76 + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    2.77 + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2.78 +-->
    2.79 +                <!-- 
    2.80 + This file defines the standard actions accepted by langtools projects.
    2.81 + It is normally included as an entity into a project's project.xml file.
    2.82 +
    2.83 + For information on these actions, see
    2.84 +   - NetBeans: Setting Up Projects
    2.85 +     at http://www.netbeans.org/kb/55/using-netbeans/project_setup.html
    2.86 +   - NetBeans: Advanced Freeform Project Configuration
    2.87 +     at http://www.netbeans.org/kb/41/freeform-config.html 
    2.88 +-->
    2.89 +                <action name="build">
    2.90 +                    <target>build</target>
    2.91 +                </action>
    2.92 +                <action name="clean">
    2.93 +                    <target>clean</target>
    2.94 +                </action>
    2.95 +                <action name="rebuild">
    2.96 +                    <target>clean</target>
    2.97 +                    <target>build</target>
    2.98 +                </action>
    2.99 +                <action name="compile.single">
   2.100 +                    <target>compile-single</target>
   2.101 +                    <property name="srcdir">${root}/src/share/classes</property>
   2.102 +                    <context>
   2.103 +                        <property>includes</property>
   2.104 +                        <folder>${root}/src/share/classes</folder>
   2.105 +                        <pattern>\.java$</pattern>
   2.106 +                        <format>relative-path</format>
   2.107 +                        <arity>
   2.108 +                            <separated-files>,</separated-files>
   2.109 +                        </arity>
   2.110 +                    </context>
   2.111 +                </action>
   2.112 +                <action name="run">
   2.113 +                    <target>run</target>
   2.114 +                </action>
   2.115 +                <action name="run.single">
   2.116 +                    <target>run-single</target>
   2.117 +                    <context>
   2.118 +                        <property>run.classname</property>
   2.119 +                        <folder>${root}/src/share/classes</folder>
   2.120 +                        <pattern>\.java$</pattern>
   2.121 +                        <format>java-name</format>
   2.122 +                        <arity>
   2.123 +                            <one-file-only/>
   2.124 +                        </arity>
   2.125 +                    </context>
   2.126 +                </action>
   2.127 +                <!-- 
   2.128 + Note: NetBeans does not appear to support context menu items
   2.129 + on shell scripts :-(
   2.130 +-->
   2.131 +                <action name="run.single">
   2.132 +                    <target>jtreg</target>
   2.133 +                    <context>
   2.134 +                        <property>jtreg.tests</property>
   2.135 +                        <folder>${root}/test</folder>
   2.136 +                        <pattern>\.(java|sh)$</pattern>
   2.137 +                        <format>relative-path</format>
   2.138 +                        <arity>
   2.139 +                            <separated-files>,</separated-files>
   2.140 +                        </arity>
   2.141 +                    </context>
   2.142 +                </action>
   2.143 +                <action name="test">
   2.144 +                    <target>jtreg</target>
   2.145 +                </action>
   2.146 +                <action name="debug">
   2.147 +                    <target>debug</target>
   2.148 +                </action>
   2.149 +                <action name="debug.single">
   2.150 +                    <target>debug-single</target>
   2.151 +                    <context>
   2.152 +                        <property>debug.classname</property>
   2.153 +                        <folder>${root}/src/share/classes</folder>
   2.154 +                        <pattern>\.java$</pattern>
   2.155 +                        <format>java-name</format>
   2.156 +                        <arity>
   2.157 +                            <one-file-only/>
   2.158 +                        </arity>
   2.159 +                    </context>
   2.160 +                </action>
   2.161 +                <!-- 
   2.162 + Note: NetBeans does not appear to support context menu items
   2.163 + on shell scripts :-(
   2.164 +-->
   2.165 +                <action name="debug.single">
   2.166 +                    <target>debug-jtreg</target>
   2.167 +                    <context>
   2.168 +                        <property>jtreg.tests</property>
   2.169 +                        <folder>${root}/test</folder>
   2.170 +                        <pattern>\.(java|sh)$</pattern>
   2.171 +                        <format>relative-path</format>
   2.172 +                        <arity>
   2.173 +                            <one-file-only/>
   2.174 +                        </arity>
   2.175 +                    </context>
   2.176 +                </action>
   2.177 +                <action name="debug.fix">
   2.178 +                    <target>debug-fix</target>
   2.179 +                    <property name="srcdir">${root}/src/share/classes</property>
   2.180 +                    <context>
   2.181 +                        <property>class</property>
   2.182 +                        <folder>${root}/src/share/classes</folder>
   2.183 +                        <pattern>\.java$</pattern>
   2.184 +                        <format>relative-path-noext</format>
   2.185 +                        <arity>
   2.186 +                            <one-file-only/>
   2.187 +                        </arity>
   2.188 +                    </context>
   2.189 +                </action>
   2.190 +                <action name="javadoc">
   2.191 +                    <target>javadoc</target>
   2.192 +                </action>
   2.193 +                <action name="select-tool">
   2.194 +                    <target>select-tool</target>
   2.195 +                </action>
   2.196 +                <action name="test-select-tool-1">
   2.197 +                    <target>test-select-tool-1</target>
   2.198 +                </action>
   2.199 +                <action name="test-select-tool-2">
   2.200 +                    <target>test-select-tool-2</target>
   2.201 +                </action>
   2.202              </ide-actions>
   2.203              <export>
   2.204                  <type>folder</type>
   2.205 @@ -86,13 +239,68 @@
   2.206                          <label>Build files</label>
   2.207                          <location>${root}/make</location>
   2.208                      </source-folder>
   2.209 +                    <source-folder style="packages">
   2.210 +                        <label>Source files</label>
   2.211 +                        <location>${root}/src/share/classes</location>
   2.212 +                    </source-folder>
   2.213                      <source-file>
   2.214                          <label>README</label>
   2.215                          <location>README</location>
   2.216                      </source-file>
   2.217                  </items>
   2.218                  <context-menu>
   2.219 -                    &standard-context-menu-items;
   2.220 +                    <!--
   2.221 + Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
   2.222 +
   2.223 + Redistribution and use in source and binary forms, with or without
   2.224 + modification, are permitted provided that the following conditions
   2.225 + are met:
   2.226 +
   2.227 +   - Redistributions of source code must retain the above copyright
   2.228 +     notice, this list of conditions and the following disclaimer.
   2.229 +
   2.230 +   - Redistributions in binary form must reproduce the above copyright
   2.231 +     notice, this list of conditions and the following disclaimer in the
   2.232 +     documentation and/or other materials provided with the distribution.
   2.233 +
   2.234 +   - Neither the name of Oracle nor the names of its
   2.235 +     contributors may be used to endorse or promote products derived
   2.236 +     from this software without specific prior written permission.
   2.237 +
   2.238 + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
   2.239 + IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
   2.240 + THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
   2.241 + PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
   2.242 + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
   2.243 + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
   2.244 + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
   2.245 + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
   2.246 + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
   2.247 + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
   2.248 + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   2.249 +-->
   2.250 +                    <!-- 
   2.251 + This file defines the actions that will appear on the project's context
   2.252 + menu, in the Projects viewer.
   2.253 + It is normally included as an entity into a project's project.xml file.
   2.254 +
   2.255 + For information on these actions, see
   2.256 +   - NetBeans: Setting Up Projects
   2.257 +     at http://www.netbeans.org/kb/55/using-netbeans/project_setup.html
   2.258 +   - NetBeans: Advanced Freeform Project Configuration
   2.259 +     at http://www.netbeans.org/kb/41/freeform-config.html 
   2.260 +-->
   2.261 +                    <ide-action name="select-tool"/>
   2.262 +                    <separator/>
   2.263 +                    <ide-action name="build"/>
   2.264 +                    <ide-action name="rebuild"/>
   2.265 +                    <ide-action name="clean"/>
   2.266 +                    <ide-action name="javadoc"/>
   2.267 +                    <separator/>
   2.268 +                    <ide-action name="run"/>
   2.269 +                    <ide-action name="debug"/>
   2.270 +                    <separator/>
   2.271 +                    <ide-action name="test"/>
   2.272                  </context-menu>
   2.273              </view>
   2.274              <subprojects/>
   2.275 @@ -101,7 +309,7 @@
   2.276              <compilation-unit>
   2.277                  <package-root>${root}/src/share/classes</package-root>
   2.278                  <built-to>${root}/build/classes</built-to>
   2.279 -                <source-level>1.5</source-level>  <!-- FIXME -->
   2.280 +                <source-level>1.5</source-level>
   2.281              </compilation-unit>
   2.282          </java-data>
   2.283      </configuration>

     3.1 --- a/src/share/classes/com/sun/source/util/DocTreeScanner.java	Thu Mar 28 10:55:14 2013 -0700
     3.2 +++ b/src/share/classes/com/sun/source/util/DocTreeScanner.java	Mon Apr 01 21:42:15 2013 -0700
     3.3 @@ -53,7 +53,7 @@
     3.4   *
     3.5   * <p>Here is an example to count the number of erroneous nodes in a tree:
     3.6   * <pre>
     3.7 - *   class CountErrors extends DocTreeScanner<Integer,Void> {
     3.8 + *   class CountErrors extends DocTreeScanner&lt;Integer,Void&gt; {
     3.9   *      {@literal @}Override
    3.10   *      public Integer visitErroneous(ErroneousTree node, Void p) {
    3.11   *          return 1;

     4.1 --- a/src/share/classes/com/sun/source/util/JavacTask.java	Thu Mar 28 10:55:14 2013 -0700
     4.2 +++ b/src/share/classes/com/sun/source/util/JavacTask.java	Mon Apr 01 21:42:15 2013 -0700
     4.3 @@ -56,7 +56,7 @@
     4.4       * If the compiler is being invoked using a
     4.5       * {@link javax.tools.JavaCompiler.CompilationTask CompilationTask},
     4.6       * then that task will be returned.
     4.7 -     * @param processingEnvironment
     4.8 +     * @param processingEnvironment the processing environment
     4.9       * @return the {@code JavacTask} for a {@code ProcessingEnvironment}
    4.10       * @since 1.8
    4.11       */

     5.1 --- a/src/share/classes/com/sun/source/util/Plugin.java	Thu Mar 28 10:55:14 2013 -0700
     5.2 +++ b/src/share/classes/com/sun/source/util/Plugin.java	Mon Apr 01 21:42:15 2013 -0700
     5.3 @@ -38,7 +38,7 @@
     5.4   *
     5.5   * <p>Plug-ins are located via a {@link ServiceLoader},
     5.6   * using the same class path as annotation processors (i.e.
     5.7 - * {@link StandardLocation#PROCESSOR_PATH PROCESSOR_PATH} or
     5.8 + * {@link StandardLocation#ANNOTATION_PROCESSOR_PATH ANNOTATION_PROCESSOR_PATH} or
     5.9   * {@code -processorpath}).
    5.10   *
    5.11   * <p>It is expected that a typical plug-in will simply register a

     6.1 --- a/src/share/classes/com/sun/tools/classfile/Code_attribute.java	Thu Mar 28 10:55:14 2013 -0700
     6.2 +++ b/src/share/classes/com/sun/tools/classfile/Code_attribute.java	Mon Apr 01 21:42:15 2013 -0700
     6.3 @@ -1,5 +1,5 @@
     6.4  /*
     6.5 - * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
     6.6 + * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
     6.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     6.8   *
     6.9   * This code is free software; you can redistribute it and/or modify it
    6.10 @@ -38,7 +38,7 @@
    6.11   *  deletion without notice.</b>
    6.12   */
    6.13  public class Code_attribute extends Attribute {
    6.14 -    public class InvalidIndex extends AttributeException {
    6.15 +    public static class InvalidIndex extends AttributeException {
    6.16          private static final long serialVersionUID = -8904527774589382802L;
    6.17          InvalidIndex(int index) {
    6.18              this.index = index;
    6.19 @@ -143,7 +143,7 @@
    6.20      public final Exception_data[] exception_table;
    6.21      public final Attributes attributes;
    6.22  
    6.23 -    public class Exception_data {
    6.24 +    public static class Exception_data {
    6.25          Exception_data(ClassReader cr) throws IOException {
    6.26              start_pc = cr.readUnsignedShort();
    6.27              end_pc = cr.readUnsignedShort();

     7.1 --- a/src/share/classes/com/sun/tools/classfile/Descriptor.java	Thu Mar 28 10:55:14 2013 -0700
     7.2 +++ b/src/share/classes/com/sun/tools/classfile/Descriptor.java	Mon Apr 01 21:42:15 2013 -0700
     7.3 @@ -1,5 +1,5 @@
     7.4  /*
     7.5 - * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
     7.6 + * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
     7.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     7.8   *
     7.9   * This code is free software; you can redistribute it and/or modify it
    7.10 @@ -37,7 +37,7 @@
    7.11   *  deletion without notice.</b>
    7.12   */
    7.13  public class Descriptor {
    7.14 -    public class InvalidDescriptor extends DescriptorException {
    7.15 +    public static class InvalidDescriptor extends DescriptorException {
    7.16          private static final long serialVersionUID = 1L;
    7.17          InvalidDescriptor(String desc) {
    7.18              this.desc = desc;

     8.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java	Thu Mar 28 10:55:14 2013 -0700
     8.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java	Mon Apr 01 21:42:15 2013 -0700
     8.3 @@ -135,13 +135,7 @@
     8.4      protected Content getFrameDetails() {
     8.5          HtmlTree frameset = HtmlTree.FRAMESET("20%,80%", null, "Documentation frame",
     8.6                  "top.loadFrames()");
     8.7 -        if (configuration.showProfiles) {
     8.8 -            HtmlTree leftFrameset = HtmlTree.FRAMESET(null, "30%,70%", "Left frames",
     8.9 -                "top.loadFrames()");
    8.10 -            addAllProfilesFrameTag(leftFrameset);
    8.11 -            addAllClassesFrameTag(leftFrameset);
    8.12 -            frameset.addContent(leftFrameset);
    8.13 -        } else if (noOfPackages <= 1) {
    8.14 +        if (noOfPackages <= 1) {
    8.15              addAllClassesFrameTag(frameset);
    8.16          } else if (noOfPackages > 1) {
    8.17              HtmlTree leftFrameset = HtmlTree.FRAMESET(null, "30%,70%", "Left frames",
    8.18 @@ -156,17 +150,6 @@
    8.19      }
    8.20  
    8.21      /**
    8.22 -     * Add the FRAME tag for the frame that lists all profiles.
    8.23 -     *
    8.24 -     * @param contentTree the content tree to which the information will be added
    8.25 -     */
    8.26 -    private void addAllProfilesFrameTag(Content contentTree) {
    8.27 -        HtmlTree frame = HtmlTree.FRAME(DocPaths.PROFILE_OVERVIEW_FRAME.getPath(),
    8.28 -                "profileListFrame", configuration.getText("doclet.All_Profiles"));
    8.29 -        contentTree.addContent(frame);
    8.30 -    }
    8.31 -
    8.32 -    /**
    8.33       * Add the FRAME tag for the frame that lists all packages.
    8.34       *
    8.35       * @param contentTree the content tree to which the information will be added

     9.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java	Thu Mar 28 10:55:14 2013 -0700
     9.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java	Mon Apr 01 21:42:15 2013 -0700
     9.3 @@ -162,7 +162,7 @@
     9.4       */
     9.5      protected void addAllProfilesLink(Content div) {
     9.6          Content linkContent = getHyperLink(DocPaths.PROFILE_OVERVIEW_FRAME,
     9.7 -                allprofilesLabel, "", "profileListFrame");
     9.8 +                allprofilesLabel, "", "packageListFrame");
     9.9          Content span = HtmlTree.SPAN(linkContent);
    9.10          div.addContent(span);
    9.11      }

    10.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ProfileIndexFrameWriter.java	Thu Mar 28 10:55:14 2013 -0700
    10.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ProfileIndexFrameWriter.java	Mon Apr 01 21:42:15 2013 -0700
    10.3 @@ -107,7 +107,7 @@
    10.4          String profileName = (Profile.lookup(profile)).name;
    10.5          profileLabel = new StringContent(profileName);
    10.6          profileLinkContent = getHyperLink(DocPaths.profileFrame(profileName), profileLabel, "",
    10.7 -                    "profileListFrame");
    10.8 +                    "packageListFrame");
    10.9          Content li = HtmlTree.LI(profileLinkContent);
   10.10          return li;
   10.11      }
   10.12 @@ -154,7 +154,7 @@
   10.13       */
   10.14      protected void addAllPackagesLink(Content div) {
   10.15          Content linkContent = getHyperLink(DocPaths.OVERVIEW_FRAME,
   10.16 -                allpackagesLabel, "", "profileListFrame");
   10.17 +                allpackagesLabel, "", "packageListFrame");
   10.18          Content span = HtmlTree.SPAN(linkContent);
   10.19          div.addContent(span);
   10.20      }

    11.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageIndexFrameWriter.java	Thu Mar 28 10:55:14 2013 -0700
    11.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageIndexFrameWriter.java	Mon Apr 01 21:42:15 2013 -0700
    11.3 @@ -172,7 +172,7 @@
    11.4       */
    11.5      protected void addAllPackagesLink(Content div) {
    11.6          Content linkContent = getHyperLink(DocPaths.OVERVIEW_FRAME,
    11.7 -                allpackagesLabel, "", "profileListFrame");
    11.8 +                allpackagesLabel, "", "packageListFrame");
    11.9          Content span = HtmlTree.SPAN(linkContent);
   11.10          div.addContent(span);
   11.11      }
   11.12 @@ -185,7 +185,7 @@
   11.13       */
   11.14      protected void addAllProfilesLink(Content div) {
   11.15          Content linkContent = getHyperLink(DocPaths.PROFILE_OVERVIEW_FRAME,
   11.16 -                allprofilesLabel, "", "profileListFrame");
   11.17 +                allprofilesLabel, "", "packageListFrame");
   11.18          Content span = HtmlTree.SPAN(linkContent);
   11.19          div.addContent(span);
   11.20      }

    12.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties	Thu Mar 28 10:55:14 2013 -0700
    12.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties	Mon Apr 01 21:42:15 2013 -0700
    12.3 @@ -32,7 +32,7 @@
    12.4  doclet.navAnnotationTypeRequiredMember=\u5FC5\u9808
    12.5  doclet.navAnnotationTypeMember=\u8981\u7D20
    12.6  doclet.navField=\u30D5\u30A3\u30FC\u30EB\u30C9
    12.7 -doclet.navEnum=\u5217\u6319\u5B9A\u6570
    12.8 +doclet.navEnum=\u5217\u6319\u578B\u5B9A\u6570
    12.9  doclet.navConstructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
   12.10  doclet.navMethod=\u30E1\u30BD\u30C3\u30C9
   12.11  doclet.Index=\u7D22\u5F15
   12.12 @@ -41,59 +41,47 @@
   12.13  doclet.Help=\u30D8\u30EB\u30D7
   12.14  doclet.Skip_navigation_links=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30EA\u30F3\u30AF\u3092\u30B9\u30AD\u30C3\u30D7
   12.15  doclet.New_Page=NewPage
   12.16 -doclet.None=\u306A\u3057
   12.17 -doclet.Factory_Method_Detail=static\u30D5\u30A1\u30AF\u30C8\u30EA\u30FB\u30E1\u30BD\u30C3\u30C9\u306E\u8A73\u7D30
   12.18  doclet.navDeprecated=\u975E\u63A8\u5968
   12.19 -doclet.Deprecated_List=\u975E\u63A8\u5968API\u306E\u30EA\u30B9\u30C8
   12.20 -doclet.Window_Deprecated_List=\u975E\u63A8\u5968API\u306E\u30EA\u30B9\u30C8
   12.21 -doclet.Note_0_is_deprecated=\u6CE8\u610F: {0}\u306F\u63A8\u5968\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
   12.22 +doclet.Window_Deprecated_List=\u975E\u63A8\u5968\u306E\u30EA\u30B9\u30C8
   12.23  doclet.Overrides=\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9:
   12.24  doclet.in_class=\u30AF\u30E9\u30B9\u5185
   12.25 -doclet.0_Fields_and_Methods="{0}"\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u30E1\u30BD\u30C3\u30C9
   12.26 -doclet.Index_of_Fields_and_Methods=\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u30E1\u30BD\u30C3\u30C9\u306E\u7D22\u5F15
   12.27  doclet.Static_variable_in={0}\u306Estatic\u5909\u6570
   12.28  doclet.Variable_in={0}\u306E\u5909\u6570
   12.29  doclet.Constructor_for={0}\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
   12.30  doclet.Static_method_in={0}\u306Estatic\u30E1\u30BD\u30C3\u30C9
   12.31  doclet.Method_in={0}\u306E\u30E1\u30BD\u30C3\u30C9
   12.32 -doclet.throws=\u30B9\u30ED\u30FC
   12.33  doclet.package=\u30D1\u30C3\u30B1\u30FC\u30B8
   12.34  doclet.MalformedURL=\u4E0D\u6B63\u306AURL: {0}
   12.35  doclet.File_error=\u30D5\u30A1\u30A4\u30EB\u8AAD\u8FBC\u307F\u30A8\u30E9\u30FC: {0}
   12.36  doclet.URL_error=URL\u53D6\u51FA\u3057\u30A8\u30E9\u30FC: {0}
   12.37 -doclet.No_Package_Comment_File=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306EPackage.Comment\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
   12.38 -doclet.No_Source_For_Class=\u30AF\u30E9\u30B9{0}\u306E\u30BD\u30FC\u30B9\u60C5\u5831\u304C\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
   12.39  doclet.see.class_or_package_not_found=\u30BF\u30B0{0}: \u53C2\u7167\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {1}
   12.40  doclet.see.class_or_package_not_accessible=\u30BF\u30B0{0}: \u53C2\u7167\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093: {1}
   12.41 -doclet.see.malformed_tag={0}\u30BF\u30B0: \u4E0D\u6B63\u306A{1}\u30BF\u30B0
   12.42 -doclet.Inherited_API_Summary=\u7D99\u627F\u3055\u308C\u305FAPI\u306E\u6982\u8981
   12.43 -doclet.Deprecated_API=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044API
   12.44 -doclet.Deprecated_Classes=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30AF\u30E9\u30B9
   12.45 -doclet.Deprecated_Enums=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u5217\u6319\u578B
   12.46 -doclet.Deprecated_Interfaces=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
   12.47 -doclet.Deprecated_Exceptions=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u4F8B\u5916
   12.48 -doclet.Deprecated_Annotation_Types=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u6CE8\u91C8\u578B
   12.49 -doclet.Deprecated_Errors=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30A8\u30E9\u30FC
   12.50 -doclet.Deprecated_Fields=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30D5\u30A3\u30FC\u30EB\u30C9
   12.51 -doclet.Deprecated_Constructors=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
   12.52 -doclet.Deprecated_Methods=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30E1\u30BD\u30C3\u30C9
   12.53 -doclet.Deprecated_Enum_Constants=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u5217\u6319\u578B\u5B9A\u6570
   12.54 -doclet.Deprecated_Annotation_Type_Members=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u6CE8\u91C8\u578B\u306E\u8981\u7D20
   12.55 -doclet.deprecated_classes=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30AF\u30E9\u30B9
   12.56 -doclet.deprecated_enums=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u5217\u6319\u578B
   12.57 -doclet.deprecated_interfaces=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
   12.58 -doclet.deprecated_exceptions=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u4F8B\u5916
   12.59 -doclet.deprecated_annotation_types=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u6CE8\u91C8\u578B
   12.60 -doclet.deprecated_errors=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30A8\u30E9\u30FC
   12.61 -doclet.deprecated_fields=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30D5\u30A3\u30FC\u30EB\u30C9
   12.62 -doclet.deprecated_constructors=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
   12.63 -doclet.deprecated_methods=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30E1\u30BD\u30C3\u30C9
   12.64 -doclet.deprecated_enum_constants=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u5217\u6319\u578B\u5B9A\u6570
   12.65 -doclet.deprecated_annotation_type_members=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u6CE8\u91C8\u578B\u306E\u8981\u7D20
   12.66 -doclet.Frame_Output=\u30D5\u30EC\u30FC\u30E0\u51FA\u529B
   12.67 -doclet.Docs_generated_by_Javadoc=\u3053\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306Fjavadoc\u3067\u751F\u6210\u3055\u308C\u3066\u3044\u307E\u3059\u3002
   12.68 +doclet.Deprecated_API=\u975E\u63A8\u5968\u306EAPI
   12.69 +doclet.Deprecated_Packages=\u975E\u63A8\u5968\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
   12.70 +doclet.Deprecated_Classes=\u975E\u63A8\u5968\u306E\u30AF\u30E9\u30B9
   12.71 +doclet.Deprecated_Enums=\u975E\u63A8\u5968\u306E\u5217\u6319\u578B
   12.72 +doclet.Deprecated_Interfaces=\u975E\u63A8\u5968\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
   12.73 +doclet.Deprecated_Exceptions=\u975E\u63A8\u5968\u306E\u4F8B\u5916
   12.74 +doclet.Deprecated_Annotation_Types=\u975E\u63A8\u5968\u306E\u6CE8\u91C8\u578B
   12.75 +doclet.Deprecated_Errors=\u975E\u63A8\u5968\u306E\u30A8\u30E9\u30FC
   12.76 +doclet.Deprecated_Fields=\u975E\u63A8\u5968\u306E\u30D5\u30A3\u30FC\u30EB\u30C9
   12.77 +doclet.Deprecated_Constructors=\u975E\u63A8\u5968\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
   12.78 +doclet.Deprecated_Methods=\u975E\u63A8\u5968\u306E\u30E1\u30BD\u30C3\u30C9
   12.79 +doclet.Deprecated_Enum_Constants=\u975E\u63A8\u5968\u306E\u5217\u6319\u578B\u5B9A\u6570
   12.80 +doclet.Deprecated_Annotation_Type_Members=\u975E\u63A8\u5968\u306E\u6CE8\u91C8\u578B\u306E\u8981\u7D20
   12.81 +doclet.deprecated_packages=\u975E\u63A8\u5968\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
   12.82 +doclet.deprecated_classes=\u975E\u63A8\u5968\u306E\u30AF\u30E9\u30B9
   12.83 +doclet.deprecated_enums=\u975E\u63A8\u5968\u306E\u5217\u6319\u578B
   12.84 +doclet.deprecated_interfaces=\u975E\u63A8\u5968\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
   12.85 +doclet.deprecated_exceptions=\u975E\u63A8\u5968\u306E\u4F8B\u5916
   12.86 +doclet.deprecated_annotation_types=\u975E\u63A8\u5968\u306E\u6CE8\u91C8\u578B
   12.87 +doclet.deprecated_errors=\u975E\u63A8\u5968\u306E\u30A8\u30E9\u30FC
   12.88 +doclet.deprecated_fields=\u975E\u63A8\u5968\u306E\u30D5\u30A3\u30FC\u30EB\u30C9
   12.89 +doclet.deprecated_constructors=\u975E\u63A8\u5968\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
   12.90 +doclet.deprecated_methods=\u975E\u63A8\u5968\u306E\u30E1\u30BD\u30C3\u30C9
   12.91 +doclet.deprecated_enum_constants=\u975E\u63A8\u5968\u306E\u5217\u6319\u578B\u5B9A\u6570
   12.92 +doclet.deprecated_annotation_type_members=\u975E\u63A8\u5968\u306E\u6CE8\u91C8\u578B\u306E\u8981\u7D20
   12.93  doclet.Generated_Docs_Untitled=\u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8(\u30BF\u30A4\u30C8\u30EB\u306A\u3057)
   12.94 -doclet.Blank=\u30D6\u30E9\u30F3\u30AF
   12.95  doclet.Other_Packages=\u305D\u306E\u4ED6\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
   12.96  doclet.Package_Description=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306E\u8AAC\u660E
   12.97  doclet.Description=\u8AAC\u660E
   12.98 @@ -102,33 +90,25 @@
   12.99  doclet.Subclasses=\u76F4\u7CFB\u306E\u65E2\u77E5\u306E\u30B5\u30D6\u30AF\u30E9\u30B9:
  12.100  doclet.Subinterfaces=\u65E2\u77E5\u306E\u30B5\u30D6\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8:
  12.101  doclet.Implementing_Classes=\u65E2\u77E5\u306E\u5B9F\u88C5\u30AF\u30E9\u30B9\u306E\u30EA\u30B9\u30C8:
  12.102 +doclet.Functional_Interface=\u6A5F\u80FD\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
  12.103 +doclet.Functional_Interface_Message=\u3053\u308C\u306F\u6A5F\u80FD\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306A\u306E\u3067\u3001\u30E9\u30E0\u30C0\u5F0F\u307E\u305F\u306F\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u306E\u5272\u5F53\u3066\u30BF\u30FC\u30B2\u30C3\u30C8\u3068\u3057\u3066\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002 
  12.104  doclet.also=\u540C\u69D8\u306B
  12.105 -doclet.Option=\u30AA\u30D7\u30B7\u30E7\u30F3
  12.106 -doclet.Or=\u307E\u305F\u306F
  12.107  doclet.Frames=\u30D5\u30EC\u30FC\u30E0
  12.108  doclet.No_Frames=\u30D5\u30EC\u30FC\u30E0\u306A\u3057
  12.109  doclet.Package_Hierarchies=\u30D1\u30C3\u30B1\u30FC\u30B8\u968E\u5C64:
  12.110  doclet.Hierarchy_For_Package=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306E\u968E\u5C64
  12.111 -doclet.Source_Code=\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9:
  12.112  doclet.Hierarchy_For_All_Packages=\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64
  12.113 -doclet.Cannot_handle_no_packages=\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u51E6\u7406\u3067\u304D\u307E\u305B\u3093\u3002
  12.114  doclet.Frame_Alert=\u30D5\u30EC\u30FC\u30E0\u95A2\u9023\u306E\u30A2\u30E9\u30FC\u30C8
  12.115 -doclet.Overview-Member-Frame=\u6982\u8981\u30E1\u30F3\u30D0\u30FC\u30FB\u30D5\u30EC\u30FC\u30E0
  12.116  doclet.Frame_Warning_Message=\u3053\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306F\u30D5\u30EC\u30FC\u30E0\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u3066\u8868\u793A\u3059\u308B\u3088\u3046\u306B\u4F5C\u6210\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30D5\u30EC\u30FC\u30E0\u3092\u8868\u793A\u3067\u304D\u306A\u3044Web\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u306E\u5834\u5408\u306B\u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002{0}\u306B\u30EA\u30F3\u30AF\u3057\u307E\u3059\u3002
  12.117  doclet.No_Script_Message=\u30D6\u30E9\u30A6\u30B6\u306EJavaScript\u304C\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002
  12.118  doclet.Non_Frame_Version=\u30D5\u30EC\u30FC\u30E0\u306B\u5BFE\u5FDC\u3057\u3066\u3044\u306A\u3044\u30D0\u30FC\u30B8\u30E7\u30F3
  12.119 -doclet.Frame_Version=\u30D5\u30EC\u30FC\u30E0\u3042\u308A\u306E\u30D0\u30FC\u30B8\u30E7\u30F3
  12.120 -doclet.Following_From_Class=\u30AF\u30E9\u30B9{0}\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u30BF\u30B0:
  12.121 -doclet.Following_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9{0}\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u30BF\u30B0:
  12.122  doclet.Description_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u8AAC\u660E:
  12.123  doclet.Description_From_Class=\u30AF\u30E9\u30B9\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u8AAC\u660E:
  12.124 -doclet.Standard_doclet_invoked=\u6A19\u6E96\u306Edoclet\u304C\u8D77\u52D5\u3055\u308C\u307E\u3057\u305F...
  12.125 -doclet.No_Non_Deprecated_Classes_To_Document=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3059\u308B\u975E\u63A8\u5968\u4EE5\u5916\u306E\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
  12.126 +doclet.No_Non_Deprecated_Classes_To_Document=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3059\u308B\u975E\u63A8\u5968\u3067\u306A\u3044\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
  12.127  doclet.Interfaces_Italic=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9(\u30A4\u30BF\u30EA\u30C3\u30AF)
  12.128  doclet.Enclosing_Class=\u542B\u307E\u308C\u3066\u3044\u308B\u30AF\u30E9\u30B9:
  12.129  doclet.Enclosing_Interface=\u542B\u307E\u308C\u3066\u3044\u308B\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9:
  12.130  doclet.Window_Source_title=\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9
  12.131 -doclet.Help_title=API\u30D8\u30EB\u30D7
  12.132  doclet.Window_Help_title=API\u30D8\u30EB\u30D7
  12.133  doclet.Help_line_1=API\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u69CB\u6210
  12.134  doclet.Help_line_2=\u3053\u306EAPI(Application Programming Interface)\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u3001\u6B21\u306B\u8AAC\u660E\u3059\u308B\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u3042\u308B\u9805\u76EE\u306B\u5BFE\u5FDC\u3059\u308B\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u307E\u3059\u3002
  12.135 @@ -149,7 +129,7 @@
  12.136  doclet.Help_line_17_with_tree_link=\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F{0}\u30DA\u30FC\u30B8\u304C\u3042\u308A\u3001\u3055\u3089\u306B\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u968E\u5C64\u30DA\u30FC\u30B8\u306F\u3001\u30AF\u30E9\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3092\u542B\u307F\u307E\u3059\u3002\u30AF\u30E9\u30B9\u306F <code>java.lang.Object</code> \u3092\u958B\u59CB\u70B9\u3068\u3059\u308B\u7D99\u627F\u69CB\u9020\u3067\u7DE8\u6210\u3055\u308C\u307E\u3059\u3002\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306F\u3001<code>java.lang.Object</code> \u304B\u3089\u306F\u7D99\u627F\u3057\u307E\u305B\u3093\u3002
  12.137  doclet.Help_line_18=\u6982\u8981\u30DA\u30FC\u30B8\u3092\u8868\u793A\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u300C\u968E\u5C64\u30C4\u30EA\u30FC\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u3001\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002
  12.138  doclet.Help_line_19=\u7279\u5B9A\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u8868\u793A\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u300C\u968E\u5C64\u30C4\u30EA\u30FC\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u3001\u8A72\u5F53\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u307F\u306E\u968E\u5C64\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002
  12.139 -doclet.Help_line_20_with_deprecated_api_link={0}\u30DA\u30FC\u30B8\u306F\u3001\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u3059\u3079\u3066\u306EAPI\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\u3002\u975E\u63A8\u5968API\u3068\u306F\u3001\u6A5F\u80FD\u6539\u826F\u306A\u3069\u306E\u7406\u7531\u304B\u3089\u4F7F\u7528\u3092\u304A\u85A6\u3081\u3067\u304D\u306A\u304F\u306A\u3063\u305FAPI\u306E\u3053\u3068\u3067\u3001\u901A\u5E38\u306F\u305D\u308C\u306B\u4EE3\u308F\u308BAPI\u304C\u63D0\u4F9B\u3055\u308C\u307E\u3059\u3002\u975E\u63A8\u5968API\u306F\u4ECA\u5F8C\u306E\u5B9F\u88C5\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
  12.140 +doclet.Help_line_20_with_deprecated_api_link={0}\u30DA\u30FC\u30B8\u306F\u3001\u975E\u63A8\u5968\u306EAPI\u3092\u3059\u3079\u3066\u30EA\u30B9\u30C8\u3057\u307E\u3059\u3002\u975E\u63A8\u5968\u306EAPI\u3068\u306F\u3001\u6A5F\u80FD\u6539\u826F\u306A\u3069\u306E\u7406\u7531\u304B\u3089\u4F7F\u7528\u3092\u304A\u85A6\u3081\u3067\u304D\u306A\u304F\u306A\u3063\u305FAPI\u306E\u3053\u3068\u3067\u3001\u901A\u5E38\u306F\u305D\u308C\u306B\u4EE3\u308F\u308BAPI\u304C\u63D0\u4F9B\u3055\u308C\u307E\u3059\u3002\u975E\u63A8\u5968\u306EAPI\u306F\u4ECA\u5F8C\u306E\u5B9F\u88C5\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
  12.141  doclet.Help_line_21=\u7D22\u5F15
  12.142  doclet.Help_line_22={0}\u306B\u306F\u3001\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3001\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306E\u30EA\u30B9\u30C8\u304C\u542B\u307E\u308C\u307E\u3059\u3002
  12.143  doclet.Help_line_23=\u524D/\u6B21
  12.144 @@ -158,7 +138,7 @@
  12.145  doclet.Help_line_26=\u3053\u308C\u3089\u306E\u30EA\u30F3\u30AF\u306FHTML\u30D5\u30EC\u30FC\u30E0\u306E\u8868\u793A\u3068\u975E\u8868\u793A\u3092\u5207\u308A\u66FF\u3048\u307E\u3059\u3002\u3059\u3079\u3066\u306E\u30DA\u30FC\u30B8\u306F\u30D5\u30EC\u30FC\u30E0\u3042\u308A\u3067\u3082\u3001\u30D5\u30EC\u30FC\u30E0\u306A\u3057\u3067\u3082\u8868\u793A\u3067\u304D\u307E\u3059\u3002
  12.146  doclet.Help_line_27={0}\u30EA\u30F3\u30AF\u306B\u306F\u3001\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9(\u975Estatic\u306E\u30CD\u30B9\u30C8\u3055\u308C\u305F\u578B\u3092\u9664\u304F)\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002
  12.147  doclet.Help_line_28=\u76F4\u5217\u5316\u53EF\u80FD\u307E\u305F\u306F\u5916\u90E8\u5316\u53EF\u80FD\u306A\u5404\u30AF\u30E9\u30B9\u306F\u3001\u76F4\u5217\u5316\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u30E1\u30BD\u30C3\u30C9\u306E\u8AAC\u660E\u3092\u542B\u307F\u307E\u3059\u3002\u3053\u306E\u60C5\u5831\u306F\u3001API\u3092\u4F7F\u7528\u3059\u308B\u958B\u767A\u8005\u3067\u306F\u306A\u304F\u3001\u518D\u5B9F\u88C5\u3092\u884C\u3046\u62C5\u5F53\u8005\u306B\u5F79\u7ACB\u3061\u307E\u3059\u3002\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u30EA\u30F3\u30AF\u304C\u306A\u3044\u5834\u5408\u3001\u76F4\u5217\u5316\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306B\u79FB\u52D5\u3057\u3066\u3001\u30AF\u30E9\u30B9\u8A18\u8FF0\u306E\u300C\u95A2\u9023\u9805\u76EE\u300D\u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u3042\u308B\u300C\u76F4\u5217\u5316\u3055\u308C\u305F\u5F62\u5F0F\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3053\u3068\u306B\u3088\u308A\u3001\u3053\u306E\u60C5\u5831\u3092\u8868\u793A\u3067\u304D\u307E\u3059\u3002
  12.148 -doclet.Help_line_29=<a href="constant-values.html">\u300C\u5B9A\u6570\u30D5\u30A3\u30FC\u30EB\u30C9\u5024\u300D</a> \u30DA\u30FC\u30B8\u306B\u306F\u3001static final\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u305D\u306E\u5024\u306E\u30EA\u30B9\u30C8\u304C\u3042\u308A\u307E\u3059\u3002
  12.149 +doclet.Help_line_29={0}\u30DA\u30FC\u30B8\u306B\u306F\u3001static final\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u305D\u306E\u5024\u306E\u30EA\u30B9\u30C8\u304C\u3042\u308A\u307E\u3059\u3002
  12.150  doclet.Help_line_30=\u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u6A19\u6E96doclet\u3092\u4F7F\u7528\u3057\u3066\u751F\u6210\u3055\u308C\u305FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u9069\u7528\u3055\u308C\u307E\u3059\u3002
  12.151  doclet.Help_enum_line_1=\u5404\u5217\u6319\u578B\u306B\u306F\u3001\u305D\u308C\u81EA\u8EAB\u306E\u500B\u5225\u306E\u30DA\u30FC\u30B8\u3068\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u3059:
  12.152  doclet.Help_enum_line_2=\u5217\u6319\u578B\u306E\u5BA3\u8A00
  12.153 @@ -166,19 +146,6 @@
  12.154  doclet.Help_annotation_type_line_1=\u5404\u6CE8\u91C8\u578B\u306B\u306F\u3001\u305D\u308C\u81EA\u8EAB\u306E\u500B\u5225\u306E\u30DA\u30FC\u30B8\u3068\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u3059:
  12.155  doclet.Help_annotation_type_line_2=\u6CE8\u91C8\u578B\u306E\u5BA3\u8A00
  12.156  doclet.Help_annotation_type_line_3=\u6CE8\u91C8\u578B\u306E\u8AAC\u660E
  12.157 -doclet.Style_line_1=javadoc\u30B9\u30BF\u30A4\u30EB\u30FB\u30B7\u30FC\u30C8
  12.158 -doclet.Style_line_2=\u8272\u3084\u30D5\u30A9\u30F3\u30C8\u306A\u3069\u306E\u30B9\u30BF\u30A4\u30EB\u5C5E\u6027\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\u306B\u306F\u3001\u3053\u3053\u3067\u5B9A\u7FA9\u3057\u307E\u3059
  12.159 -doclet.Style_line_3=\u30DA\u30FC\u30B8\u306E\u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u306E\u8272
  12.160 -doclet.Style_Headings=\u898B\u51FA\u3057
  12.161 -doclet.Style_line_4=\u8868\u306E\u8272
  12.162 -doclet.Style_line_5=\u6FC3\u3044\u85E4\u8272
  12.163 -doclet.Style_line_6=\u8584\u3044\u85E4\u8272
  12.164 -doclet.Style_line_7=\u767D
  12.165 -doclet.Style_line_8=\u5DE6\u5074\u306E\u30D5\u30EC\u30FC\u30E0\u306E\u30EA\u30B9\u30C8\u306B\u4F7F\u7528\u3059\u308B\u30D5\u30A9\u30F3\u30C8
  12.166 -doclet.Style_line_9=\u30D5\u30EC\u30FC\u30E0\u306B\u304A\u3051\u308B\u3001\u3088\u308A\u5C0F\u3055\u3044sans-serif\u30D5\u30A9\u30F3\u30C8\u306E\u4F8B
  12.167 -doclet.Style_line_10=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306E\u30D5\u30A9\u30F3\u30C8\u3068\u8272
  12.168 -doclet.Style_line_11=\u6FC3\u3044\u9752
  12.169 -doclet.Style_line_12=\u8868\u306E\u30AD\u30E3\u30D7\u30B7\u30E7\u30F3\u30FB\u30B9\u30BF\u30A4\u30EB
  12.170  doclet.ClassUse_Packages.that.use.0={0}\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u30D1\u30C3\u30B1\u30FC\u30B8
  12.171  doclet.ClassUse_Uses.of.0.in.1={1}\u3067\u306E{0}\u306E\u4F7F\u7528
  12.172  doclet.ClassUse_Classes.in.0.used.by.1={1}\u306B\u3088\u308A\u4F7F\u7528\u3055\u308C\u308B{0}\u306E\u30AF\u30E9\u30B9
  12.173 @@ -208,13 +175,11 @@
  12.174  doclet.Window_ClassUse_Header={0} {1}\u306E\u4F7F\u7528
  12.175  doclet.ClassUse_Title={0}<br>{1}\u306E\u4F7F\u7528
  12.176  doclet.navClassUse=\u4F7F\u7528
  12.177 -doclet.link_option_twice=\u5916\u90E8URL\u30EA\u30F3\u30AF\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3(link\u307E\u305F\u306Flinkoffline)\u304C2\u56DE\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u3002
  12.178  doclet.Error_in_packagelist=-group\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u4F7F\u7528\u65B9\u6CD5\u306E\u30A8\u30E9\u30FC: {0} {1}
  12.179  doclet.Groupname_already_used=-group\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u304A\u3044\u3066\u3001\u3059\u3067\u306B\u30B0\u30EB\u30FC\u30D7\u540D\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0}
  12.180  doclet.Same_package_name_used=\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\u5F62\u5F0F\u304C2\u56DE\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0}
  12.181 -doclet.Serialization.Excluded_Class=\u5E38\u99D0\u30D5\u30A3\u30FC\u30EB\u30C9{1}\u306F\u3001\u9664\u5916\u3055\u308C\u305F\u30AF\u30E9\u30B9{0}\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
  12.182 -doclet.Serialization.Nonexcluded_Class=\u5E38\u99D0\u30D5\u30A3\u30FC\u30EB\u30C9{1}\u306F\u3001\u975E\u8868\u793A\u306E\u3001\u542B\u307E\u308C\u306A\u3044\u30AF\u30E9\u30B9{0}\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
  12.183 -doclet.usage=\u6A19\u6E96\u306Edoclet\u306B\u3088\u308A\u63D0\u4F9B\u3055\u308C\u308B\u3082\u306E:\n-d <directory>                    \u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u8EE2\u9001\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n-use                             \u30AF\u30E9\u30B9\u3068\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4F7F\u7528\u30DA\u30FC\u30B8\u3092\u4F5C\u6210\u3059\u308B\n-version                          @version\u30D1\u30E9\u30B0\u30E9\u30D5\u3092\u542B\u3081\u308B\n-author                           @author\u30D1\u30E9\u30B0\u30E9\u30D5\u3092\u542B\u3081\u308B\n-docfilessubdirs                  doc-file\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u518D\u5E30\u7684\u306B\u30B3\u30D4\u30FC\u3059\u308B\n-splitindex                       1\u5B57\u3054\u3068\u306B1\u30D5\u30A1\u30A4\u30EB\u306B\u7D22\u5F15\u3092\u5206\u5272\u3059\u308B\n-windowtitle <text>               \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u7528\u306E\u30D6\u30E9\u30A6\u30B6\u30FB\u30A6\u30A3\u30F3\u30C9\u30A6\u30FB\u30BF\u30A4\u30C8\u30EB\n-doctitle <html-code>             \u6982\u8981\u30DA\u30FC\u30B8\u306B\u30BF\u30A4\u30C8\u30EB\u3092\u542B\u3081\u308B\n-header <html-code>               \u5404\u30DA\u30FC\u30B8\u306B\u30D8\u30C3\u30C0\u30FC\u3092\u542B\u3081\u308B\n-footer <html-code>               \u5404\u30DA\u30FC\u30B8\u306B\u30D5\u30C3\u30BF\u30FC\u3092\u542B\u3081\u308B\n-top    <html-code>               \u5404\u30DA\u30FC\u30B8\u306B\u4E0A\u90E8\u30C6\u30AD\u30B9\u30C8\u3092\u542B\u3081\u308B\n-bottom <html-code>               \u5404\u30DA\u30FC\u30B8\u306B\u4E0B\u90E8\u30C6\u30AD\u30B9\u30C8\u3092\u542B\u3081\u308B\n-link <url>                       <url>\u306Bjavadoc\u51FA\u529B\u3078\u306E\u30EA\u30F3\u30AF\u3092\u4F5C\u6210\u3059\u308B\n-linkoffline <url> <url2>         <url2>\u306B\u3042\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30B9\u30C8\u3092\u4F7F\u7528\u3057\u3066<url>\u306Edocs\u306B\u30EA\u30F3\u30AF\u3059\u308B\n-excludedocfilessubdir <name1>:.. \u6307\u5B9A\u3055\u308C\u305F\u540D\u524D\u306Edoc-files\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u3059\u3079\u3066\u9664\u5916\u3059\u308B\n-group <name> <p1>:<p2>..         \u6307\u5B9A\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u6982\u8981\u30DA\u30FC\u30B8\u306B\u304A\u3044\u3066\u30B0\u30EB\u30FC\u30D7\u5316\u3059\u308B\n-nocomment                        \u8A18\u8FF0\u304A\u3088\u3073\u30BF\u30B0\u3092\u6291\u5236\u3057\u3066\u5BA3\u8A00\u306E\u307F\u3092\u751F\u6210\u3059\u308B\n-nodeprecated                     @deprecated\u60C5\u5831\u3092\u9664\u5916\u3059\u308B\n-noqualifier <name1>:<name2>:...  \u51FA\u529B\u304B\u3089\u4FEE\u98FE\u5B50\u306E\u30EA\u30B9\u30C8\u3092\u9664\u5916\u3059\u308B\n-nosince                          @since\u60C5\u5831\u3092\u9664\u5916\u3059\u308B\n-notimestamp                      \u975E\u8868\u793A\u306E\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u3092\u9664\u5916\u3059\u308B\n-nodeprecatedlist                 \u975E\u63A8\u5968\u306E\u30EA\u30B9\u30C8\u3092\u751F\u6210\u3057\u306A\u3044\n-notree                           \u30AF\u30E9\u30B9\u968E\u5C64\u3092\u751F\u6210\u3057\u306A\u3044\n-noindex                          \u7D22\u5F15\u3092\u751F\u6210\u3057\u306A\u3044\n-nohelp                           \u30D8\u30EB\u30D7\u30FB\u30EA\u30F3\u30AF\u3092\u751F\u6210\u3057\u306A\u3044\n-nonavbar                         \u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u3092\u751F\u6210\u3057\u306A\u3044\n-serialwarn                       @serial\u30BF\u30B0\u306B\u95A2\u3059\u308B\u8B66\u544A\u3092\u751F\u6210\u3059\u308B\n-tag <name>:<locations>:<header>  \u5358\u4E00\u306E\u5F15\u6570\u3092\u6301\u3064\u30AB\u30B9\u30BF\u30E0\u30FB\u30BF\u30B0\u3092\u6307\u5B9A\u3059\u308B\n-taglet                           \u30BF\u30B0\u30EC\u30C3\u30C8\u306E\u5B8C\u5168\u4FEE\u98FE\u540D\u3092\u767B\u9332\u3059\u308B\n-tagletpath                       \u30BF\u30B0\u30EC\u30C3\u30C8\u306E\u30D1\u30B9\n-charset <charset>                \u751F\u6210\u3055\u308C\u308B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30AF\u30ED\u30B9\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u306E\u6587\u5B57\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\n-helpfile <file>                  \u30D8\u30EB\u30D7\u30FB\u30EA\u30F3\u30AF\u306E\u30EA\u30F3\u30AF\u5148\u30D5\u30A1\u30A4\u30EB\u3092\u542B\u3081\u308B\n-linksource                       HTML\u5F62\u5F0F\u3067\u30BD\u30FC\u30B9\u3092\u751F\u6210\u3059\u308B\n-sourcetab <tab length>           \u30BD\u30FC\u30B9\u5185\u306E\u30BF\u30D6\u306E\u7A7A\u767D\u6587\u5B57\u306E\u6570\u3092\u6307\u5B9A\u3059\u308B\n-keywords                         HTML\u306Emeta\u30BF\u30B0\u306B\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u60C5\u5831\u3092\u542B\u3081\u308B\n-stylesheetfile <path>            \u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30B9\u30BF\u30A4\u30EB\u5909\u66F4\u7528\u30D5\u30A1\u30A4\u30EB\n-docencoding <name>               \u51FA\u529B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u540D
  12.184 +doclet.exception_encountered={1}\u306E\u51E6\u7406\u4E2D\u306B\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\n{0}
  12.185 +doclet.usage=\u6A19\u6E96\u306Edoclet\u306B\u3088\u308A\u63D0\u4F9B\u3055\u308C\u308B\u3082\u306E:\n-d <directory>                    \u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u8EE2\u9001\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n-use                              \u30AF\u30E9\u30B9\u3068\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4F7F\u7528\u30DA\u30FC\u30B8\u3092\u4F5C\u6210\u3059\u308B\n-version                          @version\u30D1\u30E9\u30B0\u30E9\u30D5\u3092\u542B\u3081\u308B\n-author                           @author\u30D1\u30E9\u30B0\u30E9\u30D5\u3092\u542B\u3081\u308B\n-docfilessubdirs                  doc-file\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u518D\u5E30\u7684\u306B\u30B3\u30D4\u30FC\u3059\u308B\n-splitindex                       1\u5B57\u3054\u3068\u306B1\u30D5\u30A1\u30A4\u30EB\u306B\u7D22\u5F15\u3092\u5206\u5272\u3059\u308B\n-windowtitle <text>               \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u7528\u306E\u30D6\u30E9\u30A6\u30B6\u30FB\u30A6\u30A3\u30F3\u30C9\u30A6\u30FB\u30BF\u30A4\u30C8\u30EB\n-doctitle <html-code>             \u6982\u8981\u30DA\u30FC\u30B8\u306B\u30BF\u30A4\u30C8\u30EB\u3092\u542B\u3081\u308B\n-header <html-code>               \u5404\u30DA\u30FC\u30B8\u306B\u30D8\u30C3\u30C0\u30FC\u3092\u542B\u3081\u308B\n-footer <html-code>               \u5404\u30DA\u30FC\u30B8\u306B\u30D5\u30C3\u30BF\u30FC\u3092\u542B\u3081\u308B\n-top    <html-code>               \u5404\u30DA\u30FC\u30B8\u306B\u4E0A\u90E8\u30C6\u30AD\u30B9\u30C8\u3092\u542B\u3081\u308B\n-bottom <html-code>               \u5404\u30DA\u30FC\u30B8\u306B\u4E0B\u90E8\u30C6\u30AD\u30B9\u30C8\u3092\u542B\u3081\u308B\n-link <url>                       <url>\u306Bjavadoc\u51FA\u529B\u3078\u306E\u30EA\u30F3\u30AF\u3092\u4F5C\u6210\u3059\u308B\n-linkoffline <url> <url2>         <url2>\u306B\u3042\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30B9\u30C8\u3092\u4F7F\u7528\u3057\u3066<url>\u306Edocs\u306B\u30EA\u30F3\u30AF\u3059\u308B\n-excludedocfilessubdir <name1>:.. \u6307\u5B9A\u3055\u308C\u305F\u540D\u524D\u306Edoc-files\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u3059\u3079\u3066\u9664\u5916\u3059\u308B\n-group <name> <p1>:<p2>..         \u6307\u5B9A\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u6982\u8981\u30DA\u30FC\u30B8\u306B\u304A\u3044\u3066\u30B0\u30EB\u30FC\u30D7\u5316\u3059\u308B\n-nocomment                        \u8A18\u8FF0\u304A\u3088\u3073\u30BF\u30B0\u3092\u6291\u5236\u3057\u3066\u5BA3\u8A00\u306E\u307F\u3092\u751F\u6210\u3059\u308B\n-nodeprecated                     @deprecated\u60C5\u5831\u3092\u9664\u5916\u3059\u308B\n-noqualifier <name1>:<name2>:...  \u51FA\u529B\u304B\u3089\u4FEE\u98FE\u5B50\u306E\u30EA\u30B9\u30C8\u3092\u9664\u5916\u3059\u308B\n-nosince                          @since\u60C5\u5831\u3092\u9664\u5916\u3059\u308B\n-notimestamp                      \u975E\u8868\u793A\u306E\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u3092\u9664\u5916\u3059\u308B\n-nodeprecatedlist                 \u975E\u63A8\u5968\u306E\u30EA\u30B9\u30C8\u3092\u751F\u6210\u3057\u306A\u3044\n-notree                           \u30AF\u30E9\u30B9\u968E\u5C64\u3092\u751F\u6210\u3057\u306A\u3044\n-noindex                          \u7D22\u5F15\u3092\u751F\u6210\u3057\u306A\u3044\n-nohelp                           \u30D8\u30EB\u30D7\u30FB\u30EA\u30F3\u30AF\u3092\u751F\u6210\u3057\u306A\u3044\n-nonavbar                         \u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u3092\u751F\u6210\u3057\u306A\u3044\n-serialwarn                       @serial\u30BF\u30B0\u306B\u95A2\u3059\u308B\u8B66\u544A\u3092\u751F\u6210\u3059\u308B\n-tag <name>:<locations>:<header>  \u5358\u4E00\u306E\u5F15\u6570\u3092\u6301\u3064\u30AB\u30B9\u30BF\u30E0\u30FB\u30BF\u30B0\u3092\u6307\u5B9A\u3059\u308B\n-taglet                           \u30BF\u30B0\u30EC\u30C3\u30C8\u306E\u5B8C\u5168\u4FEE\u98FE\u540D\u3092\u767B\u9332\u3059\u308B\n-tagletpath                       \u30BF\u30B0\u30EC\u30C3\u30C8\u306E\u30D1\u30B9\n-Xdocrootparent <url>             \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30B3\u30E1\u30F3\u30C8\u5185\u306E@docRoot(\u3053\u306E\u5F8C\u306B\u306F/..\u304C\u7D9A\u304F)\u306E\u3059\u3079\u3066\u306E\u51FA\u73FE\u7B87\u6240\u3092<url>\u3067\u7F6E\u63DB\u3059\u308B\n-charset <charset>                \u751F\u6210\u3055\u308C\u308B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30AF\u30ED\u30B9\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u306E\u6587\u5B57\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\n-helpfile <file>                  \u30D8\u30EB\u30D7\u30FB\u30EA\u30F3\u30AF\u306E\u30EA\u30F3\u30AF\u5148\u30D5\u30A1\u30A4\u30EB\u3092\u542B\u3081\u308B\n-linksource                       HTML\u5F62\u5F0F\u3067\u30BD\u30FC\u30B9\u3092\u751F\u6210\u3059\u308B\n-sourcetab <tab length>           \u30BD\u30FC\u30B9\u5185\u306E\u30BF\u30D6\u306E\u7A7A\u767D\u6587\u5B57\u306E\u6570\u3092\u6307\u5B9A\u3059\u308B\n-keywords                         HTML\u306Emeta\u30BF\u30B0\u306B\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u60C5\u5831\u3092\u542B\u3081\u308B\n-stylesheetfile <path>            \u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30B9\u30BF\u30A4\u30EB\u5909\u66F4\u7528\u30D5\u30A1\u30A4\u30EB\n-docencoding <name>               \u51FA\u529B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u540D
  12.186  
  12.187  
  12.188  

    13.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties	Thu Mar 28 10:55:14 2013 -0700
    13.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties	Mon Apr 01 21:42:15 2013 -0700
    13.3 @@ -41,33 +41,23 @@
    13.4  doclet.Help=\u5E2E\u52A9
    13.5  doclet.Skip_navigation_links=\u8DF3\u8FC7\u5BFC\u822A\u94FE\u63A5
    13.6  doclet.New_Page=NewPage
    13.7 -doclet.None=\u65E0
    13.8 -doclet.Factory_Method_Detail=\u9759\u6001\u5DE5\u5382\u65B9\u6CD5\u8BE6\u7EC6\u8D44\u6599
    13.9  doclet.navDeprecated=\u5DF2\u8FC7\u65F6
   13.10 -doclet.Deprecated_List=\u5DF2\u8FC7\u65F6\u7684\u5217\u8868
   13.11  doclet.Window_Deprecated_List=\u5DF2\u8FC7\u65F6\u7684\u5217\u8868
   13.12 -doclet.Note_0_is_deprecated=\u6CE8: {0}\u5DF2\u8FC7\u65F6\u3002
   13.13  doclet.Overrides=\u8986\u76D6:
   13.14  doclet.in_class=\u5728\u7C7B\u4E2D
   13.15 -doclet.0_Fields_and_Methods="{0}" \u5B57\u6BB5\u548C\u65B9\u6CD5
   13.16 -doclet.Index_of_Fields_and_Methods=\u5B57\u6BB5\u548C\u65B9\u6CD5\u7684\u7D22\u5F15
   13.17  doclet.Static_variable_in={0}\u4E2D\u7684\u9759\u6001\u53D8\u91CF
   13.18  doclet.Variable_in={0}\u4E2D\u7684\u53D8\u91CF
   13.19  doclet.Constructor_for={0}\u7684\u6784\u9020\u5668
   13.20  doclet.Static_method_in={0}\u4E2D\u7684\u9759\u6001\u65B9\u6CD5
   13.21  doclet.Method_in={0}\u4E2D\u7684\u65B9\u6CD5
   13.22 -doclet.throws=\u629B\u51FA
   13.23  doclet.package=\u7A0B\u5E8F\u5305
   13.24  doclet.MalformedURL=\u683C\u5F0F\u9519\u8BEF\u7684 URL: {0}
   13.25  doclet.File_error=\u8BFB\u53D6\u6587\u4EF6\u65F6\u51FA\u9519: {0}
   13.26  doclet.URL_error=\u83B7\u53D6 URL \u65F6\u51FA\u9519: {0}
   13.27 -doclet.No_Package_Comment_File=\u5BF9\u4E8E\u7A0B\u5E8F\u5305{0}, \u627E\u4E0D\u5230 Package.Comment \u6587\u4EF6
   13.28 -doclet.No_Source_For_Class=\u7C7B{0}\u7684\u6E90\u4FE1\u606F\u4E0D\u53EF\u7528\u3002
   13.29  doclet.see.class_or_package_not_found=\u6807\u8BB0{0}: \u627E\u4E0D\u5230\u5F15\u7528: {1}
   13.30  doclet.see.class_or_package_not_accessible=\u6807\u8BB0{0}: \u65E0\u6CD5\u8BBF\u95EE\u5F15\u7528: {1}
   13.31 -doclet.see.malformed_tag=\u6807\u8BB0{0}: \u683C\u5F0F\u9519\u8BEF: {1}
   13.32 -doclet.Inherited_API_Summary=\u7EE7\u627F\u7684 API \u6982\u8981
   13.33  doclet.Deprecated_API=\u5DF2\u8FC7\u65F6\u7684 API
   13.34 +doclet.Deprecated_Packages=\u5DF2\u8FC7\u65F6\u7A0B\u5E8F\u5305
   13.35  doclet.Deprecated_Classes=\u5DF2\u8FC7\u65F6\u7684\u7C7B
   13.36  doclet.Deprecated_Enums=\u5DF2\u8FC7\u65F6\u7684\u679A\u4E3E
   13.37  doclet.Deprecated_Interfaces=\u5DF2\u8FC7\u65F6\u7684\u63A5\u53E3
   13.38 @@ -79,6 +69,7 @@
   13.39  doclet.Deprecated_Methods=\u5DF2\u8FC7\u65F6\u7684\u65B9\u6CD5
   13.40  doclet.Deprecated_Enum_Constants=\u5DF2\u8FC7\u65F6\u7684\u679A\u4E3E\u5E38\u91CF
   13.41  doclet.Deprecated_Annotation_Type_Members=\u5DF2\u8FC7\u65F6\u7684\u6CE8\u91CA\u7C7B\u578B\u5143\u7D20
   13.42 +doclet.deprecated_packages=\u5DF2\u8FC7\u65F6\u7A0B\u5E8F\u5305
   13.43  doclet.deprecated_classes=\u5DF2\u8FC7\u65F6\u7684\u7C7B
   13.44  doclet.deprecated_enums=\u5DF2\u8FC7\u65F6\u7684\u679A\u4E3E
   13.45  doclet.deprecated_interfaces=\u5DF2\u8FC7\u65F6\u7684\u63A5\u53E3
   13.46 @@ -90,10 +81,7 @@
   13.47  doclet.deprecated_methods=\u5DF2\u8FC7\u65F6\u7684\u65B9\u6CD5
   13.48  doclet.deprecated_enum_constants=\u5DF2\u8FC7\u65F6\u7684\u679A\u4E3E\u5E38\u91CF
   13.49  doclet.deprecated_annotation_type_members=\u5DF2\u8FC7\u65F6\u7684\u6CE8\u91CA\u7C7B\u578B\u5143\u7D20
   13.50 -doclet.Frame_Output=\u6846\u67B6\u8F93\u51FA
   13.51 -doclet.Docs_generated_by_Javadoc=\u7531 Javadoc \u751F\u6210\u7684\u6587\u6863\u3002
   13.52  doclet.Generated_Docs_Untitled=\u751F\u6210\u7684\u6587\u6863 (\u65E0\u6807\u9898)
   13.53 -doclet.Blank=\u7A7A\u767D
   13.54  doclet.Other_Packages=\u5176\u4ED6\u7A0B\u5E8F\u5305
   13.55  doclet.Package_Description=\u7A0B\u5E8F\u5305{0}\u7684\u8BF4\u660E
   13.56  doclet.Description=\u8BF4\u660E
   13.57 @@ -102,33 +90,25 @@
   13.58  doclet.Subclasses=\u76F4\u63A5\u5DF2\u77E5\u5B50\u7C7B:
   13.59  doclet.Subinterfaces=\u6240\u6709\u5DF2\u77E5\u5B50\u63A5\u53E3:
   13.60  doclet.Implementing_Classes=\u6240\u6709\u5DF2\u77E5\u5B9E\u73B0\u7C7B:
   13.61 +doclet.Functional_Interface=\u51FD\u6570\u63A5\u53E3:
   13.62 +doclet.Functional_Interface_Message=\u8FD9\u662F\u4E00\u4E2A\u51FD\u6570\u63A5\u53E3, \u56E0\u6B64\u53EF\u7528\u4F5C lambda \u8868\u8FBE\u5F0F\u6216\u65B9\u6CD5\u5F15\u7528\u7684\u8D4B\u503C\u76EE\u6807\u3002
   13.63  doclet.also=\u5E76
   13.64 -doclet.Option=\u9009\u9879
   13.65 -doclet.Or=\u6216
   13.66  doclet.Frames=\u6846\u67B6
   13.67  doclet.No_Frames=\u65E0\u6846\u67B6
   13.68  doclet.Package_Hierarchies=\u7A0B\u5E8F\u5305\u5206\u5C42\u7ED3\u6784:
   13.69  doclet.Hierarchy_For_Package=\u7A0B\u5E8F\u5305{0}\u7684\u5206\u5C42\u7ED3\u6784
   13.70 -doclet.Source_Code=\u6E90\u4EE3\u7801:
   13.71  doclet.Hierarchy_For_All_Packages=\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784
   13.72 -doclet.Cannot_handle_no_packages=\u65E0\u6CD5\u5904\u7406\u6CA1\u6709\u7A0B\u5E8F\u5305\u7684\u60C5\u51B5\u3002
   13.73  doclet.Frame_Alert=\u6846\u67B6\u9884\u8B66
   13.74 -doclet.Overview-Member-Frame=\u6210\u5458\u6846\u67B6\u6982\u89C8
   13.75  doclet.Frame_Warning_Message=\u8BF7\u4F7F\u7528\u6846\u67B6\u529F\u80FD\u67E5\u770B\u6B64\u6587\u6863\u3002\u5982\u679C\u770B\u5230\u6B64\u6D88\u606F, \u5219\u8868\u660E\u60A8\u4F7F\u7528\u7684\u662F\u4E0D\u652F\u6301\u6846\u67B6\u7684 Web \u5BA2\u6237\u673A\u3002\u94FE\u63A5\u5230{0}\u3002
   13.76  doclet.No_Script_Message=\u60A8\u7684\u6D4F\u89C8\u5668\u5DF2\u7981\u7528 JavaScript\u3002
   13.77  doclet.Non_Frame_Version=\u975E\u6846\u67B6\u7248\u672C
   13.78 -doclet.Frame_Version=\u6846\u67B6\u7248\u672C
   13.79 -doclet.Following_From_Class=\u4EE5\u4E0B\u5185\u5BB9\u662F\u4ECE\u7C7B{0}\u590D\u5236\u7684
   13.80 -doclet.Following_From_Interface=\u4EE5\u4E0B\u5185\u5BB9\u662F\u4ECE\u63A5\u53E3{0}\u590D\u5236\u7684
   13.81  doclet.Description_From_Interface=\u4ECE\u63A5\u53E3\u590D\u5236\u7684\u8BF4\u660E:
   13.82  doclet.Description_From_Class=\u4ECE\u7C7B\u590D\u5236\u7684\u8BF4\u660E:
   13.83 -doclet.Standard_doclet_invoked=\u5DF2\u8C03\u7528\u7684\u6807\u51C6 doclet...
   13.84  doclet.No_Non_Deprecated_Classes_To_Document=\u627E\u4E0D\u5230\u53EF\u4EE5\u6587\u6863\u5316\u7684\u672A\u8FC7\u65F6\u7684\u7C7B\u3002
   13.85  doclet.Interfaces_Italic=\u63A5\u53E3 (\u659C\u4F53)
   13.86  doclet.Enclosing_Class=\u5C01\u95ED\u7C7B:
   13.87  doclet.Enclosing_Interface=\u5C01\u95ED\u63A5\u53E3:
   13.88  doclet.Window_Source_title=\u6E90\u4EE3\u7801
   13.89 -doclet.Help_title=API \u5E2E\u52A9
   13.90  doclet.Window_Help_title=API \u5E2E\u52A9
   13.91  doclet.Help_line_1=\u6B64 API \u6587\u6863\u7684\u7EC4\u7EC7\u65B9\u5F0F
   13.92  doclet.Help_line_2=\u6B64 API (\u5E94\u7528\u7A0B\u5E8F\u7F16\u7A0B\u63A5\u53E3) \u6587\u6863\u5305\u542B\u5BF9\u5E94\u4E8E\u5BFC\u822A\u680F\u4E2D\u7684\u9879\u76EE\u7684\u9875\u9762, \u5982\u4E0B\u6240\u8FF0\u3002
   13.93 @@ -158,7 +138,7 @@
   13.94  doclet.Help_line_26=\u8FD9\u4E9B\u94FE\u63A5\u7528\u4E8E\u663E\u793A\u548C\u9690\u85CF HTML \u6846\u67B6\u3002\u6240\u6709\u9875\u9762\u5747\u5177\u6709\u6709\u6846\u67B6\u548C\u65E0\u6846\u67B6\u4E24\u79CD\u663E\u793A\u65B9\u5F0F\u3002
   13.95  doclet.Help_line_27={0}\u94FE\u63A5\u663E\u793A\u6240\u6709\u7C7B\u548C\u63A5\u53E3 (\u9664\u4E86\u975E\u9759\u6001\u5D4C\u5957\u7C7B\u578B)\u3002
   13.96  doclet.Help_line_28=\u6BCF\u4E2A\u53EF\u5E8F\u5217\u5316\u6216\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u90FD\u6709\u5176\u5E8F\u5217\u5316\u5B57\u6BB5\u548C\u65B9\u6CD5\u7684\u8BF4\u660E\u3002\u6B64\u4FE1\u606F\u5BF9\u91CD\u65B0\u5B9E\u73B0\u8005\u6709\u7528, \u800C\u5BF9\u4F7F\u7528 API \u7684\u5F00\u53D1\u8005\u5219\u6CA1\u6709\u4EC0\u4E48\u7528\u5904\u3002\u5C3D\u7BA1\u5BFC\u822A\u680F\u4E2D\u6CA1\u6709\u94FE\u63A5, \u4F46\u60A8\u53EF\u4EE5\u901A\u8FC7\u4E0B\u5217\u65B9\u5F0F\u83B7\u53D6\u6B64\u4FE1\u606F: \u8F6C\u81F3\u4EFB\u4F55\u5E8F\u5217\u5316\u7C7B, \u7136\u540E\u5355\u51FB\u7C7B\u8BF4\u660E\u7684 "\u53E6\u8BF7\u53C2\u9605" \u90E8\u5206\u4E2D\u7684 "\u5E8F\u5217\u5316\u8868\u683C"\u3002
   13.97 -doclet.Help_line_29=<a href="constant-values.html">\u5E38\u91CF\u5B57\u6BB5\u503C</a>\u9875\u9762\u5217\u51FA\u4E86\u9759\u6001\u6700\u7EC8\u5B57\u6BB5\u53CA\u5176\u503C\u3002
   13.98 +doclet.Help_line_29={0}\u9875\u9762\u5217\u51FA\u4E86\u9759\u6001\u6700\u7EC8\u5B57\u6BB5\u53CA\u5176\u503C\u3002
   13.99  doclet.Help_line_30=\u6B64\u5E2E\u52A9\u6587\u4EF6\u9002\u7528\u4E8E\u4F7F\u7528\u6807\u51C6 doclet \u751F\u6210\u7684 API \u6587\u6863\u3002
  13.100  doclet.Help_enum_line_1=\u6BCF\u4E2A\u679A\u4E3E\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762, \u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206:
  13.101  doclet.Help_enum_line_2=\u679A\u4E3E\u58F0\u660E
  13.102 @@ -166,19 +146,6 @@
  13.103  doclet.Help_annotation_type_line_1=\u6BCF\u4E2A\u6CE8\u91CA\u7C7B\u578B\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762, \u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206:
  13.104  doclet.Help_annotation_type_line_2=\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E
  13.105  doclet.Help_annotation_type_line_3=\u6CE8\u91CA\u7C7B\u578B\u8BF4\u660E
  13.106 -doclet.Style_line_1=Javadoc \u6837\u5F0F\u8868
  13.107 -doclet.Style_line_2=\u5728\u6B64\u5904\u5B9A\u4E49\u989C\u8272, \u5B57\u4F53\u548C\u5176\u4ED6\u6837\u5F0F\u5C5E\u6027\u4EE5\u8986\u76D6\u9ED8\u8BA4\u503C
  13.108 -doclet.Style_line_3=\u9875\u9762\u80CC\u666F\u989C\u8272
  13.109 -doclet.Style_Headings=\u6807\u9898
  13.110 -doclet.Style_line_4=\u8868\u683C\u989C\u8272
  13.111 -doclet.Style_line_5=\u6DF1\u7D2B\u8272
  13.112 -doclet.Style_line_6=\u6DE1\u7D2B\u8272
  13.113 -doclet.Style_line_7=\u767D\u8272
  13.114 -doclet.Style_line_8=\u5DE6\u4FA7\u7684\u6846\u67B6\u5217\u8868\u4E2D\u4F7F\u7528\u7684\u5B57\u4F53
  13.115 -doclet.Style_line_9=\u6846\u67B6\u4E2D\u5C0F\u53F7 sans-serif \u5B57\u4F53\u7684\u793A\u4F8B
  13.116 -doclet.Style_line_10=\u5BFC\u822A\u680F\u5B57\u4F53\u548C\u989C\u8272
  13.117 -doclet.Style_line_11=\u6DF1\u84DD\u8272
  13.118 -doclet.Style_line_12=\u8868\u6807\u9898\u6837\u5F0F
  13.119  doclet.ClassUse_Packages.that.use.0=\u4F7F\u7528{0}\u7684\u7A0B\u5E8F\u5305
  13.120  doclet.ClassUse_Uses.of.0.in.1={1}\u4E2D{0}\u7684\u4F7F\u7528
  13.121  doclet.ClassUse_Classes.in.0.used.by.1={1}\u4F7F\u7528\u7684{0}\u4E2D\u7684\u7C7B
  13.122 @@ -208,13 +175,11 @@
  13.123  doclet.Window_ClassUse_Header={0} {1}\u7684\u4F7F\u7528
  13.124  doclet.ClassUse_Title={0} {1}<br>\u7684\u4F7F\u7528
  13.125  doclet.navClassUse=\u4F7F\u7528
  13.126 -doclet.link_option_twice=\u5916\u90E8 URL \u94FE\u63A5\u9009\u9879 (link \u6216 linkoffline) \u4F7F\u7528\u4E86\u4E24\u6B21\u3002
  13.127  doclet.Error_in_packagelist=\u4F7F\u7528 -group \u9009\u9879\u65F6\u51FA\u9519: {0} {1}
  13.128  doclet.Groupname_already_used=\u5728 -group \u9009\u9879\u4E2D, groupname \u5DF2\u4F7F\u7528: {0}
  13.129  doclet.Same_package_name_used=\u7A0B\u5E8F\u5305\u540D\u79F0\u5F62\u5F0F\u4F7F\u7528\u4E86\u4E24\u6B21: {0}
  13.130 -doclet.Serialization.Excluded_Class=\u975E\u77AC\u6001\u5B57\u6BB5{1}\u4F7F\u7528\u4E86\u6392\u9664\u7684\u7C7B{0}\u3002
  13.131 -doclet.Serialization.Nonexcluded_Class=\u975E\u77AC\u6001\u5B57\u6BB5{1}\u4F7F\u7528\u4E86\u9690\u85CF\u7684, \u672A\u5305\u542B\u7684\u7C7B{0}\u3002
  13.132 -doclet.usage=\u901A\u8FC7\u6807\u51C6 doclet \u63D0\u4F9B:\n-d <directory>                    \u8F93\u51FA\u6587\u4EF6\u7684\u76EE\u6807\u76EE\u5F55\n-use                              \u521B\u5EFA\u7C7B\u548C\u7A0B\u5E8F\u5305\u7528\u6CD5\u9875\u9762\n-version                          \u5305\u542B @version \u6BB5\n-author                           \u5305\u542B @author \u6BB5\n-docfilessubdirs                  \u9012\u5F52\u590D\u5236\u6587\u6863\u6587\u4EF6\u5B50\u76EE\u5F55\n-splitindex                       \u5C06\u7D22\u5F15\u5206\u4E3A\u6BCF\u4E2A\u5B57\u6BCD\u5BF9\u5E94\u4E00\u4E2A\u6587\u4EF6\n-windowtitle <text>               \u6587\u6863\u7684\u6D4F\u89C8\u5668\u7A97\u53E3\u6807\u9898\n-doctitle <html-code>             \u5305\u542B\u6982\u89C8\u9875\u9762\u7684\u6807\u9898\n-header <html-code>               \u5305\u542B\u6BCF\u4E2A\u9875\u9762\u7684\u9875\u7709\u6587\u672C\n-footer <html-code>               \u5305\u542B\u6BCF\u4E2A\u9875\u9762\u7684\u9875\u811A\u6587\u672C\n-top    <html-code>               \u5305\u542B\u6BCF\u4E2A\u9875\u9762\u7684\u9876\u90E8\u6587\u672C\n-bottom <html-code>               \u5305\u542B\u6BCF\u4E2A\u9875\u9762\u7684\u5E95\u90E8\u6587\u672C\n-link <url>                       \u521B\u5EFA\u6307\u5411\u4F4D\u4E8E <url> \u7684 javadoc \u8F93\u51FA\u7684\u94FE\u63A5\n-linkoffline <url> <url2>         \u5229\u7528\u4F4D\u4E8E <url2> \u7684\u7A0B\u5E8F\u5305\u5217\u8868\u94FE\u63A5\u81F3\u4F4D\u4E8E <url> \u7684\u6587\u6863\n-excludedocfilessubdir <name1>:..\u6392\u9664\u5177\u6709\u7ED9\u5B9A\u540D\u79F0\u7684\u6240\u6709\u6587\u6863\u6587\u4EF6\u5B50\u76EE\u5F55\u3002\n-group <name> <p1>:<p2>..\u5728\u6982\u89C8\u9875\u9762\u4E2D, \u5C06\u6307\u5B9A\u7684\u7A0B\u5E8F\u5305\u5206\u7EC4\n-nocomment                        \u4E0D\u751F\u6210\u8BF4\u660E\u548C\u6807\u8BB0, \u53EA\u751F\u6210\u58F0\u660E\u3002\n-nodeprecated                     \u4E0D\u5305\u542B @deprecated \u4FE1\u606F\n-noqualifier <name1>:<name2>:...\u8F93\u51FA\u4E2D\u4E0D\u5305\u62EC\u6307\u5B9A\u9650\u5B9A\u7B26\u7684\u5217\u8868\u3002\n-nosince                          \u4E0D\u5305\u542B @since \u4FE1\u606F\n-notimestamp                      \u4E0D\u5305\u542B\u9690\u85CF\u65F6\u95F4\u6233\n-nodeprecatedlist                 \u4E0D\u751F\u6210\u5DF2\u8FC7\u65F6\u7684\u5217\u8868\n-notree                           \u4E0D\u751F\u6210\u7C7B\u5206\u5C42\u7ED3\u6784\n-noindex                          \u4E0D\u751F\u6210\u7D22\u5F15\n-nohelp                           \u4E0D\u751F\u6210\u5E2E\u52A9\u94FE\u63A5\n-nonavbar                         \u4E0D\u751F\u6210\u5BFC\u822A\u680F\n-serialwarn                       \u751F\u6210\u6709\u5173 @serial \u6807\u8BB0\u7684\u8B66\u544A\n-tag <name>:<locations>:<header>  \u6307\u5B9A\u5355\u4E2A\u53C2\u6570\u5B9A\u5236\u6807\u8BB0\n-taglet                           \u8981\u6CE8\u518C\u7684 Taglet \u7684\u5168\u9650\u5B9A\u540D\u79F0\n-tagletpath                       Taglet \u7684\u8DEF\u5F84\n-charset <charset>                \u7528\u4E8E\u8DE8\u5E73\u53F0\u67E5\u770B\u751F\u6210\u7684\u6587\u6863\u7684\u5B57\u7B26\u96C6\u3002\n-helpfile <file>                  \u5305\u542B\u5E2E\u52A9\u94FE\u63A5\u6240\u94FE\u63A5\u5230\u7684\u6587\u4EF6\n-linksource                       \u4EE5 HTML \u683C\u5F0F\u751F\u6210\u6E90\u6587\u4EF6\n-sourcetab <tab length>           \u6307\u5B9A\u6E90\u4E2D\u6BCF\u4E2A\u5236\u8868\u7B26\u5360\u636E\u7684\u7A7A\u683C\u6570\n-keywords                         \u4F7F\u7A0B\u5E8F\u5305, \u7C7B\u548C\u6210\u5458\u4FE1\u606F\u9644\u5E26 HTML \u5143\u6807\u8BB0\n-stylesheetfile <path>            \u7528\u4E8E\u66F4\u6539\u751F\u6210\u6587\u6863\u7684\u6837\u5F0F\u7684\u6587\u4EF6\n-docencoding <name>               \u8F93\u51FA\u7F16\u7801\u540D\u79F0
  13.133 +doclet.exception_encountered=\u5904\u7406{1}\u65F6\u51FA\u73B0\u5F02\u5E38\u9519\u8BEF\n{0}
  13.134 +doclet.usage=\u901A\u8FC7\u6807\u51C6 doclet \u63D0\u4F9B:\n-d <directory>                    \u8F93\u51FA\u6587\u4EF6\u7684\u76EE\u6807\u76EE\u5F55\n-use                              \u521B\u5EFA\u7C7B\u548C\u7A0B\u5E8F\u5305\u7528\u6CD5\u9875\u9762\n-version                          \u5305\u542B @version \u6BB5\n-author                           \u5305\u542B @author \u6BB5\n-docfilessubdirs                  \u9012\u5F52\u590D\u5236\u6587\u6863\u6587\u4EF6\u5B50\u76EE\u5F55\n-splitindex                       \u5C06\u7D22\u5F15\u5206\u4E3A\u6BCF\u4E2A\u5B57\u6BCD\u5BF9\u5E94\u4E00\u4E2A\u6587\u4EF6\n-windowtitle <text>               \u6587\u6863\u7684\u6D4F\u89C8\u5668\u7A97\u53E3\u6807\u9898\n-doctitle <html-code>             \u5305\u542B\u6982\u89C8\u9875\u9762\u7684\u6807\u9898\n-header <html-code>               \u5305\u542B\u6BCF\u4E2A\u9875\u9762\u7684\u9875\u7709\u6587\u672C\n-footer <html-code>               \u5305\u542B\u6BCF\u4E2A\u9875\u9762\u7684\u9875\u811A\u6587\u672C\n-top    <html-code>               \u5305\u542B\u6BCF\u4E2A\u9875\u9762\u7684\u9876\u90E8\u6587\u672C\n-bottom <html-code>               \u5305\u542B\u6BCF\u4E2A\u9875\u9762\u7684\u5E95\u90E8\u6587\u672C\n-link <url>                       \u521B\u5EFA\u6307\u5411\u4F4D\u4E8E <url> \u7684 javadoc \u8F93\u51FA\u7684\u94FE\u63A5\n-linkoffline <url> <url2>         \u5229\u7528\u4F4D\u4E8E <url2> \u7684\u7A0B\u5E8F\u5305\u5217\u8868\u94FE\u63A5\u81F3\u4F4D\u4E8E <url> \u7684\u6587\u6863\n-excludedocfilessubdir <name1>:.. \u6392\u9664\u5177\u6709\u7ED9\u5B9A\u540D\u79F0\u7684\u6240\u6709\u6587\u6863\u6587\u4EF6\u5B50\u76EE\u5F55\u3002\n-group <name> <p1>:<p2>..         \u5728\u6982\u89C8\u9875\u9762\u4E2D, \u5C06\u6307\u5B9A\u7684\u7A0B\u5E8F\u5305\u5206\u7EC4\n-nocomment                        \u4E0D\u751F\u6210\u8BF4\u660E\u548C\u6807\u8BB0, \u53EA\u751F\u6210\u58F0\u660E\u3002\n-nodeprecated                     \u4E0D\u5305\u542B @deprecated \u4FE1\u606F\n-noqualifier <name1>:<name2>:...  \u8F93\u51FA\u4E2D\u4E0D\u5305\u62EC\u9650\u5B9A\u7B26\u7684\u5217\u8868\u3002\n-nosince                          \u4E0D\u5305\u542B @since \u4FE1\u606F\n-notimestamp                      \u4E0D\u5305\u542B\u9690\u85CF\u65F6\u95F4\u6233\n-nodeprecatedlist                 \u4E0D\u751F\u6210\u5DF2\u8FC7\u65F6\u7684\u5217\u8868\n-notree                           \u4E0D\u751F\u6210\u7C7B\u5206\u5C42\u7ED3\u6784\n-noindex                          \u4E0D\u751F\u6210\u7D22\u5F15\n-nohelp                           \u4E0D\u751F\u6210\u5E2E\u52A9\u94FE\u63A5\n-nonavbar                         \u4E0D\u751F\u6210\u5BFC\u822A\u680F\n-serialwarn                       \u751F\u6210\u6709\u5173 @serial \u6807\u8BB0\u7684\u8B66\u544A\n-tag <name>:<locations>:<header>  \u6307\u5B9A\u5355\u4E2A\u53C2\u6570\u5B9A\u5236\u6807\u8BB0\n-taglet                           \u8981\u6CE8\u518C\u7684 Taglet \u7684\u5168\u9650\u5B9A\u540D\u79F0\n-tagletpath                       Taglet \u7684\u8DEF\u5F84\n-Xdocrootparent <url>             \u5C06\u6587\u6863\u6CE8\u91CA\u4E2D\u51FA\u73B0\u7684\u6240\u6709\u540E\u8DDF /.. \u7684 @docRoot \u66FF\u6362\u4E3A <url>\n-charset <charset>                \u7528\u4E8E\u8DE8\u5E73\u53F0\u67E5\u770B\u751F\u6210\u7684\u6587\u6863\u7684\u5B57\u7B26\u96C6\u3002\n-helpfile <file>                  \u5305\u542B\u5E2E\u52A9\u94FE\u63A5\u6240\u94FE\u63A5\u5230\u7684\u6587\u4EF6\n-linksource                       \u4EE5 HTML \u683C\u5F0F\u751F\u6210\u6E90\u6587\u4EF6\n-sourcetab <tab length>           \u6307\u5B9A\u6E90\u4E2D\u6BCF\u4E2A\u5236\u8868\u7B26\u5360\u636E\u7684\u7A7A\u683C\u6570\n-keywords                         \u4F7F\u7A0B\u5E8F\u5305, \u7C7B\u548C\u6210\u5458\u4FE1\u606F\u9644\u5E26 HTML \u5143\u6807\u8BB0\n-stylesheetfile <path>            \u7528\u4E8E\u66F4\u6539\u751F\u6210\u6587\u6863\u7684\u6837\u5F0F\u7684\u6587\u4EF6\n-docencoding <name>               \u8F93\u51FA\u7F16\u7801\u540D\u79F0
  13.135  
  13.136  
  13.137  

    14.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java	Thu Mar 28 10:55:14 2013 -0700
    14.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java	Mon Apr 01 21:42:15 2013 -0700
    14.3 @@ -56,7 +56,7 @@
    14.4      /**
    14.5       * Exception used to report a problem during setOptions.
    14.6       */
    14.7 -    public class Fault extends Exception {
    14.8 +    public static class Fault extends Exception {
    14.9          private static final long serialVersionUID = 0;
   14.10  
   14.11          Fault(String msg) {

    15.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java	Thu Mar 28 10:55:14 2013 -0700
    15.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java	Mon Apr 01 21:42:15 2013 -0700
    15.3 @@ -1,5 +1,5 @@
    15.4  /*
    15.5 - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    15.6 + * Copyright (c) 2003, 2013, 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 @@ -116,9 +116,9 @@
   15.11        * @param contentTree the content tree to which the documentation will be added
   15.12        */
   15.13       public void buildAnnotationTypeDoc(XMLNode node, Content contentTree) throws Exception {
   15.14 -        contentTree = writer.getHeader(configuration.getText("doclet.AnnotationType") +
   15.15 +         contentTree = writer.getHeader(configuration.getText("doclet.AnnotationType") +
   15.16                  " " + annotationTypeDoc.name());
   15.17 -        Content annotationContentTree = writer.getAnnotationContentHeader();
   15.18 +         Content annotationContentTree = writer.getAnnotationContentHeader();
   15.19           buildChildren(node, annotationContentTree);
   15.20           contentTree.addContent(annotationContentTree);
   15.21           writer.addFooter(contentTree);

    16.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties	Thu Mar 28 10:55:14 2013 -0700
    16.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties	Mon Apr 01 21:42:15 2013 -0700
    16.3 @@ -11,6 +11,8 @@
    16.4  doclet.Class_0_extends_implements_serializable=Class {0} extends {1} implements Serializable
    16.5  doclet.Option_conflict=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u304C{1}\u3068\u77DB\u76FE\u3057\u307E\u3059
    16.6  doclet.Option_reuse=\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u518D\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0}
    16.7 +doclet.Option_doclint_no_qualifiers=\u30A2\u30AF\u30BB\u30B9\u4FEE\u98FE\u5B50\u306F-Xdoclint\u306E\u5F15\u6570\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
    16.8 +doclet.Option_doclint_invalid_arg=-Xdoclint\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u304C\u7121\u52B9\u3067\u3059
    16.9  doclet.exception_encountered= {0}\u3092\u691C\u51FA\n\t\u30D5\u30A1\u30A4\u30EB\u306E\u4F5C\u6210\u4E2D: {1}
   16.10  doclet.perform_copy_exception_encountered= \u30B3\u30D4\u30FC\u5B9F\u884C\u4E2D\u306B{0}\u3092\n\u691C\u51FA\u3057\u307E\u3057\u305F\u3002
   16.11  doclet.File_not_found=\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
   16.12 @@ -19,10 +21,8 @@
   16.13  doclet.Copying_File_0_To_File_1=\u30D5\u30A1\u30A4\u30EB{0}\u3092\u30D5\u30A1\u30A4\u30EB{1}\u306B\u30B3\u30D4\u30FC\u4E2D...
   16.14  doclet.No_Public_Classes_To_Document=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3059\u308Bpublic\u307E\u305F\u306Fprotected\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
   16.15  doclet.Unable_to_create_directory_0=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
   16.16 -doclet.destination_directory_not_found_0=\u8EE2\u9001\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
   16.17  doclet.destination_directory_not_directory_0=\u8EE2\u9001\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u306F\u3042\u308A\u307E\u305B\u3093
   16.18  doclet.destination_directory_not_writable_0=\u8EE2\u9001\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u306F\u66F8\u8FBC\u307F\u53EF\u80FD\u3067\u306F\u3042\u308A\u307E\u305B\u3093
   16.19 -doclet.Error_creating_tmp_file=\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3092\u4F7F\u7528\u3057\u3066\u4E00\u6642\u30D5\u30A1\u30A4\u30EB\u3092\u4F5C\u6210\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
   16.20  doclet.Encoding_not_supported=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0{0}\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093
   16.21  doclet.Building_Tree=\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u3068\u30AF\u30E9\u30B9\u306E\u968E\u5C64\u30C4\u30EA\u30FC\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059...
   16.22  doclet.Building_Index=\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u3068\u30AF\u30E9\u30B9\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059...
   16.23 @@ -72,7 +72,6 @@
   16.24  doclet.Enum_Constant_Summary=\u5217\u6319\u578B\u5B9A\u6570\u306E\u6982\u8981
   16.25  doclet.Constructor_Summary=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u6982\u8981
   16.26  doclet.Method_Summary=\u30E1\u30BD\u30C3\u30C9\u306E\u6982\u8981
   16.27 -doclet.Factory_Method_Summary=static\u30D5\u30A1\u30AF\u30C8\u30EA\u30FB\u30E1\u30BD\u30C3\u30C9\u306E\u6982\u8981
   16.28  doclet.Interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
   16.29  doclet.Enums=\u5217\u6319\u578B
   16.30  doclet.AnnotationTypes=\u6CE8\u91C8\u578B
   16.31 @@ -86,15 +85,14 @@
   16.32  doclet.All_Implemented_Interfaces=\u3059\u3079\u3066\u306E\u5B9F\u88C5\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9:
   16.33  doclet.All_classes_and_interfaces=\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9(\u975Estatic\u306E\u30CD\u30B9\u30C8\u3055\u308C\u305F\u578B\u3092\u9664\u304F)
   16.34  doclet.Package_class_and_interface_descriptions=\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E
   16.35 -doclet.Members=\u30E1\u30F3\u30D0\u30FC
   16.36  doclet.Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
   16.37  doclet.Class=\u30AF\u30E9\u30B9
   16.38  doclet.AnnotationType=\u6CE8\u91C8\u578B
   16.39  doclet.annotationtype=\u6CE8\u91C8\u578B
   16.40  doclet.annotationtypes=\u6CE8\u91C8\u578B
   16.41  doclet.Enum=\u5217\u6319\u578B
   16.42 -doclet.enum=\u5217\u6319
   16.43 -doclet.enums=\u5217\u6319
   16.44 +doclet.enum=\u5217\u6319\u578B
   16.45 +doclet.enums=\u5217\u6319\u578B
   16.46  doclet.interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
   16.47  doclet.interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
   16.48  doclet.class=\u30AF\u30E9\u30B9
   16.49 @@ -105,26 +103,20 @@
   16.50  doclet.Exception=\u4F8B\u5916
   16.51  doclet.exception=\u4F8B\u5916
   16.52  doclet.exceptions=\u4F8B\u5916
   16.53 -doclet.extended_by=\u4E0A\u4F4D\u3092\u62E1\u5F35
   16.54 -doclet.extends=extends
   16.55  doclet.Package_private=(package private)
   16.56 -doclet.implements=implementsdoclet.Same_package_name_used=\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\u5F62\u5F0F\u304C2\u56DE\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0}
   16.57  doclet.Nested_Classes_Interfaces_Inherited_From_Class=\u30AF\u30E9\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9/\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
   16.58  doclet.Nested_Classes_Interface_Inherited_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9/\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
   16.59  doclet.Methods_Inherited_From_Class=\u30AF\u30E9\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9
   16.60  doclet.Methods_Inherited_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9
   16.61  doclet.Fields_Inherited_From_Class=\u30AF\u30E9\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30EB\u30C9
   16.62  doclet.Fields_Inherited_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30EB\u30C9
   16.63 -doclet.Serializable=\u76F4\u5217\u5316\u53EF\u80FD
   16.64 -doclet.Externalizable=\u5916\u90E8\u5316\u53EF\u80FD
   16.65  doclet.Annotation_Type_Member_Detail=\u8981\u7D20\u306E\u8A73\u7D30
   16.66  doclet.Enum_Constant_Detail=\u5217\u6319\u578B\u5B9A\u6570\u306E\u8A73\u7D30
   16.67  doclet.Constants_Summary=\u5B9A\u6570\u30D5\u30A3\u30FC\u30EB\u30C9\u5024
   16.68  doclet.Field_Detail=\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u8A73\u7D30
   16.69  doclet.Method_Detail=\u30E1\u30BD\u30C3\u30C9\u306E\u8A73\u7D30
   16.70  doclet.Constructor_Detail=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u8A73\u7D30
   16.71 -doclet.Deprecated=\u63A8\u5968\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
   16.72 -doclet.Deprecated_class=\u3053\u306E\u30AF\u30E9\u30B9\u306F\u63A8\u5968\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
   16.73 +doclet.Deprecated=\u975E\u63A8\u5968\u3067\u3059\u3002
   16.74  doclet.Groupname_already_used=-group\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u304A\u3044\u3066\u3001\u3059\u3067\u306B\u30B0\u30EB\u30FC\u30D7\u540D\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0}
   16.75  doclet.value_tag_invalid_reference={0}(@value\u30BF\u30B0\u306B\u3088\u308A\u53C2\u7167\u3055\u308C\u3066\u3044\u308B)\u306F\u4E0D\u660E\u306A\u53C2\u7167\u3067\u3059\u3002
   16.76  doclet.value_tag_invalid_constant=@value\u30BF\u30B0({0}\u3092\u53C2\u7167\u3057\u3066\u3044\u308B)\u306F\u5B9A\u6570\u5185\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
   16.77 @@ -144,7 +136,7 @@
   16.78  doclet.annotation_type_required_members=\u5FC5\u9808\u8981\u7D20
   16.79  doclet.Annotation_Type_Required_Members=\u5FC5\u9808\u8981\u7D20
   16.80  doclet.enum_constants=\u5217\u6319\u578B\u5B9A\u6570
   16.81 -doclet.Enum_Constants=\u5217\u6319\u5B9A\u6570
   16.82 +doclet.Enum_Constants=\u5217\u6319\u578B\u5B9A\u6570
   16.83  doclet.nested_classes=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9
   16.84  doclet.Nested_Classes=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9
   16.85  doclet.subclasses=\u30B5\u30D6\u30AF\u30E9\u30B9
   16.86 @@ -167,4 +159,4 @@
   16.87  #Documentation for Enums
   16.88  doclet.enum_values_doc=\n\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u542B\u3080\u914D\u5217\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\u8FD4\u3057\u307E\u3059\u3002\n\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306F\u6B21\u306E\u3088\u3046\u306B\u3057\u3066\u5B9A\u6570\u3092\u53CD\u5FA9\u3059\u308B\u305F\u3081\u306B\n\u4F7F\u7528\u3067\u304D\u307E\u3059:\n<pre>\nfor({0} c: {0}.values())\n&nbsp; System.out.println(c);\n</pre>\n@return\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\n\u542B\u3080\u914D\u5217
   16.89  
   16.90 -doclet.enum_valueof_doc=\n\u6307\u5B9A\u3057\u305F\u540D\u524D\u3092\u6301\u3064\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u8FD4\u3057\u307E\u3059\u3002\n\u6587\u5B57\u5217\u306F\u3001\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u5BA3\u8A00\u3059\u308B\u306E\u306B\u4F7F\u7528\u3057\u305F\u8B58\u5225\u5B50\u3068\u53B3\u5BC6\u306B\n\u4E00\u81F4\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n(\u4F59\u5206\u306A\u7A7A\u767D\u6587\u5B57\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002)\n\n@param name\u8FD4\u3055\u308C\u308B\u5217\u6319\u578B\u5B9A\u6570\u306E\u540D\u524D\n@return\u6307\u5B9A\u3055\u308C\u305F\u540D\u524D\u3092\u6301\u3064\u5217\u6319\u578B\u5B9A\u6570\n@throws IllegalArgumentException\u6307\u5B9A\u3055\u308C\u305F\u540D\u524D\u3092\u6301\u3064\u5B9A\u6570\u3092\n\u3053\u306E\u5217\u6319\u578B\u304C\u6301\u3063\u3066\u3044\u306A\u3044\u5834\u5408\n@throws NullPointerException\u5F15\u6570\u304Cnull\u306E\u5834\u5408
   16.91 +doclet.enum_valueof_doc=\n\u6307\u5B9A\u3057\u305F\u540D\u524D\u3092\u6301\u3064\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u8FD4\u3057\u307E\u3059\u3002\n\u6587\u5B57\u5217\u306F\u3001\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u5BA3\u8A00\u3059\u308B\u306E\u306B\u4F7F\u7528\u3057\u305F\u8B58\u5225\u5B50\u3068<i>\u6B63\u78BA\u306B</i>\n\u4E00\u81F4\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n(\u4F59\u5206\u306A\u7A7A\u767D\u6587\u5B57\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002)\n\n@param name\u8FD4\u3055\u308C\u308B\u5217\u6319\u578B\u5B9A\u6570\u306E\u540D\u524D\n@return\u6307\u5B9A\u3055\u308C\u305F\u540D\u524D\u3092\u6301\u3064\u5217\u6319\u578B\u5B9A\u6570\n@throws IllegalArgumentException\u6307\u5B9A\u3055\u308C\u305F\u540D\u524D\u3092\u6301\u3064\u5B9A\u6570\u3092\n\u3053\u306E\u5217\u6319\u578B\u304C\u6301\u3063\u3066\u3044\u306A\u3044\u5834\u5408\n@throws NullPointerException\u5F15\u6570\u304Cnull\u306E\u5834\u5408

    17.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties	Thu Mar 28 10:55:14 2013 -0700
    17.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties	Mon Apr 01 21:42:15 2013 -0700
    17.3 @@ -11,6 +11,8 @@
    17.4  doclet.Class_0_extends_implements_serializable=\u7C7B{0}\u6269\u5C55{1}\u5B9E\u73B0\u53EF\u5E8F\u5217\u5316
    17.5  doclet.Option_conflict=\u9009\u9879{0}\u4E0E{1}\u51B2\u7A81
    17.6  doclet.Option_reuse=\u91CD\u590D\u4F7F\u7528\u7684\u9009\u9879: {0}
    17.7 +doclet.Option_doclint_no_qualifiers=-Xdoclint \u53C2\u6570\u4E0D\u5141\u8BB8\u4F7F\u7528\u8BBF\u95EE\u9650\u5B9A\u7B26
    17.8 +doclet.Option_doclint_invalid_arg=-Xdoclint \u9009\u9879\u7684\u53C2\u6570\u65E0\u6548
    17.9  doclet.exception_encountered= \u5C1D\u8BD5\u521B\u5EFA\u6587\u4EF6{1}\u65F6 \n\t\u9047\u5230{0}
   17.10  doclet.perform_copy_exception_encountered= \u6267\u884C\u590D\u5236\u65F6 \n\u9047\u5230{0}\u3002
   17.11  doclet.File_not_found=\u627E\u4E0D\u5230\u6587\u4EF6: {0}
   17.12 @@ -19,10 +21,8 @@
   17.13  doclet.Copying_File_0_To_File_1=\u6B63\u5728\u5C06\u6587\u4EF6{0}\u590D\u5236\u5230\u6587\u4EF6{1}...
   17.14  doclet.No_Public_Classes_To_Document=\u627E\u4E0D\u5230\u53EF\u4EE5\u6587\u6863\u5316\u7684\u516C\u5171\u6216\u53D7\u4FDD\u62A4\u7684\u7C7B\u3002
   17.15  doclet.Unable_to_create_directory_0=\u65E0\u6CD5\u521B\u5EFA\u76EE\u5F55 {0}
   17.16 -doclet.destination_directory_not_found_0=\u627E\u4E0D\u5230\u76EE\u6807\u76EE\u5F55 {0}
   17.17  doclet.destination_directory_not_directory_0=\u76EE\u6807\u76EE\u5F55\u4E0D\u662F\u76EE\u5F55 {0}
   17.18  doclet.destination_directory_not_writable_0=\u76EE\u6807\u76EE\u5F55\u4E0D\u53EF\u5199\u5165 {0}
   17.19 -doclet.Error_creating_tmp_file=\u4F7F\u7528\u9ED8\u8BA4\u5E73\u53F0\u7F16\u7801\u521B\u5EFA\u4E34\u65F6\u6587\u4EF6\u65F6\u51FA\u9519\u3002
   17.20  doclet.Encoding_not_supported=\u4E0D\u652F\u6301\u7F16\u7801: {0}
   17.21  doclet.Building_Tree=\u6B63\u5728\u6784\u5EFA\u6240\u6709\u7A0B\u5E8F\u5305\u548C\u7C7B\u7684\u6811...
   17.22  doclet.Building_Index=\u6B63\u5728\u6784\u5EFA\u6240\u6709\u7A0B\u5E8F\u5305\u548C\u7C7B\u7684\u7D22\u5F15...
   17.23 @@ -72,7 +72,6 @@
   17.24  doclet.Enum_Constant_Summary=\u679A\u4E3E\u5E38\u91CF\u6982\u8981
   17.25  doclet.Constructor_Summary=\u6784\u9020\u5668\u6982\u8981
   17.26  doclet.Method_Summary=\u65B9\u6CD5\u6982\u8981
   17.27 -doclet.Factory_Method_Summary=\u9759\u6001\u5DE5\u5382\u65B9\u6CD5\u6982\u8981
   17.28  doclet.Interfaces=\u63A5\u53E3
   17.29  doclet.Enums=\u679A\u4E3E
   17.30  doclet.AnnotationTypes=\u6CE8\u91CA\u7C7B\u578B
   17.31 @@ -86,7 +85,6 @@
   17.32  doclet.All_Implemented_Interfaces=\u6240\u6709\u5DF2\u5B9E\u73B0\u7684\u63A5\u53E3:
   17.33  doclet.All_classes_and_interfaces=\u6240\u6709\u7C7B\u548C\u63A5\u53E3 (\u9664\u4E86\u975E\u9759\u6001\u5D4C\u5957\u7C7B\u578B)
   17.34  doclet.Package_class_and_interface_descriptions=\u7A0B\u5E8F\u5305, \u7C7B\u548C\u63A5\u53E3\u8BF4\u660E
   17.35 -doclet.Members=\u6210\u5458
   17.36  doclet.Interface=\u63A5\u53E3
   17.37  doclet.Class=\u7C7B
   17.38  doclet.AnnotationType=\u6CE8\u91CA\u7C7B\u578B
   17.39 @@ -105,18 +103,13 @@
   17.40  doclet.Exception=\u5F02\u5E38\u9519\u8BEF
   17.41  doclet.exception=\u5F02\u5E38\u9519\u8BEF
   17.42  doclet.exceptions=\u5F02\u5E38\u9519\u8BEF
   17.43 -doclet.extended_by=\u6269\u5C55\u8005
   17.44 -doclet.extends=\u6269\u5C55
   17.45  doclet.Package_private=(\u4E13\u7528\u7A0B\u5E8F\u5305)
   17.46 -doclet.implements=implementsdoclet.Same_package_name_used=\u7A0B\u5E8F\u5305\u540D\u79F0\u5F62\u5F0F\u4F7F\u7528\u4E86\u4E24\u6B21: {0}
   17.47  doclet.Nested_Classes_Interfaces_Inherited_From_Class=\u4ECE\u7C7B\u7EE7\u627F\u7684\u5D4C\u5957\u7C7B/\u63A5\u53E3
   17.48  doclet.Nested_Classes_Interface_Inherited_From_Interface=\u4ECE\u63A5\u53E3\u7EE7\u627F\u7684\u5D4C\u5957\u7C7B/\u63A5\u53E3
   17.49  doclet.Methods_Inherited_From_Class=\u4ECE\u7C7B\u7EE7\u627F\u7684\u65B9\u6CD5
   17.50  doclet.Methods_Inherited_From_Interface=\u4ECE\u63A5\u53E3\u7EE7\u627F\u7684\u65B9\u6CD5
   17.51  doclet.Fields_Inherited_From_Class=\u4ECE\u7C7B\u7EE7\u627F\u7684\u5B57\u6BB5
   17.52  doclet.Fields_Inherited_From_Interface=\u4ECE\u63A5\u53E3\u7EE7\u627F\u7684\u5B57\u6BB5
   17.53 -doclet.Serializable=\u53EF\u5E8F\u5217\u5316
   17.54 -doclet.Externalizable=\u53EF\u5916\u90E8\u5316
   17.55  doclet.Annotation_Type_Member_Detail=\u5143\u7D20\u8BE6\u7EC6\u8D44\u6599
   17.56  doclet.Enum_Constant_Detail=\u679A\u4E3E\u5E38\u91CF\u8BE6\u7EC6\u8D44\u6599
   17.57  doclet.Constants_Summary=\u5E38\u91CF\u5B57\u6BB5\u503C
   17.58 @@ -124,7 +117,6 @@
   17.59  doclet.Method_Detail=\u65B9\u6CD5\u8BE6\u7EC6\u8D44\u6599
   17.60  doclet.Constructor_Detail=\u6784\u9020\u5668\u8BE6\u7EC6\u8D44\u6599
   17.61  doclet.Deprecated=\u5DF2\u8FC7\u65F6\u3002
   17.62 -doclet.Deprecated_class=\u8BE5\u7C7B\u5DF2\u8FC7\u65F6\u3002
   17.63  doclet.Groupname_already_used=\u5728 -group \u9009\u9879\u4E2D, groupname \u5DF2\u4F7F\u7528: {0}
   17.64  doclet.value_tag_invalid_reference={0} (\u7531 @value \u6807\u8BB0\u5F15\u7528) \u4E3A\u672A\u77E5\u5F15\u7528\u3002
   17.65  doclet.value_tag_invalid_constant=@value \u6807\u8BB0 (\u5F15\u7528{0}) \u53EA\u80FD\u5728\u5E38\u91CF\u4E2D\u4F7F\u7528\u3002
   17.66 @@ -167,4 +159,4 @@
   17.67  #Documentation for Enums
   17.68  doclet.enum_values_doc=\n\u6309\u7167\u58F0\u660E\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u987A\u5E8F, \u8FD4\u56DE\n\u5305\u542B\u8FD9\u4E9B\u5E38\u91CF\u7684\u6570\u7EC4\u3002\u8BE5\u65B9\u6CD5\u53EF\u7528\u4E8E\u8FED\u4EE3\n\u5E38\u91CF, \u5982\u4E0B\u6240\u793A:\n<pre>\nfor ({0} c : {0}.values())\n&nbsp;   System.out.println(c);\n</pre>\n@\u6309\u7167\u58F0\u660E\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u987A\u5E8F, \u8FD4\u56DE\n\u5305\u542B\u8FD9\u4E9B\u5E38\u91CF\u7684\u6570\u7EC4
   17.69  
   17.70 -doclet.enum_valueof_doc=\n\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u3002\n\u5B57\u7B26\u4E32\u5FC5\u987B\u4E0E\u7528\u4E8E\u58F0\u660E\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u7684\n\u6807\u8BC6\u7B26<i>\u5B8C\u5168</i>\u5339\u914D\u3002(\u4E0D\u5141\u8BB8\u6709\u591A\u4F59\n\u7684\u7A7A\u683C\u5B57\u7B26\u3002)\n\n@param name \u8981\u8FD4\u56DE\u7684\u679A\u4E3E\u5E38\u91CF\u7684\u540D\u79F0\u3002\n@return \u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u679A\u4E3E\u5E38\u91CF\n@throws \u5982\u679C\u8BE5\u679A\u4E3E\u7C7B\u578B\u6CA1\u6709\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u5E38\u91CF, \n\u5219\u629B\u51FA IllegalArgumentException\n@throws \u5982\u679C\u53C2\u6570\u4E3A\u7A7A\u503C, \u5219\u629B\u51FA NullPointerException
   17.71 +doclet.enum_valueof_doc=\n\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u3002\n\u5B57\u7B26\u4E32\u5FC5\u987B\u4E0E\u7528\u4E8E\u58F0\u660E\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u7684\n\u6807\u8BC6\u7B26<i>\u5B8C\u5168</i>\u5339\u914D\u3002(\u4E0D\u5141\u8BB8\u6709\u591A\u4F59\n\u7684\u7A7A\u683C\u5B57\u7B26\u3002)\n\n@param name \u8981\u8FD4\u56DE\u7684\u679A\u4E3E\u5E38\u91CF\u7684\u540D\u79F0\u3002\n@\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u679A\u4E3E\u5E38\u91CF\n@\u5982\u679C\u8BE5\u679A\u4E3E\u7C7B\u578B\u6CA1\u6709\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u5E38\u91CF, \n\u5219\u629B\u51FA IllegalArgumentException\n@\u5982\u679C\u53C2\u6570\u4E3A\u7A7A\u503C, \u5219\u629B\u51FA NullPointerException

    18.1 --- a/src/share/classes/com/sun/tools/doclint/Checker.java	Thu Mar 28 10:55:14 2013 -0700
    18.2 +++ b/src/share/classes/com/sun/tools/doclint/Checker.java	Mon Apr 01 21:42:15 2013 -0700
    18.3 @@ -25,20 +25,18 @@
    18.4  
    18.5  package com.sun.tools.doclint;
    18.6  
    18.7 -import com.sun.source.doctree.LiteralTree;
    18.8 -import java.util.regex.Matcher;
    18.9 -import com.sun.source.doctree.LinkTree;
   18.10 +import java.io.IOException;
   18.11 +import java.io.StringWriter;
   18.12  import java.net.URI;
   18.13 -import java.util.regex.Pattern;
   18.14 -import java.io.IOException;
   18.15 -import com.sun.tools.javac.tree.DocPretty;
   18.16 -import java.io.StringWriter;
   18.17 +import java.net.URISyntaxException;
   18.18  import java.util.Deque;
   18.19  import java.util.EnumSet;
   18.20  import java.util.HashSet;
   18.21  import java.util.LinkedList;
   18.22  import java.util.List;
   18.23  import java.util.Set;
   18.24 +import java.util.regex.Matcher;
   18.25 +import java.util.regex.Pattern;
   18.26  
   18.27  import javax.lang.model.element.Element;
   18.28  import javax.lang.model.element.ElementKind;
   18.29 @@ -52,12 +50,15 @@
   18.30  import com.sun.source.doctree.AttributeTree;
   18.31  import com.sun.source.doctree.AuthorTree;
   18.32  import com.sun.source.doctree.DocCommentTree;
   18.33 +import com.sun.source.doctree.DocRootTree;
   18.34  import com.sun.source.doctree.DocTree;
   18.35  import com.sun.source.doctree.EndElementTree;
   18.36  import com.sun.source.doctree.EntityTree;
   18.37  import com.sun.source.doctree.ErroneousTree;
   18.38  import com.sun.source.doctree.IdentifierTree;
   18.39  import com.sun.source.doctree.InheritDocTree;
   18.40 +import com.sun.source.doctree.LinkTree;
   18.41 +import com.sun.source.doctree.LiteralTree;
   18.42  import com.sun.source.doctree.ParamTree;
   18.43  import com.sun.source.doctree.ReferenceTree;
   18.44  import com.sun.source.doctree.ReturnTree;
   18.45 @@ -67,11 +68,12 @@
   18.46  import com.sun.source.doctree.StartElementTree;
   18.47  import com.sun.source.doctree.TextTree;
   18.48  import com.sun.source.doctree.ThrowsTree;
   18.49 +import com.sun.source.doctree.ValueTree;
   18.50  import com.sun.source.doctree.VersionTree;
   18.51  import com.sun.source.util.DocTreeScanner;
   18.52  import com.sun.source.util.TreePath;
   18.53  import com.sun.tools.doclint.HtmlTag.AttrKind;
   18.54 -import java.net.URISyntaxException;
   18.55 +import com.sun.tools.javac.tree.DocPretty;
   18.56  import static com.sun.tools.doclint.Messages.Group.*;
   18.57  
   18.58  
   18.59 @@ -95,6 +97,7 @@
   18.60      public enum Flag {
   18.61          TABLE_HAS_CAPTION,
   18.62          HAS_ELEMENT,
   18.63 +        HAS_INLINE_TAG,
   18.64          HAS_TEXT,
   18.65          REPORTED_BAD_INLINE
   18.66      }
   18.67 @@ -418,7 +421,8 @@
   18.68                      }
   18.69                      if (t.flags.contains(HtmlTag.Flag.EXPECT_CONTENT)
   18.70                              && !top.flags.contains(Flag.HAS_TEXT)
   18.71 -                            && !top.flags.contains(Flag.HAS_ELEMENT)) {
   18.72 +                            && !top.flags.contains(Flag.HAS_ELEMENT)
   18.73 +                            && !top.flags.contains(Flag.HAS_INLINE_TAG)) {
   18.74                          env.messages.warning(HTML, tree, "dc.tag.empty", treeName);
   18.75                      }
   18.76                      tagStack.pop();
   18.77 @@ -571,7 +575,14 @@
   18.78      }
   18.79  
   18.80      @Override
   18.81 +    public Void visitDocRoot(DocRootTree tree, Void ignore) {
   18.82 +        markEnclosingTag(Flag.HAS_INLINE_TAG);
   18.83 +        return super.visitDocRoot(tree, ignore);
   18.84 +    }
   18.85 +
   18.86 +    @Override
   18.87      public Void visitInheritDoc(InheritDocTree tree, Void ignore) {
   18.88 +        markEnclosingTag(Flag.HAS_INLINE_TAG);
   18.89          // TODO: verify on overridden method
   18.90          foundInheritDoc = true;
   18.91          return super.visitInheritDoc(tree, ignore);
   18.92 @@ -579,6 +590,7 @@
   18.93  
   18.94      @Override
   18.95      public Void visitLink(LinkTree tree, Void ignore) {
   18.96 +        markEnclosingTag(Flag.HAS_INLINE_TAG);
   18.97          // simulate inline context on tag stack
   18.98          HtmlTag t = (tree.getKind() == DocTree.Kind.LINK)
   18.99                  ? HtmlTag.CODE : HtmlTag.SPAN;
  18.100 @@ -592,6 +604,7 @@
  18.101  
  18.102      @Override
  18.103      public Void visitLiteral(LiteralTree tree, Void ignore) {
  18.104 +        markEnclosingTag(Flag.HAS_INLINE_TAG);
  18.105          if (tree.getKind() == DocTree.Kind.CODE) {
  18.106              for (TagStackItem tsi: tagStack) {
  18.107                  if (tsi.tag == HtmlTag.CODE) {
  18.108 @@ -746,6 +759,12 @@
  18.109      }
  18.110  
  18.111      @Override
  18.112 +    public Void visitValue(ValueTree tree, Void ignore) {
  18.113 +        markEnclosingTag(Flag.HAS_INLINE_TAG);
  18.114 +        return super.visitValue(tree, ignore);
  18.115 +    }
  18.116 +
  18.117 +    @Override
  18.118      public Void visitVersion(VersionTree tree, Void ignore) {
  18.119          warnIfEmpty(tree, tree.getBody());
  18.120          return super.visitVersion(tree, ignore);

    19.1 --- a/src/share/classes/com/sun/tools/javac/Server.java	Thu Mar 28 10:55:14 2013 -0700
    19.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.3 @@ -1,197 +0,0 @@
    19.4 -/*
    19.5 - * Copyright (c) 2005, 2012, 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.tools.javac;
   19.30 -
   19.31 -import java.io.*;
   19.32 -import java.net.*;
   19.33 -import java.util.*;
   19.34 -import java.util.concurrent.*;
   19.35 -import java.util.logging.Logger;
   19.36 -import javax.tools.*;
   19.37 -
   19.38 -/**
   19.39 - * Java Compiler Server.  Can be used to speed up a set of (small)
   19.40 - * compilation tasks by caching jar files between compilations.
   19.41 - *
   19.42 - * <p><b>This is NOT part of any supported API.
   19.43 - * If you write code that depends on this, you do so at your own
   19.44 - * risk.  This code and its internal interfaces are subject to change
   19.45 - * or deletion without notice.</b></p>
   19.46 - *
   19.47 - * @author Peter von der Ah&eacute;
   19.48 - * @since 1.6
   19.49 - */
   19.50 -@jdk.Supported(false)
   19.51 -class Server implements Runnable {
   19.52 -    private final BufferedReader in;
   19.53 -    private final OutputStream out;
   19.54 -    private final boolean isSocket;
   19.55 -    private static final JavaCompiler tool = ToolProvider.getSystemJavaCompiler();
   19.56 -    private static final Logger logger = Logger.getLogger("com.sun.tools.javac");
   19.57 -    static class CwdFileManager extends ForwardingJavaFileManager<JavaFileManager> {
   19.58 -        String cwd;
   19.59 -        CwdFileManager(JavaFileManager fileManager) {
   19.60 -            super(fileManager);
   19.61 -        }
   19.62 -        String getAbsoluteName(String name) {
   19.63 -            if (new File(name).isAbsolute()) {
   19.64 -                return name;
   19.65 -            } else {
   19.66 -                return new File(cwd,name).getPath();
   19.67 -            }
   19.68 -        }
   19.69 -//      public JavaFileObject getFileForInput(String name)
   19.70 -//          throws IOException
   19.71 -//      {
   19.72 -//          return super.getFileForInput(getAbsoluteName(name));
   19.73 -//      }
   19.74 -    }
   19.75 -    // static CwdFileManager fm = new CwdFileManager(tool.getStandardFileManager());
   19.76 -    static final StandardJavaFileManager fm = tool.getStandardFileManager(null, null, null);
   19.77 -    static {
   19.78 -        // Use the same file manager for all compilations.  This will
   19.79 -        // cache jar files in the standard file manager.  Use
   19.80 -        // tool.getStandardFileManager().close() to release.
   19.81 -        // FIXME tool.setFileManager(fm);
   19.82 -        logger.setLevel(java.util.logging.Level.SEVERE);
   19.83 -    }
   19.84 -    private Server(BufferedReader in, OutputStream out, boolean isSocket) {
   19.85 -        this.in = in;
   19.86 -        this.out = out;
   19.87 -        this.isSocket = isSocket;
   19.88 -    }
   19.89 -    private Server(BufferedReader in, OutputStream out) {
   19.90 -        this(in, out, false);
   19.91 -    }
   19.92 -    private Server(Socket socket) throws IOException, UnsupportedEncodingException {
   19.93 -        this(new BufferedReader(new InputStreamReader(socket.getInputStream(), "utf-8")),
   19.94 -             socket.getOutputStream(),
   19.95 -             true);
   19.96 -    }
   19.97 -    public void run() {
   19.98 -        List<String> args = new ArrayList<String>();
   19.99 -        int res = -1;
  19.100 -        try {
  19.101 -            String line = null;
  19.102 -            try {
  19.103 -                line = in.readLine();
  19.104 -            } catch (IOException e) {
  19.105 -                System.err.println(e.getLocalizedMessage());
  19.106 -                System.exit(0);
  19.107 -                line = null;
  19.108 -            }
  19.109 -            // fm.cwd=null;
  19.110 -            String cwd = null;
  19.111 -            while (line != null) {
  19.112 -                if (line.startsWith("PWD:")) {
  19.113 -                    cwd = line.substring(4);
  19.114 -                } else if (line.equals("END")) {
  19.115 -                    break;
  19.116 -                } else if (!"-XDstdout".equals(line)) {
  19.117 -                    args.add(line);
  19.118 -                }
  19.119 -                try {
  19.120 -                    line = in.readLine();
  19.121 -                } catch (IOException e) {
  19.122 -                    System.err.println(e.getLocalizedMessage());
  19.123 -                    System.exit(0);
  19.124 -                    line = null;
  19.125 -                }
  19.126 -            }
  19.127 -            Iterable<File> path = cwd == null ? null : Arrays.<File>asList(new File(cwd));
  19.128 -            // try { in.close(); } catch (IOException e) {}
  19.129 -            long msec = System.currentTimeMillis();
  19.130 -            try {
  19.131 -                synchronized (tool) {
  19.132 -                    for (StandardLocation location : StandardLocation.values())
  19.133 -                        fm.setLocation(location, path);
  19.134 -                    res = compile(out, fm, args);
  19.135 -                    // FIXME res = tool.run((InputStream)null, null, out, args.toArray(new String[args.size()]));
  19.136 -                }
  19.137 -            } catch (Throwable ex) {
  19.138 -                logger.log(java.util.logging.Level.SEVERE, args.toString(), ex);
  19.139 -                PrintWriter p = new PrintWriter(out, true);
  19.140 -                ex.printStackTrace(p);
  19.141 -                p.flush();
  19.142 -            }
  19.143 -            if (res >= 3) {
  19.144 -                logger.severe(String.format("problem: %s", args));
  19.145 -            } else {
  19.146 -                logger.info(String.format("success: %s", args));
  19.147 -            }
  19.148 -            // res = compile(args.toArray(new String[args.size()]), out);
  19.149 -            msec -= System.currentTimeMillis();
  19.150 -            logger.info(String.format("Real time: %sms", -msec));
  19.151 -        } finally {
  19.152 -            if (!isSocket) {
  19.153 -                try { in.close(); } catch (IOException e) {}
  19.154 -            }
  19.155 -            try {
  19.156 -                out.write(String.format("EXIT: %s%n", res).getBytes());
  19.157 -            } catch (IOException ex) {
  19.158 -                logger.log(java.util.logging.Level.SEVERE, args.toString(), ex);
  19.159 -            }
  19.160 -            try {
  19.161 -                out.flush();
  19.162 -                out.close();
  19.163 -            } catch (IOException ex) {
  19.164 -                logger.log(java.util.logging.Level.SEVERE, args.toString(), ex);
  19.165 -            }
  19.166 -            logger.info(String.format("EXIT: %s", res));
  19.167 -        }
  19.168 -    }
  19.169 -    public static void main(String... args) throws FileNotFoundException {
  19.170 -        if (args.length == 2) {
  19.171 -            for (;;) {
  19.172 -                throw new UnsupportedOperationException("TODO");
  19.173 -//              BufferedReader in = new BufferedReader(new FileReader(args[0]));
  19.174 -//              PrintWriter out = new PrintWriter(args[1]);
  19.175 -//              new Server(in, out).run();
  19.176 -//              System.out.flush();
  19.177 -//              System.err.flush();
  19.178 -            }
  19.179 -        } else {
  19.180 -            ExecutorService pool = Executors.newCachedThreadPool();
  19.181 -            try
  19.182 -                {
  19.183 -                ServerSocket socket = new ServerSocket(0xcafe, -1, null);
  19.184 -                for (;;) {
  19.185 -                    pool.execute(new Server(socket.accept()));
  19.186 -                }
  19.187 -            }
  19.188 -            catch (IOException e) {
  19.189 -                System.err.format("Error: %s%n", e.getLocalizedMessage());
  19.190 -                pool.shutdown();
  19.191 -            }
  19.192 -        }
  19.193 -    }
  19.194 -
  19.195 -    private int compile(OutputStream out, StandardJavaFileManager fm, List<String> args) {
  19.196 -        // FIXME parse args and use getTask
  19.197 -        // System.err.println("Running " + args);
  19.198 -        return tool.run(null, null, out, args.toArray(new String[args.size()]));
  19.199 -    }
  19.200 -}

    20.1 --- a/src/share/classes/com/sun/tools/javac/code/Printer.java	Thu Mar 28 10:55:14 2013 -0700
    20.2 +++ b/src/share/classes/com/sun/tools/javac/code/Printer.java	Mon Apr 01 21:42:15 2013 -0700
    20.3 @@ -311,9 +311,9 @@
    20.4              }
    20.5              if (args.head.unannotatedType().getKind() == TypeKind.ARRAY) {
    20.6                  buf.append(visit(((ArrayType) args.head.unannotatedType()).elemtype, locale));
    20.7 -                if (args.head.getAnnotations().nonEmpty()) {
    20.8 +                if (args.head.getAnnotationMirrors().nonEmpty()) {
    20.9                      buf.append(' ');
   20.10 -                    buf.append(args.head.getAnnotations());
   20.11 +                    buf.append(args.head.getAnnotationMirrors());
   20.12                      buf.append(' ');
   20.13                  }
   20.14                  buf.append("...");

    21.1 --- a/src/share/classes/com/sun/tools/javac/code/Symbol.java	Thu Mar 28 10:55:14 2013 -0700
    21.2 +++ b/src/share/classes/com/sun/tools/javac/code/Symbol.java	Mon Apr 01 21:42:15 2013 -0700
    21.3 @@ -483,12 +483,12 @@
    21.4       */
    21.5      @Deprecated
    21.6      public <A extends java.lang.annotation.Annotation> A getAnnotation(Class<A> annoType) {
    21.7 -        return JavacElements.getAnnotation(this, annoType);
    21.8 +        return JavacAnnoConstructs.getAnnotation(this, annoType);
    21.9      }
   21.10  
   21.11      // This method is part of the javax.lang.model API, do not use this in javac code.
   21.12      public <A extends java.lang.annotation.Annotation> A[] getAnnotationsByType(Class<A> annoType) {
   21.13 -        return JavacElements.getAnnotations(this, annoType);
   21.14 +        return JavacAnnoConstructs.getAnnotations(this, annoType);
   21.15      }
   21.16  
   21.17      // TODO: getEnclosedElements should return a javac List, fix in FilteredMemberList
   21.18 @@ -935,11 +935,12 @@
   21.19          }
   21.20  
   21.21          /**
   21.22 -         * @deprecated this method should never be used by javac internally.
   21.23 +         * Since this method works in terms of the runtime representation
   21.24 +         * of annotations, it should never be used by javac internally.
   21.25           */
   21.26 -        @Override @Deprecated
   21.27 +        @Override
   21.28          public <A extends java.lang.annotation.Annotation> A getAnnotation(Class<A> annoType) {
   21.29 -            return JavacElements.getAnnotation(this, annoType);
   21.30 +            return JavacAnnoConstructs.getAnnotation(this, annoType);
   21.31          }
   21.32  
   21.33          public <R, P> R accept(ElementVisitor<R, P> v, P p) {
   21.34 @@ -1444,6 +1445,10 @@
   21.35              return v.visitMethodSymbol(this, p);
   21.36          }
   21.37  
   21.38 +        public Type getReceiverType() {
   21.39 +            return asType().getReceiverType();
   21.40 +        }
   21.41 +
   21.42          public Type getReturnType() {
   21.43              return asType().getReturnType();
   21.44          }

    22.1 --- a/src/share/classes/com/sun/tools/javac/code/Type.java	Thu Mar 28 10:55:14 2013 -0700
    22.2 +++ b/src/share/classes/com/sun/tools/javac/code/Type.java	Mon Apr 01 21:42:15 2013 -0700
    22.3 @@ -25,6 +25,9 @@
    22.4  
    22.5  package com.sun.tools.javac.code;
    22.6  
    22.7 +import com.sun.tools.javac.model.JavacAnnoConstructs;
    22.8 +import com.sun.tools.javac.model.JavacTypes;
    22.9 +import java.lang.annotation.Annotation;
   22.10  import java.util.Collections;
   22.11  import java.util.EnumMap;
   22.12  import java.util.EnumSet;
   22.13 @@ -246,6 +249,10 @@
   22.14          return this;
   22.15      }
   22.16  
   22.17 +    public boolean isAnnotated() {
   22.18 +        return false;
   22.19 +    }
   22.20 +
   22.21      /**
   22.22       * If this is an annotated type, return the underlying type.
   22.23       * Otherwise, return the type itself.
   22.24 @@ -254,6 +261,23 @@
   22.25          return this;
   22.26      }
   22.27  
   22.28 +    @Override
   22.29 +    public List<? extends Attribute.TypeCompound> getAnnotationMirrors() {
   22.30 +        return List.nil();
   22.31 +    }
   22.32 +
   22.33 +    @Override
   22.34 +    public <A extends Annotation> A getAnnotation(Class<A> annotationType) {
   22.35 +        return null;
   22.36 +    }
   22.37 +
   22.38 +    @Override
   22.39 +    public <A extends Annotation> A[] getAnnotationsByType(Class<A> annotationType) {
   22.40 +        @SuppressWarnings("unchecked")
   22.41 +        A[] tmp = (A[]) java.lang.reflect.Array.newInstance(annotationType, 0);
   22.42 +        return tmp;
   22.43 +    }
   22.44 +
   22.45      /** Return the base types of a list of types.
   22.46       */
   22.47      public static List<Type> baseTypes(List<Type> ts) {
   22.48 @@ -350,8 +374,8 @@
   22.49          }
   22.50          if (args.head.unannotatedType().tag == ARRAY) {
   22.51              buf.append(((ArrayType)args.head.unannotatedType()).elemtype);
   22.52 -            if (args.head.getAnnotations().nonEmpty()) {
   22.53 -                buf.append(args.head.getAnnotations());
   22.54 +            if (args.head.getAnnotationMirrors().nonEmpty()) {
   22.55 +                buf.append(args.head.getAnnotationMirrors());
   22.56              }
   22.57              buf.append("...");
   22.58          } else {
   22.59 @@ -362,7 +386,6 @@
   22.60  
   22.61      /** Access methods.
   22.62       */
   22.63 -    public List<? extends AnnotationMirror> getAnnotations() { return List.nil(); }
   22.64      public List<Type>        getTypeArguments()  { return List.nil(); }
   22.65      public Type              getEnclosingType()  { return null; }
   22.66      public List<Type>        getParameterTypes() { return List.nil(); }
   22.67 @@ -1539,7 +1562,12 @@
   22.68      }
   22.69  
   22.70      public static class AnnotatedType extends Type
   22.71 -            implements javax.lang.model.type.AnnotatedType {
   22.72 +            implements
   22.73 +                javax.lang.model.type.ArrayType,
   22.74 +                javax.lang.model.type.DeclaredType,
   22.75 +                javax.lang.model.type.PrimitiveType,
   22.76 +                javax.lang.model.type.TypeVariable,
   22.77 +                javax.lang.model.type.WildcardType {
   22.78          /** The type annotations on this type.
   22.79           */
   22.80          public List<Attribute.TypeCompound> typeAnnotations;
   22.81 @@ -1552,7 +1580,7 @@
   22.82              super(underlyingType.tag, underlyingType.tsym);
   22.83              this.typeAnnotations = List.nil();
   22.84              this.underlyingType = underlyingType;
   22.85 -            Assert.check(underlyingType.getKind() != TypeKind.ANNOTATED,
   22.86 +            Assert.check(!underlyingType.isAnnotated(),
   22.87                      "Can't annotate already annotated type: " + underlyingType);
   22.88          }
   22.89  
   22.90 @@ -1561,24 +1589,34 @@
   22.91              super(underlyingType.tag, underlyingType.tsym);
   22.92              this.typeAnnotations = typeAnnotations;
   22.93              this.underlyingType = underlyingType;
   22.94 -            Assert.check(underlyingType.getKind() != TypeKind.ANNOTATED,
   22.95 +            Assert.check(!underlyingType.isAnnotated(),
   22.96                      "Can't annotate already annotated type: " + underlyingType +
   22.97                      "; adding: " + typeAnnotations);
   22.98          }
   22.99  
  22.100          @Override
  22.101 -        public TypeKind getKind() {
  22.102 -            return TypeKind.ANNOTATED;
  22.103 +        public boolean isAnnotated() {
  22.104 +            return true;
  22.105          }
  22.106  
  22.107          @Override
  22.108 -        public List<? extends AnnotationMirror> getAnnotations() {
  22.109 +        public List<? extends Attribute.TypeCompound> getAnnotationMirrors() {
  22.110              return typeAnnotations;
  22.111          }
  22.112  
  22.113          @Override
  22.114 -        public TypeMirror getUnderlyingType() {
  22.115 -            return underlyingType;
  22.116 +        public <A extends Annotation> A getAnnotation(Class<A> annotationType) {
  22.117 +            return JavacAnnoConstructs.getAnnotation(this, annotationType);
  22.118 +        }
  22.119 +
  22.120 +        @Override
  22.121 +        public <A extends Annotation> A[] getAnnotationsByType(Class<A> annotationType) {
  22.122 +            return JavacAnnoConstructs.getAnnotationsByType(this, annotationType);
  22.123 +        }
  22.124 +
  22.125 +        @Override
  22.126 +        public TypeKind getKind() {
  22.127 +            return underlyingType.getKind();
  22.128          }
  22.129  
  22.130          @Override
  22.131 @@ -1593,7 +1631,7 @@
  22.132  
  22.133          @Override
  22.134          public <R, P> R accept(TypeVisitor<R, P> v, P p) {
  22.135 -            return v.visitAnnotated(this, p);
  22.136 +            return underlyingType.accept(v, p);
  22.137          }
  22.138  
  22.139          @Override

    23.1 --- a/src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java	Thu Mar 28 10:55:14 2013 -0700
    23.2 +++ b/src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java	Mon Apr 01 21:42:15 2013 -0700
    23.3 @@ -233,7 +233,7 @@
    23.4                  Type.ArrayType arType;
    23.5                  {
    23.6                      Type touse = type;
    23.7 -                    if (type.getKind() == TypeKind.ANNOTATED) {
    23.8 +                    if (type.isAnnotated()) {
    23.9                          Type.AnnotatedType atype = (Type.AnnotatedType)type;
   23.10                          toreturn = new Type.AnnotatedType(atype.underlyingType);
   23.11                          ((Type.AnnotatedType)toreturn).typeAnnotations = atype.typeAnnotations;
   23.12 @@ -252,7 +252,7 @@
   23.13                  ListBuffer<TypePathEntry> depth = ListBuffer.lb();
   23.14                  depth = depth.append(TypePathEntry.ARRAY);
   23.15                  while (arType.elemtype.hasTag(TypeTag.ARRAY)) {
   23.16 -                    if (arType.elemtype.getKind() == TypeKind.ANNOTATED) {
   23.17 +                    if (arType.elemtype.isAnnotated()) {
   23.18                          Type.AnnotatedType aelemtype = (Type.AnnotatedType) arType.elemtype;
   23.19                          Type.AnnotatedType newAT = new Type.AnnotatedType(aelemtype.underlyingType);
   23.20                          tomodify.elemtype = newAT;

    24.1 --- a/src/share/classes/com/sun/tools/javac/code/Types.java	Thu Mar 28 10:55:14 2013 -0700
    24.2 +++ b/src/share/classes/com/sun/tools/javac/code/Types.java	Mon Apr 01 21:42:15 2013 -0700
    24.3 @@ -1178,6 +1178,17 @@
    24.4              protected boolean containsTypes(List<Type> ts1, List<Type> ts2) {
    24.5                  return isSameTypes(ts1, ts2, true);
    24.6              }
    24.7 +
    24.8 +            @Override
    24.9 +            public Boolean visitWildcardType(WildcardType t, Type s) {
   24.10 +                if (!s.hasTag(WILDCARD)) {
   24.11 +                    return false;
   24.12 +                } else {
   24.13 +                    WildcardType t2 = (WildcardType)s;
   24.14 +                    return t.kind == t2.kind &&
   24.15 +                            isSameType(t.type, t2.type, true);
   24.16 +                }
   24.17 +            }
   24.18          };
   24.19      // </editor-fold>
   24.20  
   24.21 @@ -1418,23 +1429,10 @@
   24.22                      }
   24.23                  }
   24.24  
   24.25 -                if (t.isCompound()) {
   24.26 -                    Warner oldWarner = warnStack.head;
   24.27 -                    warnStack.head = noWarnings;
   24.28 -                    if (!visit(supertype(t), s))
   24.29 -                        return false;
   24.30 -                    for (Type intf : interfaces(t)) {
   24.31 -                        if (!visit(intf, s))
   24.32 -                            return false;
   24.33 -                    }
   24.34 -                    if (warnStack.head.hasLint(LintCategory.UNCHECKED))
   24.35 -                        oldWarner.warn(LintCategory.UNCHECKED);
   24.36 -                    return true;
   24.37 -                }
   24.38 -
   24.39 -                if (s.isCompound()) {
   24.40 -                    // call recursively to reuse the above code
   24.41 -                    return visitClassType((ClassType)s, t);
   24.42 +                if (t.isCompound() || s.isCompound()) {
   24.43 +                    return !t.isCompound() ?
   24.44 +                            visitIntersectionType((IntersectionClassType)s, t, true) :
   24.45 +                            visitIntersectionType((IntersectionClassType)t, s, false);
   24.46                  }
   24.47  
   24.48                  if (s.tag == CLASS || s.tag == ARRAY) {
   24.49 @@ -1512,6 +1510,18 @@
   24.50                  return false;
   24.51              }
   24.52  
   24.53 +            boolean visitIntersectionType(IntersectionClassType ict, Type s, boolean reverse) {
   24.54 +                Warner warn = noWarnings;
   24.55 +                for (Type c : ict.getComponents()) {
   24.56 +                    warn.clear();
   24.57 +                    if (reverse ? !isCastable(s, c, warn) : !isCastable(c, s, warn))
   24.58 +                        return false;
   24.59 +                }
   24.60 +                if (warn.hasLint(LintCategory.UNCHECKED))
   24.61 +                    warnStack.head.warn(LintCategory.UNCHECKED);
   24.62 +                return true;
   24.63 +            }
   24.64 +
   24.65              @Override
   24.66              public Boolean visitArrayType(ArrayType t, Type s) {
   24.67                  switch (s.tag) {
   24.68 @@ -2091,7 +2101,7 @@
   24.69              @Override
   24.70              public Type visitAnnotatedType(AnnotatedType t, Boolean recurse) {
   24.71                  Type erased = erasure(t.underlyingType, recurse);
   24.72 -                if (erased.getKind() == TypeKind.ANNOTATED) {
   24.73 +                if (erased.isAnnotated()) {
   24.74                      // This can only happen when the underlying type is a
   24.75                      // type variable and the upper bound of it is annotated.
   24.76                      // The annotation on the type variable overrides the one
   24.77 @@ -3889,11 +3899,18 @@
   24.78      }
   24.79  
   24.80      private boolean giveWarning(Type from, Type to) {
   24.81 -        Type subFrom = asSub(from, to.tsym);
   24.82 -        return to.isParameterized() &&
   24.83 -                (!(isUnbounded(to) ||
   24.84 -                isSubtype(from, to) ||
   24.85 -                ((subFrom != null) && containsType(to.allparams(), subFrom.allparams()))));
   24.86 +        List<Type> bounds = to.isCompound() ?
   24.87 +                ((IntersectionClassType)to).getComponents() : List.of(to);
   24.88 +        for (Type b : bounds) {
   24.89 +            Type subFrom = asSub(from, b.tsym);
   24.90 +            if (b.isParameterized() &&
   24.91 +                    (!(isUnbounded(b) ||
   24.92 +                    isSubtype(from, b) ||
   24.93 +                    ((subFrom != null) && containsType(b.allparams(), subFrom.allparams()))))) {
   24.94 +                return true;
   24.95 +            }
   24.96 +        }
   24.97 +        return false;
   24.98      }
   24.99  
  24.100      private List<Type> superClosure(Type t, Type s) {

    25.1 --- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Thu Mar 28 10:55:14 2013 -0700
    25.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Mon Apr 01 21:42:15 2013 -0700
    25.3 @@ -3362,7 +3362,7 @@
    25.4                          Type normOuter = site;
    25.5                          if (normOuter.hasTag(CLASS)) {
    25.6                              normOuter = types.asEnclosingSuper(site, ownOuter.tsym);
    25.7 -                            if (site.getKind() == TypeKind.ANNOTATED) {
    25.8 +                            if (site.isAnnotated()) {
    25.9                                  // Propagate any type annotations.
   25.10                                  // TODO: should asEnclosingSuper do this?
   25.11                                  // Note that the type annotations in site will be updated
   25.12 @@ -4009,8 +4009,7 @@
   25.13                  // Enums may not be extended by source-level classes
   25.14                  if (st.tsym != null &&
   25.15                      ((st.tsym.flags_field & Flags.ENUM) != 0) &&
   25.16 -                    ((c.flags_field & (Flags.ENUM | Flags.COMPOUND)) == 0) &&
   25.17 -                    !target.compilerBootstrap(c)) {
   25.18 +                    ((c.flags_field & (Flags.ENUM | Flags.COMPOUND)) == 0)) {
   25.19                      log.error(env.tree.pos(), "enum.types.not.extensible");
   25.20                  }
   25.21                  attribClassBody(env, c);
   25.22 @@ -4279,7 +4278,7 @@
   25.23              validateAnnotatedType(errtree, type);
   25.24              if (type.tsym != null &&
   25.25                      type.tsym.isStatic() &&
   25.26 -                    type.getAnnotations().nonEmpty()) {
   25.27 +                    type.getAnnotationMirrors().nonEmpty()) {
   25.28                      // Enclosing static classes cannot have type annotations.
   25.29                  log.error(errtree.pos(), "cant.annotate.static.class");
   25.30              }

    26.1 --- a/src/share/classes/com/sun/tools/javac/comp/Check.java	Thu Mar 28 10:55:14 2013 -0700
    26.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Check.java	Mon Apr 01 21:42:15 2013 -0700
    26.3 @@ -2779,25 +2779,17 @@
    26.4      }
    26.5  
    26.6      private void validateTarget(Symbol container, Symbol contained, DiagnosticPosition pos) {
    26.7 -        Attribute.Array containedTarget = getAttributeTargetAttribute(contained);
    26.8 -
    26.9 -        // If contained has no Target, we are done
   26.10 -        if (containedTarget == null) {
   26.11 -            return;
   26.12 -        }
   26.13 -
   26.14 -        // If contained has Target m1, container must have a Target
   26.15 -        // annotation, m2, and m2 must be a subset of m1. (This is
   26.16 -        // trivially true if contained has no target as per above).
   26.17 -
   26.18 -        // contained has target, but container has not, error
   26.19 +        // The set of targets the container is applicable to must be a subset
   26.20 +        // (with respect to annotation target semantics) of the set of targets
   26.21 +        // the contained is applicable to. The target sets may be implicit or
   26.22 +        // explicit.
   26.23 +
   26.24 +        Set<Name> containerTargets;
   26.25          Attribute.Array containerTarget = getAttributeTargetAttribute(container);
   26.26          if (containerTarget == null) {
   26.27 -            log.error(pos, "invalid.repeatable.annotation.incompatible.target", container, contained);
   26.28 -            return;
   26.29 -        }
   26.30 -
   26.31 -        Set<Name> containerTargets = new HashSet<Name>();
   26.32 +            containerTargets = getDefaultTargetSet();
   26.33 +        } else {
   26.34 +            containerTargets = new HashSet<Name>();
   26.35          for (Attribute app : containerTarget.values) {
   26.36              if (!(app instanceof Attribute.Enum)) {
   26.37                  continue; // recovery
   26.38 @@ -2805,8 +2797,14 @@
   26.39              Attribute.Enum e = (Attribute.Enum)app;
   26.40              containerTargets.add(e.value.name);
   26.41          }
   26.42 -
   26.43 -        Set<Name> containedTargets = new HashSet<Name>();
   26.44 +        }
   26.45 +
   26.46 +        Set<Name> containedTargets;
   26.47 +        Attribute.Array containedTarget = getAttributeTargetAttribute(contained);
   26.48 +        if (containedTarget == null) {
   26.49 +            containedTargets = getDefaultTargetSet();
   26.50 +        } else {
   26.51 +            containedTargets = new HashSet<Name>();
   26.52          for (Attribute app : containedTarget.values) {
   26.53              if (!(app instanceof Attribute.Enum)) {
   26.54                  continue; // recovery
   26.55 @@ -2814,20 +2812,42 @@
   26.56              Attribute.Enum e = (Attribute.Enum)app;
   26.57              containedTargets.add(e.value.name);
   26.58          }
   26.59 -
   26.60 -        if (!isTargetSubset(containedTargets, containerTargets)) {
   26.61 +        }
   26.62 +
   26.63 +        if (!isTargetSubsetOf(containerTargets, containedTargets)) {
   26.64              log.error(pos, "invalid.repeatable.annotation.incompatible.target", container, contained);
   26.65          }
   26.66      }
   26.67  
   26.68 -    /** Checks that t is a subset of s, with respect to ElementType
   26.69 +    /* get a set of names for the default target */
   26.70 +    private Set<Name> getDefaultTargetSet() {
   26.71 +        if (defaultTargets == null) {
   26.72 +            Set<Name> targets = new HashSet<Name>();
   26.73 +            targets.add(names.ANNOTATION_TYPE);
   26.74 +            targets.add(names.CONSTRUCTOR);
   26.75 +            targets.add(names.FIELD);
   26.76 +            targets.add(names.LOCAL_VARIABLE);
   26.77 +            targets.add(names.METHOD);
   26.78 +            targets.add(names.PACKAGE);
   26.79 +            targets.add(names.PARAMETER);
   26.80 +            targets.add(names.TYPE);
   26.81 +
   26.82 +            defaultTargets = java.util.Collections.unmodifiableSet(targets);
   26.83 +        }
   26.84 +
   26.85 +        return defaultTargets;
   26.86 +    }
   26.87 +    private Set<Name> defaultTargets;
   26.88 +
   26.89 +
   26.90 +    /** Checks that s is a subset of t, with respect to ElementType
   26.91       * semantics, specifically {ANNOTATION_TYPE} is a subset of {TYPE}
   26.92       */
   26.93 -    private boolean isTargetSubset(Set<Name> s, Set<Name> t) {
   26.94 -        // Check that all elements in t are present in s
   26.95 -        for (Name n2 : t) {
   26.96 +    private boolean isTargetSubsetOf(Set<Name> s, Set<Name> t) {
   26.97 +        // Check that all elements in s are present in t
   26.98 +        for (Name n2 : s) {
   26.99              boolean currentElementOk = false;
  26.100 -            for (Name n1 : s) {
  26.101 +            for (Name n1 : t) {
  26.102                  if (n1 == n2) {
  26.103                      currentElementOk = true;
  26.104                      break;

    27.1 --- a/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java	Thu Mar 28 10:55:14 2013 -0700
    27.2 +++ b/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java	Mon Apr 01 21:42:15 2013 -0700
    27.3 @@ -229,9 +229,9 @@
    27.4          public Type complete(DeferredType dt, ResultInfo resultInfo, DeferredAttrContext deferredAttrContext) {
    27.5              switch (deferredAttrContext.mode) {
    27.6                  case SPECULATIVE:
    27.7 -                    Assert.check(dt.mode == null ||
    27.8 -                            (dt.mode == AttrMode.SPECULATIVE &&
    27.9 -                            dt.speculativeType(deferredAttrContext.msym, deferredAttrContext.phase).hasTag(NONE)));
   27.10 +                    //Note: if a symbol is imported twice we might do two identical
   27.11 +                    //speculative rounds...
   27.12 +                    Assert.check(dt.mode == null || dt.mode == AttrMode.SPECULATIVE);
   27.13                      JCTree speculativeTree = attribSpeculative(dt.tree, dt.env, resultInfo);
   27.14                      dt.speculativeCache.put(deferredAttrContext.msym, speculativeTree, deferredAttrContext.phase);
   27.15                      return speculativeTree.type;

    28.1 --- a/src/share/classes/com/sun/tools/javac/comp/Infer.java	Thu Mar 28 10:55:14 2013 -0700
    28.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Infer.java	Mon Apr 01 21:42:15 2013 -0700
    28.3 @@ -585,11 +585,7 @@
    28.4                  Infer infer = inferenceContext.infer();
    28.5                  for (Type b1 : uv.getBounds(InferenceBound.UPPER)) {
    28.6                      for (Type b2 : uv.getBounds(InferenceBound.LOWER)) {
    28.7 -                        if (!inferenceContext.inferenceVars().contains(b1) &&
    28.8 -                                !inferenceContext.inferenceVars().contains(b2) &&
    28.9 -                                infer.types.asSuper(b2, b1.tsym) != null) {
   28.10 -                            infer.types.isSubtypeUnchecked(inferenceContext.asFree(b2), inferenceContext.asFree(b1));
   28.11 -                        }
   28.12 +                        infer.types.isSubtypeUnchecked(inferenceContext.asFree(b2), inferenceContext.asFree(b1));
   28.13                      }
   28.14                  }
   28.15              }
   28.16 @@ -603,11 +599,7 @@
   28.17                  Infer infer = inferenceContext.infer();
   28.18                  for (Type b1 : uv.getBounds(InferenceBound.UPPER)) {
   28.19                      for (Type b2 : uv.getBounds(InferenceBound.EQ)) {
   28.20 -                        if (!inferenceContext.inferenceVars().contains(b1) &&
   28.21 -                                !inferenceContext.inferenceVars().contains(b2) &&
   28.22 -                                infer.types.asSuper(b2, b1.tsym) != null) {
   28.23 -                            infer.types.isSubtypeUnchecked(inferenceContext.asFree(b2), inferenceContext.asFree(b1));
   28.24 -                        }
   28.25 +                        infer.types.isSubtypeUnchecked(inferenceContext.asFree(b2), inferenceContext.asFree(b1));
   28.26                      }
   28.27                  }
   28.28              }
   28.29 @@ -621,10 +613,22 @@
   28.30                  Infer infer = inferenceContext.infer();
   28.31                  for (Type b1 : uv.getBounds(InferenceBound.EQ)) {
   28.32                      for (Type b2 : uv.getBounds(InferenceBound.LOWER)) {
   28.33 -                        if (!inferenceContext.inferenceVars().contains(b1) &&
   28.34 -                                !inferenceContext.inferenceVars().contains(b2) &&
   28.35 -                                infer.types.asSuper(b2, b1.tsym) != null) {
   28.36 -                            infer.types.isSubtypeUnchecked(inferenceContext.asFree(b2), inferenceContext.asFree(b1));
   28.37 +                        infer.types.isSubtypeUnchecked(inferenceContext.asFree(b2), inferenceContext.asFree(b1));
   28.38 +                    }
   28.39 +                }
   28.40 +            }
   28.41 +        },
   28.42 +        /**
   28.43 +         * Given a bound set containing {@code alpha == S} and {@code alpha == T}
   28.44 +         * perform {@code S == T} (which could lead to new bounds).
   28.45 +         */
   28.46 +        CROSS_EQ_EQ() {
   28.47 +            public void apply(UndetVar uv, InferenceContext inferenceContext, Warner warn) {
   28.48 +                Infer infer = inferenceContext.infer();
   28.49 +                for (Type b1 : uv.getBounds(InferenceBound.EQ)) {
   28.50 +                    for (Type b2 : uv.getBounds(InferenceBound.EQ)) {
   28.51 +                        if (b1 != b2) {
   28.52 +                            infer.types.isSameType(inferenceContext.asFree(b2), inferenceContext.asFree(b1));
   28.53                          }
   28.54                      }
   28.55                  }

    29.1 --- a/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java	Thu Mar 28 10:55:14 2013 -0700
    29.2 +++ b/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java	Mon Apr 01 21:42:15 2013 -0700
    29.3 @@ -1019,14 +1019,14 @@
    29.4              } else if (refSym.enclClass().isInterface()) {
    29.5                  return ClassFile.REF_invokeInterface;
    29.6              } else {
    29.7 -                return ClassFile.REF_invokeVirtual;
    29.8 +                return (refSym.flags() & PRIVATE) != 0 ?
    29.9 +                        ClassFile.REF_invokeSpecial :
   29.10 +                        ClassFile.REF_invokeVirtual;
   29.11              }
   29.12          }
   29.13      }
   29.14  
   29.15 -    // </editor-fold>
   29.16 -
   29.17 -    // <editor-fold defaultstate="collapsed" desc="Lambda/reference analyzer">\
   29.18 +    // <editor-fold defaultstate="collapsed" desc="Lambda/reference analyzer">
   29.19      /**
   29.20       * This visitor collects information about translation of a lambda expression.
   29.21       * More specifically, it keeps track of the enclosing contexts and captured locals
   29.22 @@ -1293,9 +1293,16 @@
   29.23              return names.lambda.append(names.fromString("" + lambdaCount++));
   29.24          }
   29.25  
   29.26 +        /**
   29.27 +         * For a serializable lambda, generate a name which maximizes name
   29.28 +         * stability across deserialization.
   29.29 +         * @param owner
   29.30 +         * @return Name to use for the synthetic lambda method name
   29.31 +         */
   29.32          private Name serializedLambdaName(Symbol owner) {
   29.33              StringBuilder buf = new StringBuilder();
   29.34              buf.append(names.lambda);
   29.35 +            // Append the name of the method enclosing the lambda.
   29.36              String methodName = owner.name.toString();
   29.37              if (methodName.equals("<clinit>"))
   29.38                  methodName = "static";
   29.39 @@ -1303,9 +1310,18 @@
   29.40                  methodName = "new";
   29.41              buf.append(methodName);
   29.42              buf.append('$');
   29.43 -            int methTypeHash = methodSig(owner.type).hashCode();
   29.44 -            buf.append(Integer.toHexString(methTypeHash));
   29.45 +            // Append a hash of the enclosing method signature to differentiate
   29.46 +            // overloaded enclosing methods.  For lambdas enclosed in lambdas,
   29.47 +            // the generated lambda method will not have type yet, but the
   29.48 +            // enclosing method's name will have been generated with this same
   29.49 +            // method, so it will be unique and never be overloaded.
   29.50 +            if (owner.type != null) {
   29.51 +                int methTypeHash = methodSig(owner.type).hashCode();
   29.52 +                buf.append(Integer.toHexString(methTypeHash));
   29.53 +            }
   29.54              buf.append('$');
   29.55 +            // The above appended name components may not be unique, append a
   29.56 +            // count based on the above name components.
   29.57              String temp = buf.toString();
   29.58              Integer count = serializableLambdaCounts.get(temp);
   29.59              if (count == null) {
   29.60 @@ -1619,16 +1635,16 @@
   29.61               * Translate a symbol of a given kind into something suitable for the
   29.62               * synthetic lambda body
   29.63               */
   29.64 -            Symbol translate(String name, final Symbol sym, LambdaSymbolKind skind) {
   29.65 +            Symbol translate(Name name, final Symbol sym, LambdaSymbolKind skind) {
   29.66                  switch (skind) {
   29.67                      case CAPTURED_THIS:
   29.68                          return sym;  // self represented
   29.69                      case TYPE_VAR:
   29.70                          // Just erase the type var
   29.71 -                        return new VarSymbol(sym.flags(), names.fromString(name),
   29.72 +                        return new VarSymbol(sym.flags(), name,
   29.73                                  types.erasure(sym.type), sym.owner);
   29.74                      case CAPTURED_VAR:
   29.75 -                        return new VarSymbol(SYNTHETIC | FINAL, names.fromString(name), types.erasure(sym.type), translatedSym) {
   29.76 +                        return new VarSymbol(SYNTHETIC | FINAL, name, types.erasure(sym.type), translatedSym) {
   29.77                              @Override
   29.78                              public Symbol baseSymbol() {
   29.79                                  //keep mapping with original captured symbol
   29.80 @@ -1642,27 +1658,27 @@
   29.81  
   29.82              void addSymbol(Symbol sym, LambdaSymbolKind skind) {
   29.83                  Map<Symbol, Symbol> transMap = null;
   29.84 -                String preferredName;
   29.85 +                Name preferredName;
   29.86                  switch (skind) {
   29.87                      case CAPTURED_THIS:
   29.88                          transMap = capturedThis;
   29.89 -                        preferredName = "encl$" + capturedThis.size();
   29.90 +                        preferredName = names.fromString("encl$" + capturedThis.size());
   29.91                          break;
   29.92                      case CAPTURED_VAR:
   29.93                          transMap = capturedLocals;
   29.94 -                        preferredName = "cap$" + capturedLocals.size();
   29.95 +                        preferredName = names.fromString("cap$" + capturedLocals.size());
   29.96                          break;
   29.97                      case LOCAL_VAR:
   29.98                          transMap = lambdaLocals;
   29.99 -                        preferredName = sym.name.toString();
  29.100 +                        preferredName = sym.name;
  29.101                          break;
  29.102                      case PARAM:
  29.103                          transMap = lambdaParams;
  29.104 -                        preferredName = sym.name.toString();
  29.105 +                        preferredName = sym.name;
  29.106                          break;
  29.107                      case TYPE_VAR:
  29.108                          transMap = typeVars;
  29.109 -                        preferredName = sym.name.toString();
  29.110 +                        preferredName = sym.name;
  29.111                          break;
  29.112                      default: throw new AssertionError();
  29.113                  }

    30.1 --- a/src/share/classes/com/sun/tools/javac/comp/Lower.java	Thu Mar 28 10:55:14 2013 -0700
    30.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Lower.java	Mon Apr 01 21:42:15 2013 -0700
    30.3 @@ -2604,11 +2604,6 @@
    30.4  
    30.5          enumDefs.appendList(otherDefs.toList());
    30.6          tree.defs = enumDefs.toList();
    30.7 -
    30.8 -        // Add the necessary members for the EnumCompatibleMode
    30.9 -        if (target.compilerBootstrap(tree.sym)) {
   30.10 -            addEnumCompatibleMembers(tree);
   30.11 -        }
   30.12      }
   30.13          // where
   30.14          private MethodSymbol systemArraycopyMethod;
   30.15 @@ -2657,30 +2652,6 @@
   30.16                  olderasure.getReturnType(),
   30.17                  olderasure.getThrownTypes(),
   30.18                  syms.methodClass);
   30.19 -
   30.20 -            if (target.compilerBootstrap(m.owner)) {
   30.21 -                // Initialize synthetic name field
   30.22 -                Symbol nameVarSym = lookupSynthetic(names.fromString("$name"),
   30.23 -                                                    tree.sym.owner.members());
   30.24 -                JCIdent nameIdent = make.Ident(nameParam.sym);
   30.25 -                JCIdent id1 = make.Ident(nameVarSym);
   30.26 -                JCAssign newAssign = make.Assign(id1, nameIdent);
   30.27 -                newAssign.type = id1.type;
   30.28 -                JCExpressionStatement nameAssign = make.Exec(newAssign);
   30.29 -                nameAssign.type = id1.type;
   30.30 -                tree.body.stats = tree.body.stats.prepend(nameAssign);
   30.31 -
   30.32 -                // Initialize synthetic ordinal field
   30.33 -                Symbol ordinalVarSym = lookupSynthetic(names.fromString("$ordinal"),
   30.34 -                                                       tree.sym.owner.members());
   30.35 -                JCIdent ordIdent = make.Ident(ordParam.sym);
   30.36 -                id1 = make.Ident(ordinalVarSym);
   30.37 -                newAssign = make.Assign(id1, ordIdent);
   30.38 -                newAssign.type = id1.type;
   30.39 -                JCExpressionStatement ordinalAssign = make.Exec(newAssign);
   30.40 -                ordinalAssign.type = id1.type;
   30.41 -                tree.body.stats = tree.body.stats.prepend(ordinalAssign);
   30.42 -            }
   30.43          }
   30.44  
   30.45          JCMethodDecl prevMethodDef = currentMethodDef;
   30.46 @@ -3434,14 +3405,16 @@
   30.47                  tree.expr = make.TypeCast(types.erasure(iterableType), tree.expr);
   30.48              Symbol iterator = lookupMethod(tree.expr.pos(),
   30.49                                             names.iterator,
   30.50 -                                           types.erasure(syms.iterableType),
   30.51 +                                           eType,
   30.52                                             List.<Type>nil());
   30.53              VarSymbol itvar = new VarSymbol(0, names.fromString("i" + target.syntheticNameChar()),
   30.54                                              types.erasure(iterator.type.getReturnType()),
   30.55                                              currentMethodSym);
   30.56 -            JCStatement init = make.
   30.57 -                VarDef(itvar,
   30.58 -                       make.App(make.Select(tree.expr, iterator)));
   30.59 +
   30.60 +             JCStatement init = make.
   30.61 +                VarDef(itvar, make.App(make.Select(tree.expr, iterator)
   30.62 +                     .setType(types.erasure(iterator.type))));
   30.63 +
   30.64              Symbol hasNext = lookupMethod(tree.expr.pos(),
   30.65                                            names.hasNext,
   30.66                                            itvar.type,
   30.67 @@ -3886,168 +3859,4 @@
   30.68          }
   30.69          return translated.toList();
   30.70      }
   30.71 -
   30.72 -    //////////////////////////////////////////////////////////////
   30.73 -    // The following contributed by Borland for bootstrapping purposes
   30.74 -    //////////////////////////////////////////////////////////////
   30.75 -    private void addEnumCompatibleMembers(JCClassDecl cdef) {
   30.76 -        make_at(null);
   30.77 -
   30.78 -        // Add the special enum fields
   30.79 -        VarSymbol ordinalFieldSym = addEnumOrdinalField(cdef);
   30.80 -        VarSymbol nameFieldSym = addEnumNameField(cdef);
   30.81 -
   30.82 -        // Add the accessor methods for name and ordinal
   30.83 -        MethodSymbol ordinalMethodSym = addEnumFieldOrdinalMethod(cdef, ordinalFieldSym);
   30.84 -        MethodSymbol nameMethodSym = addEnumFieldNameMethod(cdef, nameFieldSym);
   30.85 -
   30.86 -        // Add the toString method
   30.87 -        addEnumToString(cdef, nameFieldSym);
   30.88 -
   30.89 -        // Add the compareTo method
   30.90 -        addEnumCompareTo(cdef, ordinalFieldSym);
   30.91 -    }
   30.92 -
   30.93 -    private VarSymbol addEnumOrdinalField(JCClassDecl cdef) {
   30.94 -        VarSymbol ordinal = new VarSymbol(PRIVATE|FINAL|SYNTHETIC,
   30.95 -                                          names.fromString("$ordinal"),
   30.96 -                                          syms.intType,
   30.97 -                                          cdef.sym);
   30.98 -        cdef.sym.members().enter(ordinal);
   30.99 -        cdef.defs = cdef.defs.prepend(make.VarDef(ordinal, null));
  30.100 -        return ordinal;
  30.101 -    }
  30.102 -
  30.103 -    private VarSymbol addEnumNameField(JCClassDecl cdef) {
  30.104 -        VarSymbol name = new VarSymbol(PRIVATE|FINAL|SYNTHETIC,
  30.105 -                                          names.fromString("$name"),
  30.106 -                                          syms.stringType,
  30.107 -                                          cdef.sym);
  30.108 -        cdef.sym.members().enter(name);
  30.109 -        cdef.defs = cdef.defs.prepend(make.VarDef(name, null));
  30.110 -        return name;
  30.111 -    }
  30.112 -
  30.113 -    private MethodSymbol addEnumFieldOrdinalMethod(JCClassDecl cdef, VarSymbol ordinalSymbol) {
  30.114 -        // Add the accessor methods for ordinal
  30.115 -        Symbol ordinalSym = lookupMethod(cdef.pos(),
  30.116 -                                         names.ordinal,
  30.117 -                                         cdef.type,
  30.118 -                                         List.<Type>nil());
  30.119 -
  30.120 -        Assert.check(ordinalSym instanceof MethodSymbol);
  30.121 -
  30.122 -        JCStatement ret = make.Return(make.Ident(ordinalSymbol));
  30.123 -        cdef.defs = cdef.defs.append(make.MethodDef((MethodSymbol)ordinalSym,
  30.124 -                                                    make.Block(0L, List.of(ret))));
  30.125 -
  30.126 -        return (MethodSymbol)ordinalSym;
  30.127 -    }
  30.128 -
  30.129 -    private MethodSymbol addEnumFieldNameMethod(JCClassDecl cdef, VarSymbol nameSymbol) {
  30.130 -        // Add the accessor methods for name
  30.131 -        Symbol nameSym = lookupMethod(cdef.pos(),
  30.132 -                                   names._name,
  30.133 -                                   cdef.type,
  30.134 -                                   List.<Type>nil());
  30.135 -
  30.136 -        Assert.check(nameSym instanceof MethodSymbol);
  30.137 -
  30.138 -        JCStatement ret = make.Return(make.Ident(nameSymbol));
  30.139 -
  30.140 -        cdef.defs = cdef.defs.append(make.MethodDef((MethodSymbol)nameSym,
  30.141 -                                                    make.Block(0L, List.of(ret))));
  30.142 -
  30.143 -        return (MethodSymbol)nameSym;
  30.144 -    }
  30.145 -
  30.146 -    private MethodSymbol addEnumToString(JCClassDecl cdef,
  30.147 -                                         VarSymbol nameSymbol) {
  30.148 -        Symbol toStringSym = lookupMethod(cdef.pos(),
  30.149 -                                          names.toString,
  30.150 -                                          cdef.type,
  30.151 -                                          List.<Type>nil());
  30.152 -
  30.153 -        JCTree toStringDecl = null;
  30.154 -        if (toStringSym != null)
  30.155 -            toStringDecl = TreeInfo.declarationFor(toStringSym, cdef);
  30.156 -
  30.157 -        if (toStringDecl != null)
  30.158 -            return (MethodSymbol)toStringSym;
  30.159 -
  30.160 -        JCStatement ret = make.Return(make.Ident(nameSymbol));
  30.161 -
  30.162 -        JCTree resTypeTree = make.Type(syms.stringType);
  30.163 -
  30.164 -        MethodType toStringType = new MethodType(List.<Type>nil(),
  30.165 -                                                 syms.stringType,
  30.166 -                                                 List.<Type>nil(),
  30.167 -                                                 cdef.sym);
  30.168 -        toStringSym = new MethodSymbol(PUBLIC,
  30.169 -                                       names.toString,
  30.170 -                                       toStringType,
  30.171 -                                       cdef.type.tsym);
  30.172 -        toStringDecl = make.MethodDef((MethodSymbol)toStringSym,
  30.173 -                                      make.Block(0L, List.of(ret)));
  30.174 -
  30.175 -        cdef.defs = cdef.defs.prepend(toStringDecl);
  30.176 -        cdef.sym.members().enter(toStringSym);
  30.177 -
  30.178 -        return (MethodSymbol)toStringSym;
  30.179 -    }
  30.180 -
  30.181 -    private MethodSymbol addEnumCompareTo(JCClassDecl cdef, VarSymbol ordinalSymbol) {
  30.182 -        Symbol compareToSym = lookupMethod(cdef.pos(),
  30.183 -                                   names.compareTo,
  30.184 -                                   cdef.type,
  30.185 -                                   List.of(cdef.sym.type));
  30.186 -
  30.187 -        Assert.check(compareToSym instanceof MethodSymbol);
  30.188 -
  30.189 -        JCMethodDecl compareToDecl = (JCMethodDecl) TreeInfo.declarationFor(compareToSym, cdef);
  30.190 -
  30.191 -        ListBuffer<JCStatement> blockStatements = new ListBuffer<JCStatement>();
  30.192 -
  30.193 -        JCModifiers mod1 = make.Modifiers(0L);
  30.194 -        Name oName = names.fromString("o");
  30.195 -        JCVariableDecl par1 = make.Param(oName, cdef.type, compareToSym);
  30.196 -
  30.197 -        JCIdent paramId1 = make.Ident(names.java_lang_Object);
  30.198 -        paramId1.type = cdef.type;
  30.199 -        paramId1.sym = par1.sym;
  30.200 -
  30.201 -        ((MethodSymbol)compareToSym).params = List.of(par1.sym);
  30.202 -
  30.203 -        JCIdent par1UsageId = make.Ident(par1.sym);
  30.204 -        JCIdent castTargetIdent = make.Ident(cdef.sym);
  30.205 -        JCTypeCast cast = make.TypeCast(castTargetIdent, par1UsageId);
  30.206 -        cast.setType(castTargetIdent.type);
  30.207 -
  30.208 -        Name otherName = names.fromString("other");
  30.209 -
  30.210 -        VarSymbol otherVarSym = new VarSymbol(mod1.flags,
  30.211 -                                              otherName,
  30.212 -                                              cdef.type,
  30.213 -                                              compareToSym);
  30.214 -        JCVariableDecl otherVar = make.VarDef(otherVarSym, cast);
  30.215 -        blockStatements.append(otherVar);
  30.216 -
  30.217 -        JCIdent id1 = make.Ident(ordinalSymbol);
  30.218 -
  30.219 -        JCIdent fLocUsageId = make.Ident(otherVarSym);
  30.220 -        JCExpression sel = make.Select(fLocUsageId, ordinalSymbol);
  30.221 -        JCBinary bin = makeBinary(MINUS, id1, sel);
  30.222 -        JCReturn ret = make.Return(bin);
  30.223 -        blockStatements.append(ret);
  30.224 -        JCMethodDecl compareToMethod = make.MethodDef((MethodSymbol)compareToSym,
  30.225 -                                                   make.Block(0L,
  30.226 -                                                              blockStatements.toList()));
  30.227 -        compareToMethod.params = List.of(par1);
  30.228 -        cdef.defs = cdef.defs.append(compareToMethod);
  30.229 -
  30.230 -        return (MethodSymbol)compareToSym;
  30.231 -    }
  30.232 -    //////////////////////////////////////////////////////////////
  30.233 -    // The above contributed by Borland for bootstrapping purposes
  30.234 -    //////////////////////////////////////////////////////////////
  30.235  }

    31.1 --- a/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java	Thu Mar 28 10:55:14 2013 -0700
    31.2 +++ b/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java	Mon Apr 01 21:42:15 2013 -0700
    31.3 @@ -473,44 +473,6 @@
    31.4                        null, //make.Block(0, Tree.emptyList.prepend(make.Return(make.Ident(names._null)))),
    31.5                        null);
    31.6          memberEnter(valueOf, env);
    31.7 -
    31.8 -        // the remaining members are for bootstrapping only
    31.9 -        if (!target.compilerBootstrap(tree.sym)) return;
   31.10 -
   31.11 -        // public final int ordinal() { return ???; }
   31.12 -        JCMethodDecl ordinal = make.at(tree.pos).
   31.13 -            MethodDef(make.Modifiers(Flags.PUBLIC|Flags.FINAL),
   31.14 -                      names.ordinal,
   31.15 -                      make.Type(syms.intType),
   31.16 -                      List.<JCTypeParameter>nil(),
   31.17 -                      List.<JCVariableDecl>nil(),
   31.18 -                      List.<JCExpression>nil(),
   31.19 -                      null,
   31.20 -                      null);
   31.21 -        memberEnter(ordinal, env);
   31.22 -
   31.23 -        // public final String name() { return ???; }
   31.24 -        JCMethodDecl name = make.
   31.25 -            MethodDef(make.Modifiers(Flags.PUBLIC|Flags.FINAL),
   31.26 -                      names._name,
   31.27 -                      make.Type(syms.stringType),
   31.28 -                      List.<JCTypeParameter>nil(),
   31.29 -                      List.<JCVariableDecl>nil(),
   31.30 -                      List.<JCExpression>nil(),
   31.31 -                      null,
   31.32 -                      null);
   31.33 -        memberEnter(name, env);
   31.34 -
   31.35 -        // public int compareTo(E other) { return ???; }
   31.36 -        MethodSymbol compareTo = new
   31.37 -            MethodSymbol(Flags.PUBLIC,
   31.38 -                         names.compareTo,
   31.39 -                         new MethodType(List.of(tree.sym.type),
   31.40 -                                        syms.intType,
   31.41 -                                        List.<Type>nil(),
   31.42 -                                        syms.methodClass),
   31.43 -                         tree.sym);
   31.44 -        memberEnter(make.MethodDef(compareTo, null), env);
   31.45      }
   31.46  
   31.47      public void visitTopLevel(JCCompilationUnit tree) {
   31.48 @@ -936,7 +898,7 @@
   31.49              Type supertype =
   31.50                  (tree.extending != null)
   31.51                  ? attr.attribBase(tree.extending, baseEnv, true, false, true)
   31.52 -                : ((tree.mods.flags & Flags.ENUM) != 0 && !target.compilerBootstrap(c))
   31.53 +                : ((tree.mods.flags & Flags.ENUM) != 0)
   31.54                  ? attr.attribBase(enumBase(tree.pos, c), baseEnv,
   31.55                                    true, false, false)
   31.56                  : (c.fullname == names.java_lang_Object)
   31.57 @@ -949,16 +911,6 @@
   31.58              ListBuffer<Type> all_interfaces = null; // lazy init
   31.59              Set<Type> interfaceSet = new HashSet<Type>();
   31.60              List<JCExpression> interfaceTrees = tree.implementing;
   31.61 -            if ((tree.mods.flags & Flags.ENUM) != 0 && target.compilerBootstrap(c)) {
   31.62 -                // add interface Comparable<T>
   31.63 -                interfaceTrees =
   31.64 -                    interfaceTrees.prepend(make.Type(new ClassType(syms.comparableType.getEnclosingType(),
   31.65 -                                                                   List.of(c.type),
   31.66 -                                                                   syms.comparableType.tsym)));
   31.67 -                // add interface Serializable
   31.68 -                interfaceTrees =
   31.69 -                    interfaceTrees.prepend(make.Type(syms.serializableType));
   31.70 -            }
   31.71              for (JCExpression iface : interfaceTrees) {
   31.72                  Type i = attr.attribBase(iface, baseEnv, false, true, true);
   31.73                  if (i.hasTag(CLASS)) {
   31.74 @@ -1401,8 +1353,7 @@
   31.75          if (c.type != syms.objectType)
   31.76              stats = stats.prepend(SuperCall(make, typarams, params, based));
   31.77          if ((c.flags() & ENUM) != 0 &&
   31.78 -            (types.supertype(c.type).tsym == syms.enumSym ||
   31.79 -             target.compilerBootstrap(c))) {
   31.80 +            (types.supertype(c.type).tsym == syms.enumSym)) {
   31.81              // constructors of true enums are private
   31.82              flags = (flags & ~AccessFlags) | PRIVATE | GENERATEDCONSTR;
   31.83          } else

    32.1 --- a/src/share/classes/com/sun/tools/javac/jvm/Target.java	Thu Mar 28 10:55:14 2013 -0700
    32.2 +++ b/src/share/classes/com/sun/tools/javac/jvm/Target.java	Mon Apr 01 21:42:15 2013 -0700
    32.3 @@ -1,5 +1,5 @@
    32.4  /*
    32.5 - * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
    32.6 + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
    32.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    32.8   *
    32.9   * This code is free software; you can redistribute it and/or modify it
   32.10 @@ -48,17 +48,6 @@
   32.11      /** J2SE1.4 = Merlin. */
   32.12      JDK1_4("1.4", 48, 0),
   32.13  
   32.14 -    /** Support for the JSR14 prototype compiler (targeting 1.4 VMs
   32.15 -     *  augmented with a few support classes).  This is a transitional
   32.16 -     *  option that will not be supported in the product.  */
   32.17 -    JSR14("jsr14", 48, 0),
   32.18 -
   32.19 -    /** The following are undocumented transitional targets that we
   32.20 -     *  had used to test VM fixes in update releases.  We do not
   32.21 -     *  promise to retain support for them.  */
   32.22 -    JDK1_4_1("1.4.1", 48, 0),
   32.23 -    JDK1_4_2("1.4.2", 48, 0),
   32.24 -
   32.25      /** Tiger. */
   32.26      JDK1_5("1.5", 49, 0),
   32.27  
   32.28 @@ -175,23 +164,23 @@
   32.29          return compareTo(JDK1_5) >= 0;
   32.30      }
   32.31  
   32.32 -    /** Beginning in -target 1.4.2, we make synthetic variables
   32.33 +    /** Beginning in -target 1.5, we make synthetic variables
   32.34       *  package-private instead of private.  This is to prevent the
   32.35       *  necessity of access methods, which effectively relax the
   32.36       *  protection of the field but bloat the class files and affect
   32.37       *  execution.
   32.38       */
   32.39      public boolean usePrivateSyntheticFields() {
   32.40 -        return compareTo(JDK1_4_2) < 0;
   32.41 +        return compareTo(JDK1_5) < 0;
   32.42      }
   32.43  
   32.44      /** Sometimes we need to create a field to cache a value like a
   32.45 -     *  class literal of the assertions flag.  In -target 1.4.2 and
   32.46 +     *  class literal of the assertions flag.  In -target 1.5 and
   32.47       *  later we create a new synthetic class for this instead of
   32.48       *  using the outermost class.  See 4401576.
   32.49       */
   32.50      public boolean useInnerCacheClass() {
   32.51 -        return compareTo(JDK1_4_2) >= 0;
   32.52 +        return compareTo(JDK1_5) >= 0;
   32.53      }
   32.54  
   32.55      /** Return true if cldc-style stack maps need to be generated. */
   32.56 @@ -276,7 +265,7 @@
   32.57       *  See 4468823
   32.58       */
   32.59      public boolean classLiteralsNoInit() {
   32.60 -        return compareTo(JDK1_4_2) >= 0;
   32.61 +        return compareTo(JDK1_5) >= 0;
   32.62      }
   32.63  
   32.64      /** Although we may not have support for class literals, when we
   32.65 @@ -300,22 +289,10 @@
   32.66          return compareTo(JDK1_5) >= 0;
   32.67      }
   32.68  
   32.69 -    /** For bootstrapping javac only, we do without java.lang.Enum if
   32.70 -     *  necessary.
   32.71 -     */
   32.72 -    public boolean compilerBootstrap(Symbol c) {
   32.73 -        return
   32.74 -            this == JSR14 &&
   32.75 -            (c.flags() & Flags.ENUM) != 0 &&
   32.76 -            c.flatName().toString().startsWith("com.sun.tools.")
   32.77 -            // && !Target.class.getSuperclass().getName().equals("java.lang.Enum")
   32.78 -            ;
   32.79 -    }
   32.80 -
   32.81      /** In J2SE1.5.0, we introduced the "EnclosingMethod" attribute
   32.82       *  for improved reflection support.
   32.83       */
   32.84      public boolean hasEnclosingMethodAttribute() {
   32.85 -        return compareTo(JDK1_5) >= 0 || this == JSR14;
   32.86 +        return compareTo(JDK1_5) >= 0;
   32.87      }
   32.88  }

    33.1 --- a/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java	Thu Mar 28 10:55:14 2013 -0700
    33.2 +++ b/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java	Mon Apr 01 21:42:15 2013 -0700
    33.3 @@ -1,5 +1,5 @@
    33.4  /*
    33.5 - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
    33.6 + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
    33.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    33.8   *
    33.9   * This code is free software; you can redistribute it and/or modify it
   33.10 @@ -273,7 +273,7 @@
   33.11  
   33.12      /**
   33.13       * ExceptionProxy for MirroredTypeException.
   33.14 -     * The toString, hashCode, and equals methods foward to the underlying
   33.15 +     * The toString, hashCode, and equals methods forward to the underlying
   33.16       * type.
   33.17       */
   33.18      private static final class MirroredTypeExceptionProxy extends ExceptionProxy {

    34.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    34.2 +++ b/src/share/classes/com/sun/tools/javac/model/JavacAnnoConstructs.java	Mon Apr 01 21:42:15 2013 -0700
    34.3 @@ -0,0 +1,412 @@
    34.4 +/*
    34.5 + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
    34.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    34.7 + *
    34.8 + * This code is free software; you can redistribute it and/or modify it
    34.9 + * under the terms of the GNU General Public License version 2 only, as
   34.10 + * published by the Free Software Foundation.  Oracle designates this
   34.11 + * particular file as subject to the "Classpath" exception as provided
   34.12 + * by Oracle in the LICENSE file that accompanied this code.
   34.13 + *
   34.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   34.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   34.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   34.17 + * version 2 for more details (a copy is included in the LICENSE file that
   34.18 + * accompanied this code).
   34.19 + *
   34.20 + * You should have received a copy of the GNU General Public License version
   34.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   34.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   34.23 + *
   34.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   34.25 + * or visit www.oracle.com if you need additional information or have any
   34.26 + * questions.
   34.27 + */
   34.28 +package com.sun.tools.javac.model;
   34.29 +
   34.30 +import java.lang.annotation.Annotation;
   34.31 +import java.lang.annotation.Inherited;
   34.32 +import java.lang.reflect.InvocationTargetException;
   34.33 +import java.lang.reflect.Method;
   34.34 +
   34.35 +import com.sun.tools.javac.code.Attribute;
   34.36 +import com.sun.tools.javac.code.Kinds;
   34.37 +import com.sun.tools.javac.code.Symbol;
   34.38 +import com.sun.tools.javac.code.Symbol.ClassSymbol;
   34.39 +import com.sun.tools.javac.code.Type;
   34.40 +import com.sun.tools.javac.code.Type.AnnotatedType;
   34.41 +import com.sun.tools.javac.util.ListBuffer;
   34.42 +import static com.sun.tools.javac.code.TypeTag.CLASS;
   34.43 +
   34.44 +/**
   34.45 + * Utility methods for operating on annotated constructs.
   34.46 + *
   34.47 + * <p><b>This is NOT part of any supported API.
   34.48 + * If you write code that depends on this, you do so at your own
   34.49 + * risk.  This code and its internal interfaces are subject to change
   34.50 + * or deletion without notice.</b></p>
   34.51 + */
   34.52 +public class JavacAnnoConstructs {
   34.53 +
   34.54 +    // <editor-fold defaultstate="collapsed" desc="Symbols">
   34.55 +
   34.56 +    /**
   34.57 +     * An internal-use utility that creates a runtime view of an
   34.58 +     * annotation. This is the implementation of
   34.59 +     * Element.getAnnotation(Class).
   34.60 +     */
   34.61 +    public static <A extends Annotation> A getAnnotation(Symbol annotated,
   34.62 +                                                         Class<A> annoType) {
   34.63 +        if (!annoType.isAnnotation())
   34.64 +            throw new IllegalArgumentException("Not an annotation type: "
   34.65 +                                               + annoType);
   34.66 +        Attribute.Compound c;
   34.67 +        if (annotated.kind == Kinds.TYP && annotated instanceof ClassSymbol) {
   34.68 +            c = getAttributeOnClass((ClassSymbol)annotated, annoType);
   34.69 +        } else {
   34.70 +            c = getAttribute(annotated, annoType);
   34.71 +        }
   34.72 +        return c == null ? null : AnnotationProxyMaker.generateAnnotation(c, annoType);
   34.73 +    }
   34.74 +
   34.75 +    // Helper to getAnnotation[s]
   34.76 +    private static <A extends Annotation> Attribute.Compound getAttribute(Symbol annotated,
   34.77 +                                                                          Class<A> annoType) {
   34.78 +        String name = annoType.getName();
   34.79 +
   34.80 +        for (Attribute.Compound anno : annotated.getRawAttributes()) {
   34.81 +            if (name.equals(anno.type.tsym.flatName().toString()))
   34.82 +                return anno;
   34.83 +        }
   34.84 +
   34.85 +        return null;
   34.86 +    }
   34.87 +
   34.88 +    // Helper to getAnnotation[s]
   34.89 +    private static <A extends Annotation> Attribute.Compound getAttributeOnClass(ClassSymbol annotated,
   34.90 +                                                                Class<A> annoType) {
   34.91 +        boolean inherited = annoType.isAnnotationPresent(Inherited.class);
   34.92 +        Attribute.Compound result = null;
   34.93 +        while (annotated.name != annotated.name.table.names.java_lang_Object) {
   34.94 +            result = getAttribute(annotated, annoType);
   34.95 +            if (result != null || !inherited)
   34.96 +                break;
   34.97 +            Type sup = annotated.getSuperclass();
   34.98 +            if (!sup.hasTag(CLASS) || sup.isErroneous())
   34.99 +                break;
  34.100 +            annotated = (ClassSymbol) sup.tsym;
  34.101 +        }
  34.102 +        return result;
  34.103 +    }
  34.104 +
  34.105 +    /**
  34.106 +     * An internal-use utility that creates a runtime view of
  34.107 +     * annotations. This is the implementation of
  34.108 +     * Element.getAnnotations(Class).
  34.109 +     */
  34.110 +    public static <A extends Annotation> A[] getAnnotations(Symbol annotated,
  34.111 +                                                            Class<A> annoType) {
  34.112 +        if (!annoType.isAnnotation())
  34.113 +            throw new IllegalArgumentException("Not an annotation type: "
  34.114 +                                               + annoType);
  34.115 +        // If annoType does not declare a container this is equivalent to wrapping
  34.116 +        // getAnnotation(...) in an array.
  34.117 +        Class <? extends Annotation> containerType = getContainer(annoType);
  34.118 +        if (containerType == null) {
  34.119 +            A res = getAnnotation(annotated, annoType);
  34.120 +            int size;
  34.121 +            if (res == null) {
  34.122 +                size = 0;
  34.123 +            } else {
  34.124 +                size = 1;
  34.125 +            }
  34.126 +            @SuppressWarnings("unchecked") // annoType is the Class for A
  34.127 +            A[] arr = (A[])java.lang.reflect.Array.newInstance(annoType, size);
  34.128 +            if (res != null)
  34.129 +                arr[0] = res;
  34.130 +            return arr;
  34.131 +        }
  34.132 +
  34.133 +        // So we have a containing type
  34.134 +        String name = annoType.getName();
  34.135 +        String annoTypeName = annoType.getSimpleName();
  34.136 +        String containerTypeName = containerType.getSimpleName();
  34.137 +        int directIndex = -1, containerIndex = -1;
  34.138 +        Attribute.Compound direct = null, container = null;
  34.139 +        Attribute.Compound[] rawAttributes = annotated.getRawAttributes().toArray(new Attribute.Compound[0]);
  34.140 +
  34.141 +        // Find directly present annotations
  34.142 +        for (int i = 0; i < rawAttributes.length; i++) {
  34.143 +            if (annoTypeName.equals(rawAttributes[i].type.tsym.flatName().toString())) {
  34.144 +                directIndex = i;
  34.145 +                direct = rawAttributes[i];
  34.146 +            } else if(containerTypeName != null &&
  34.147 +                      containerTypeName.equals(rawAttributes[i].type.tsym.flatName().toString())) {
  34.148 +                containerIndex = i;
  34.149 +                container = rawAttributes[i];
  34.150 +            }
  34.151 +        }
  34.152 +
  34.153 +        // Deal with inherited annotations
  34.154 +        if (annotated.kind == Kinds.TYP &&
  34.155 +                (annotated instanceof ClassSymbol)) {
  34.156 +            ClassSymbol s = (ClassSymbol)annotated;
  34.157 +            if (direct == null && container == null) {
  34.158 +                direct = getAttributeOnClass(s, annoType);
  34.159 +                container = getAttributeOnClass(s, containerType);
  34.160 +
  34.161 +                // both are inherited and found, put container last
  34.162 +                if (direct != null && container != null) {
  34.163 +                    directIndex = 0;
  34.164 +                    containerIndex = 1;
  34.165 +                } else if (direct != null) {
  34.166 +                    directIndex = 0;
  34.167 +                } else {
  34.168 +                    containerIndex = 0;
  34.169 +                }
  34.170 +            } else if (direct == null) {
  34.171 +                direct = getAttributeOnClass(s, annoType);
  34.172 +                if (direct != null)
  34.173 +                    directIndex = containerIndex + 1;
  34.174 +            } else if (container == null) {
  34.175 +                container = getAttributeOnClass(s, containerType);
  34.176 +                if (container != null)
  34.177 +                    containerIndex = directIndex + 1;
  34.178 +            }
  34.179 +        }
  34.180 +
  34.181 +        // Pack them in an array
  34.182 +        Attribute[] contained0 = new Attribute[0];
  34.183 +        if (container != null)
  34.184 +            contained0 = unpackAttributes(container);
  34.185 +        ListBuffer<Attribute.Compound> compounds = ListBuffer.lb();
  34.186 +        for (Attribute a : contained0)
  34.187 +            if (a instanceof Attribute.Compound)
  34.188 +                compounds = compounds.append((Attribute.Compound)a);
  34.189 +        Attribute.Compound[] contained = compounds.toArray(new Attribute.Compound[0]);
  34.190 +
  34.191 +        int size = (direct == null ? 0 : 1) + contained.length;
  34.192 +        @SuppressWarnings("unchecked") // annoType is the Class for A
  34.193 +        A[] arr = (A[])java.lang.reflect.Array.newInstance(annoType, size);
  34.194 +
  34.195 +        // if direct && container, which is first?
  34.196 +        int insert = -1;
  34.197 +        int length = arr.length;
  34.198 +        if (directIndex >= 0 && containerIndex >= 0) {
  34.199 +            if (directIndex < containerIndex) {
  34.200 +                arr[0] = AnnotationProxyMaker.generateAnnotation(direct, annoType);
  34.201 +                insert = 1;
  34.202 +            } else {
  34.203 +                arr[arr.length - 1] = AnnotationProxyMaker.generateAnnotation(direct, annoType);
  34.204 +                insert = 0;
  34.205 +                length--;
  34.206 +            }
  34.207 +        } else if (directIndex >= 0) {
  34.208 +            arr[0] = AnnotationProxyMaker.generateAnnotation(direct, annoType);
  34.209 +            return arr;
  34.210 +        } else {
  34.211 +            // Only container
  34.212 +            insert = 0;
  34.213 +        }
  34.214 +
  34.215 +        for (int i = 0; i + insert < length; i++)
  34.216 +            arr[insert + i] = AnnotationProxyMaker.generateAnnotation(contained[i], annoType);
  34.217 +
  34.218 +        return arr;
  34.219 +    }
  34.220 +
  34.221 +    // </editor-fold>
  34.222 +
  34.223 +    // <editor-fold defaultstate="collapsed" desc="Types">
  34.224 +
  34.225 +    /**
  34.226 +     * An internal-use utility that creates a runtime view of an
  34.227 +     * annotation. This is the implementation of
  34.228 +     * TypeMirror.getAnnotation(Class).
  34.229 +     */
  34.230 +    public static <A extends Annotation> A getAnnotation(AnnotatedType annotated, Class<A> annoType) {
  34.231 +        if (!annoType.isAnnotation())
  34.232 +            throw new IllegalArgumentException("Not an annotation type: "
  34.233 +                                               + annoType);
  34.234 +        Attribute.Compound c = getAttribute(annotated, annoType);
  34.235 +        return c == null ? null : AnnotationProxyMaker.generateAnnotation(c, annoType);
  34.236 +    }
  34.237 +
  34.238 +    // Helper to getAnnotation[s]
  34.239 +    private static <A extends Annotation> Attribute.Compound getAttribute(Type annotated,
  34.240 +                                                                          Class<A> annoType) {
  34.241 +        String name = annoType.getName();
  34.242 +
  34.243 +        for (Attribute.Compound anno : annotated.getAnnotationMirrors()) {
  34.244 +            if (name.equals(anno.type.tsym.flatName().toString()))
  34.245 +                return anno;
  34.246 +        }
  34.247 +
  34.248 +        return null;
  34.249 +    }
  34.250 +
  34.251 +    /**
  34.252 +     * An internal-use utility that creates a runtime view of
  34.253 +     * annotations. This is the implementation of
  34.254 +     * TypeMirror.getAnnotationsByType(Class).
  34.255 +     */
  34.256 +    public static <A extends Annotation> A[] getAnnotationsByType(AnnotatedType annotated, Class<A> annoType) {
  34.257 +        if (!annoType.isAnnotation())
  34.258 +            throw new IllegalArgumentException("Not an annotation type: "
  34.259 +                                               + annoType);
  34.260 +        // If annoType does not declare a container this is equivalent to wrapping
  34.261 +        // getAnnotation(...) in an array.
  34.262 +        Class <? extends Annotation> containerType = getContainer(annoType);
  34.263 +        if (containerType == null) {
  34.264 +            A res = getAnnotation(annotated, annoType);
  34.265 +            int size;
  34.266 +            if (res == null) {
  34.267 +                size = 0;
  34.268 +            } else {
  34.269 +                size = 1;
  34.270 +            }
  34.271 +            @SuppressWarnings("unchecked") // annoType is the Class for A
  34.272 +            A[] arr = (A[])java.lang.reflect.Array.newInstance(annoType, size);
  34.273 +            if (res != null)
  34.274 +                arr[0] = res;
  34.275 +            return arr;
  34.276 +        }
  34.277 +
  34.278 +        // So we have a containing type
  34.279 +        String name = annoType.getName();
  34.280 +        String annoTypeName = annoType.getSimpleName();
  34.281 +        String containerTypeName = containerType.getSimpleName();
  34.282 +        int directIndex = -1, containerIndex = -1;
  34.283 +        Attribute.Compound direct = null, container = null;
  34.284 +        Attribute.Compound[] rawAttributes = annotated.getAnnotationMirrors().toArray(new Attribute.Compound[0]);
  34.285 +
  34.286 +        // Find directly present annotations
  34.287 +        for (int i = 0; i < rawAttributes.length; i++) {
  34.288 +            if (annoTypeName.equals(rawAttributes[i].type.tsym.flatName().toString())) {
  34.289 +                directIndex = i;
  34.290 +                direct = rawAttributes[i];
  34.291 +            } else if(containerTypeName != null &&
  34.292 +                      containerTypeName.equals(rawAttributes[i].type.tsym.flatName().toString())) {
  34.293 +                containerIndex = i;
  34.294 +                container = rawAttributes[i];
  34.295 +            }
  34.296 +        }
  34.297 +
  34.298 +        // Pack them in an array
  34.299 +        Attribute[] contained0 = new Attribute[0];
  34.300 +        if (container != null)
  34.301 +            contained0 = unpackAttributes(container);
  34.302 +        ListBuffer<Attribute.Compound> compounds = ListBuffer.lb();
  34.303 +        for (Attribute a : contained0) {
  34.304 +            if (a instanceof Attribute.Compound)
  34.305 +                compounds = compounds.append((Attribute.Compound)a);
  34.306 +        }
  34.307 +        Attribute.Compound[] contained = compounds.toArray(new Attribute.Compound[0]);
  34.308 +
  34.309 +        int size = (direct == null ? 0 : 1) + contained.length;
  34.310 +        @SuppressWarnings("unchecked") // annoType is the Class for A
  34.311 +        A[] arr = (A[])java.lang.reflect.Array.newInstance(annoType, size);
  34.312 +
  34.313 +        // if direct && container, which is first?
  34.314 +        int insert = -1;
  34.315 +        int length = arr.length;
  34.316 +        if (directIndex >= 0 && containerIndex >= 0) {
  34.317 +            if (directIndex < containerIndex) {
  34.318 +                arr[0] = AnnotationProxyMaker.generateAnnotation(direct, annoType);
  34.319 +                insert = 1;
  34.320 +            } else {
  34.321 +                arr[arr.length - 1] = AnnotationProxyMaker.generateAnnotation(direct, annoType);
  34.322 +                insert = 0;
  34.323 +                length--;
  34.324 +            }
  34.325 +        } else if (directIndex >= 0) {
  34.326 +            arr[0] = AnnotationProxyMaker.generateAnnotation(direct, annoType);
  34.327 +            return arr;
  34.328 +        } else {
  34.329 +            // Only container
  34.330 +            insert = 0;
  34.331 +        }
  34.332 +
  34.333 +        for (int i = 0; i + insert < length; i++)
  34.334 +            arr[insert + i] = AnnotationProxyMaker.generateAnnotation(contained[i], annoType);
  34.335 +
  34.336 +        return arr;
  34.337 +    }
  34.338 +
  34.339 +    // </editor-fold>
  34.340 +
  34.341 +    // <editor-fold defaultstate="collapsed" desc="Container support">
  34.342 +
  34.343 +    // Needed to unpack the runtime view of containing annotations
  34.344 +    private static final Class<? extends Annotation> REPEATABLE_CLASS = initRepeatable();
  34.345 +    private static final Method VALUE_ELEMENT_METHOD = initValueElementMethod();
  34.346 +
  34.347 +    private static Class<? extends Annotation> initRepeatable() {
  34.348 +        try {
  34.349 +            // Repeatable will not be available when bootstrapping on
  34.350 +            // JDK 7 so use a reflective lookup instead of a class
  34.351 +            // literal for Repeatable.class.
  34.352 +            return Class.forName("java.lang.annotation.Repeatable").asSubclass(Annotation.class);
  34.353 +        } catch (ClassNotFoundException e) {
  34.354 +            return null;
  34.355 +        } catch (SecurityException e) {
  34.356 +            return null;
  34.357 +        }
  34.358 +    }
  34.359 +
  34.360 +    private static Method initValueElementMethod() {
  34.361 +        if (REPEATABLE_CLASS == null)
  34.362 +            return null;
  34.363 +
  34.364 +        Method m = null;
  34.365 +        try {
  34.366 +            m = REPEATABLE_CLASS.getMethod("value");
  34.367 +            if (m != null)
  34.368 +                m.setAccessible(true);
  34.369 +            return m;
  34.370 +        } catch (NoSuchMethodException e) {
  34.371 +            return null;
  34.372 +        }
  34.373 +    }
  34.374 +
  34.375 +    // Helper to getAnnotations
  34.376 +    private static Class<? extends Annotation> getContainer(Class<? extends Annotation> annoType) {
  34.377 +        // Since we can not refer to java.lang.annotation.Repeatable until we are
  34.378 +        // bootstrapping with java 8 we need to get the Repeatable annotation using
  34.379 +        // reflective invocations instead of just using its type and element method.
  34.380 +        if (REPEATABLE_CLASS != null &&
  34.381 +            VALUE_ELEMENT_METHOD != null) {
  34.382 +            // Get the Repeatable instance on the annotations declaration
  34.383 +            Annotation repeatable = (Annotation)annoType.getAnnotation(REPEATABLE_CLASS);
  34.384 +            if (repeatable != null) {
  34.385 +                try {
  34.386 +                    // Get the value element, it should be a class
  34.387 +                    // indicating the containing annotation type
  34.388 +                    @SuppressWarnings("unchecked")
  34.389 +                    Class<? extends Annotation> containerType = (Class)VALUE_ELEMENT_METHOD.invoke(repeatable);
  34.390 +                    if (containerType == null)
  34.391 +                        return null;
  34.392 +
  34.393 +                    return containerType;
  34.394 +                } catch (ClassCastException e) {
  34.395 +                    return null;
  34.396 +                } catch (IllegalAccessException e) {
  34.397 +                    return null;
  34.398 +                } catch (InvocationTargetException e ) {
  34.399 +                    return null;
  34.400 +                }
  34.401 +            }
  34.402 +        }
  34.403 +        return null;
  34.404 +    }
  34.405 +
  34.406 +    // Helper to getAnnotations
  34.407 +    private static Attribute[] unpackAttributes(Attribute.Compound container) {
  34.408 +        // We now have an instance of the container,
  34.409 +        // unpack it returning an instance of the
  34.410 +        // contained type or null
  34.411 +        return ((Attribute.Array)container.member(container.type.tsym.name.table.names.value)).values;
  34.412 +    }
  34.413 +
  34.414 +    // </editor-fold>
  34.415 +}

    35.1 --- a/src/share/classes/com/sun/tools/javac/model/JavacElements.java	Thu Mar 28 10:55:14 2013 -0700
    35.2 +++ b/src/share/classes/com/sun/tools/javac/model/JavacElements.java	Mon Apr 01 21:42:15 2013 -0700
    35.3 @@ -25,10 +25,6 @@
    35.4  
    35.5  package com.sun.tools.javac.model;
    35.6  
    35.7 -import java.lang.annotation.Annotation;
    35.8 -import java.lang.annotation.Inherited;
    35.9 -import java.lang.reflect.InvocationTargetException;
   35.10 -import java.lang.reflect.Method;
   35.11  import java.util.Map;
   35.12  
   35.13  import javax.lang.model.SourceVersion;
   35.14 @@ -40,7 +36,6 @@
   35.15  
   35.16  import com.sun.tools.javac.code.*;
   35.17  import com.sun.tools.javac.code.Symbol.*;
   35.18 -import com.sun.tools.javac.code.TypeTag;
   35.19  import com.sun.tools.javac.comp.AttrContext;
   35.20  import com.sun.tools.javac.comp.Enter;
   35.21  import com.sun.tools.javac.comp.Env;
   35.22 @@ -98,237 +93,6 @@
   35.23          enter = Enter.instance(context);
   35.24      }
   35.25  
   35.26 -    /**
   35.27 -     * An internal-use utility that creates a runtime view of an
   35.28 -     * annotation. This is the implementation of
   35.29 -     * Element.getAnnotation(Class).
   35.30 -     */
   35.31 -    public static <A extends Annotation> A getAnnotation(Symbol annotated,
   35.32 -                                                         Class<A> annoType) {
   35.33 -        if (!annoType.isAnnotation())
   35.34 -            throw new IllegalArgumentException("Not an annotation type: "
   35.35 -                                               + annoType);
   35.36 -        Attribute.Compound c;
   35.37 -        if (annotated.kind == Kinds.TYP && annotated instanceof ClassSymbol) {
   35.38 -            c = getAttributeOnClass((ClassSymbol)annotated, annoType);
   35.39 -        } else {
   35.40 -            c = getAttribute(annotated, annoType);
   35.41 -        }
   35.42 -        return c == null ? null : AnnotationProxyMaker.generateAnnotation(c, annoType);
   35.43 -    }
   35.44 -
   35.45 -    // Helper to getAnnotation[s]
   35.46 -    private static <A extends Annotation> Attribute.Compound getAttribute(Symbol annotated,
   35.47 -                                                                          Class<A> annoType) {
   35.48 -        String name = annoType.getName();
   35.49 -
   35.50 -        for (Attribute.Compound anno : annotated.getRawAttributes())
   35.51 -            if (name.equals(anno.type.tsym.flatName().toString()))
   35.52 -                return anno;
   35.53 -
   35.54 -        return null;
   35.55 -    }
   35.56 -    // Helper to getAnnotation[s]
   35.57 -    private static <A extends Annotation> Attribute.Compound getAttributeOnClass(ClassSymbol annotated,
   35.58 -                                                                Class<A> annoType) {
   35.59 -        boolean inherited = annoType.isAnnotationPresent(Inherited.class);
   35.60 -        Attribute.Compound result = null;
   35.61 -        while (annotated.name != annotated.name.table.names.java_lang_Object) {
   35.62 -            result = getAttribute(annotated, annoType);
   35.63 -            if (result != null || !inherited)
   35.64 -                break;
   35.65 -            Type sup = annotated.getSuperclass();
   35.66 -            if (!sup.hasTag(CLASS) || sup.isErroneous())
   35.67 -                break;
   35.68 -            annotated = (ClassSymbol) sup.tsym;
   35.69 -        }
   35.70 -        return result;
   35.71 -    }
   35.72 -
   35.73 -    /**
   35.74 -     * An internal-use utility that creates a runtime view of
   35.75 -     * annotations. This is the implementation of
   35.76 -     * Element.getAnnotations(Class).
   35.77 -     */
   35.78 -    public static <A extends Annotation> A[] getAnnotations(Symbol annotated,
   35.79 -                                                            Class<A> annoType) {
   35.80 -        if (!annoType.isAnnotation())
   35.81 -            throw new IllegalArgumentException("Not an annotation type: "
   35.82 -                                               + annoType);
   35.83 -        // If annoType does not declare a container this is equivalent to wrapping
   35.84 -        // getAnnotation(...) in an array.
   35.85 -        Class <? extends Annotation> containerType = getContainer(annoType);
   35.86 -        if (containerType == null) {
   35.87 -            A res = getAnnotation(annotated, annoType);
   35.88 -            int size;
   35.89 -            if (res == null) {
   35.90 -                size = 0;
   35.91 -            } else {
   35.92 -                size = 1;
   35.93 -            }
   35.94 -            @SuppressWarnings("unchecked") // annoType is the Class for A
   35.95 -            A[] arr = (A[])java.lang.reflect.Array.newInstance(annoType, size);
   35.96 -            if (res != null)
   35.97 -                arr[0] = res;
   35.98 -            return arr;
   35.99 -        }
  35.100 -
  35.101 -        // So we have a containing type
  35.102 -        String name = annoType.getName();
  35.103 -        String annoTypeName = annoType.getSimpleName();
  35.104 -        String containerTypeName = containerType.getSimpleName();
  35.105 -        int directIndex = -1, containerIndex = -1;
  35.106 -        Attribute.Compound direct = null, container = null;
  35.107 -        Attribute.Compound[] rawAttributes = annotated.getRawAttributes().toArray(new Attribute.Compound[0]);
  35.108 -
  35.109 -        // Find directly present annotations
  35.110 -        for (int i = 0; i < rawAttributes.length; i++) {
  35.111 -            if (annoTypeName.equals(rawAttributes[i].type.tsym.flatName().toString())) {
  35.112 -                directIndex = i;
  35.113 -                direct = rawAttributes[i];
  35.114 -            } else if(containerTypeName != null &&
  35.115 -                      containerTypeName.equals(rawAttributes[i].type.tsym.flatName().toString())) {
  35.116 -                containerIndex = i;
  35.117 -                container = rawAttributes[i];
  35.118 -            }
  35.119 -        }
  35.120 -        // Deal with inherited annotations
  35.121 -        if (annotated.kind == Kinds.TYP &&
  35.122 -                (annotated instanceof ClassSymbol)) {
  35.123 -            ClassSymbol s = (ClassSymbol)annotated;
  35.124 -            if (direct == null && container == null) {
  35.125 -                direct = getAttributeOnClass(s, annoType);
  35.126 -                container = getAttributeOnClass(s, containerType);
  35.127 -
  35.128 -                // both are inherited and found, put container last
  35.129 -                if (direct != null && container != null) {
  35.130 -                    directIndex = 0;
  35.131 -                    containerIndex = 1;
  35.132 -                } else if (direct != null) {
  35.133 -                    directIndex = 0;
  35.134 -                } else {
  35.135 -                    containerIndex = 0;
  35.136 -                }
  35.137 -            } else if (direct == null) {
  35.138 -                direct = getAttributeOnClass(s, annoType);
  35.139 -                if (direct != null)
  35.140 -                    directIndex = containerIndex + 1;
  35.141 -            } else if (container == null) {
  35.142 -                container = getAttributeOnClass(s, containerType);
  35.143 -                if (container != null)
  35.144 -                    containerIndex = directIndex + 1;
  35.145 -            }
  35.146 -        }
  35.147 -
  35.148 -        // Pack them in an array
  35.149 -        Attribute[] contained0 = new Attribute[0];
  35.150 -        if (container != null)
  35.151 -            contained0 = unpackAttributes(container);
  35.152 -        ListBuffer<Attribute.Compound> compounds = ListBuffer.lb();
  35.153 -        for (Attribute a : contained0)
  35.154 -            if (a instanceof Attribute.Compound)
  35.155 -                compounds = compounds.append((Attribute.Compound)a);
  35.156 -        Attribute.Compound[] contained = compounds.toArray(new Attribute.Compound[0]);
  35.157 -
  35.158 -        int size = (direct == null ? 0 : 1) + contained.length;
  35.159 -        @SuppressWarnings("unchecked") // annoType is the Class for A
  35.160 -        A[] arr = (A[])java.lang.reflect.Array.newInstance(annoType, size);
  35.161 -
  35.162 -        // if direct && container, which is first?
  35.163 -        int insert = -1;
  35.164 -        int length = arr.length;
  35.165 -        if (directIndex >= 0 && containerIndex >= 0) {
  35.166 -            if (directIndex < containerIndex) {
  35.167 -                arr[0] = AnnotationProxyMaker.generateAnnotation(direct, annoType);
  35.168 -                insert = 1;
  35.169 -            } else {
  35.170 -                arr[arr.length - 1] = AnnotationProxyMaker.generateAnnotation(direct, annoType);
  35.171 -                insert = 0;
  35.172 -                length--;
  35.173 -            }
  35.174 -        } else if (directIndex >= 0) {
  35.175 -            arr[0] = AnnotationProxyMaker.generateAnnotation(direct, annoType);
  35.176 -            return arr;
  35.177 -        } else {
  35.178 -            // Only container
  35.179 -            insert = 0;
  35.180 -        }
  35.181 -
  35.182 -        for (int i = 0; i + insert < length; i++)
  35.183 -            arr[insert + i] = AnnotationProxyMaker.generateAnnotation(contained[i], annoType);
  35.184 -
  35.185 -        return arr;
  35.186 -    }
  35.187 -
  35.188 -    // Needed to unpack the runtime view of containing annotations
  35.189 -    private static final Class<? extends Annotation> REPEATABLE_CLASS = initRepeatable();
  35.190 -    private static final Method VALUE_ELEMENT_METHOD = initValueElementMethod();
  35.191 -
  35.192 -    private static Class<? extends Annotation> initRepeatable() {
  35.193 -        try {
  35.194 -            // Repeatable will not be available when bootstrapping on
  35.195 -            // JDK 7 so use a reflective lookup instead of a class
  35.196 -            // literal for Repeatable.class.
  35.197 -            return Class.forName("java.lang.annotation.Repeatable").asSubclass(Annotation.class);
  35.198 -        } catch (ClassNotFoundException e) {
  35.199 -            return null;
  35.200 -        } catch (SecurityException e) {
  35.201 -            return null;
  35.202 -        }
  35.203 -    }
  35.204 -    private static Method initValueElementMethod() {
  35.205 -        if (REPEATABLE_CLASS == null)
  35.206 -            return null;
  35.207 -
  35.208 -        Method m = null;
  35.209 -        try {
  35.210 -            m = REPEATABLE_CLASS.getMethod("value");
  35.211 -            if (m != null)
  35.212 -                m.setAccessible(true);
  35.213 -            return m;
  35.214 -        } catch (NoSuchMethodException e) {
  35.215 -            return null;
  35.216 -        }
  35.217 -    }
  35.218 -
  35.219 -    // Helper to getAnnotations
  35.220 -    private static Class<? extends Annotation> getContainer(Class<? extends Annotation> annoType) {
  35.221 -        // Since we can not refer to java.lang.annotation.Repeatable until we are
  35.222 -        // bootstrapping with java 8 we need to get the Repeatable annotation using
  35.223 -        // reflective invocations instead of just using its type and element method.
  35.224 -        if (REPEATABLE_CLASS != null &&
  35.225 -            VALUE_ELEMENT_METHOD != null) {
  35.226 -            // Get the Repeatable instance on the annotations declaration
  35.227 -            Annotation repeatable = (Annotation)annoType.getAnnotation(REPEATABLE_CLASS);
  35.228 -            if (repeatable != null) {
  35.229 -                try {
  35.230 -                    // Get the value element, it should be a class
  35.231 -                    // indicating the containing annotation type
  35.232 -                    @SuppressWarnings("unchecked")
  35.233 -                    Class<? extends Annotation> containerType = (Class)VALUE_ELEMENT_METHOD.invoke(repeatable);
  35.234 -                    if (containerType == null)
  35.235 -                        return null;
  35.236 -
  35.237 -                    return containerType;
  35.238 -                } catch (ClassCastException e) {
  35.239 -                    return null;
  35.240 -                } catch (IllegalAccessException e) {
  35.241 -                    return null;
  35.242 -                } catch (InvocationTargetException e ) {
  35.243 -                    return null;
  35.244 -                }
  35.245 -            }
  35.246 -        }
  35.247 -        return null;
  35.248 -    }
  35.249 -    // Helper to getAnnotations
  35.250 -    private static Attribute[] unpackAttributes(Attribute.Compound container) {
  35.251 -        // We now have an instance of the container,
  35.252 -        // unpack it returning an instance of the
  35.253 -        // contained type or null
  35.254 -        return ((Attribute.Array)container.member(container.type.tsym.name.table.names.value)).values;
  35.255 -    }
  35.256 -
  35.257      public PackageSymbol getPackageElement(CharSequence name) {
  35.258          String strName = name.toString();
  35.259          if (strName.equals(""))

    36.1 --- a/src/share/classes/com/sun/tools/javac/model/JavacTypes.java	Thu Mar 28 10:55:14 2013 -0700
    36.2 +++ b/src/share/classes/com/sun/tools/javac/model/JavacTypes.java	Mon Apr 01 21:42:15 2013 -0700
    36.3 @@ -25,7 +25,6 @@
    36.4  
    36.5  package com.sun.tools.javac.model;
    36.6  
    36.7 -import java.lang.annotation.Annotation;
    36.8  import java.util.Collections;
    36.9  import java.util.EnumSet;
   36.10  import java.util.LinkedHashSet;
   36.11 @@ -333,28 +332,4 @@
   36.12  
   36.13          return results;
   36.14      }
   36.15 -
   36.16 -    public List<? extends AnnotationMirror> typeAnnotationsOf(TypeMirror type) {
   36.17 -        // TODO: these methods can be removed.
   36.18 -        return null; // ((Type)type).typeAnnotations;
   36.19 -    }
   36.20 -
   36.21 -    public <A extends Annotation> A typeAnnotationOf(TypeMirror type,
   36.22 -            Class<A> annotationType) {
   36.23 -        // TODO: these methods can be removed.
   36.24 -        return null; // JavacElements.getAnnotation(((Type)type).typeAnnotations, annotationType);
   36.25 -    }
   36.26 -
   36.27 -    public TypeMirror receiverTypeOf(ExecutableType type) {
   36.28 -        return ((Type)type).asMethodType().recvtype;
   36.29 -    }
   36.30 -
   36.31 -    /*
   36.32 -    public <A extends Annotation> A receiverTypeAnnotationOf(
   36.33 -            ExecutableType type, Class<A> annotationType) {
   36.34 -        return JavacElements.getAnnotation(
   36.35 -                ((Type)type).asMethodType().receiverTypeAnnotations,
   36.36 -                annotationType);
   36.37 -    }*/
   36.38 -
   36.39  }

    37.1 --- a/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties	Thu Mar 28 10:55:14 2013 -0700
    37.2 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties	Mon Apr 01 21:42:15 2013 -0700
    37.3 @@ -65,8 +65,11 @@
    37.4  
    37.5  compiler.err.already.annotated={0} {1}\u306F\u6CE8\u91C8\u304C\u4ED8\u3044\u3066\u3044\u307E\u3059
    37.6  
    37.7 -# 0: symbol, 1: symbol
    37.8 -compiler.err.already.defined={0}\u306F{1}\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059
    37.9 +# 0: symbol kind, 1: symbol, 2: symbol kind, 3: symbol
   37.10 +compiler.err.already.defined={0} {1}\u306F\u3059\u3067\u306B{2} {3}\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059
   37.11 +
   37.12 +# 0: symbol kind, 1: symbol, 2: symbol kind, 3: symbol kind, 4: symbol
   37.13 +compiler.err.already.defined.in.clinit={0} {1}\u306F\u3059\u3067\u306B{3} {4}\u306E{2}\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059
   37.14  
   37.15  # 0: string
   37.16  compiler.err.already.defined.single.import={0}\u306F\u5358\u4E00\u306E\u578B\u30A4\u30F3\u30DD\u30FC\u30C8\u5BA3\u8A00\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059
   37.17 @@ -109,28 +112,84 @@
   37.18  # 0: type
   37.19  compiler.err.array.req.but.found=\u914D\u5217\u304C\u8981\u6C42\u3055\u308C\u307E\u3057\u305F\u304C\u3001{0}\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F
   37.20  
   37.21 -compiler.err.assignment.from.super-bound=\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9{0}\u304B\u3089\u4EE3\u5165\u3057\u3066\u3044\u307E\u3059
   37.22 -
   37.23 -compiler.err.assignment.to.extends-bound=\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9{0}\u3078\u4EE3\u5165\u3057\u3066\u3044\u307E\u3059
   37.24 -
   37.25  compiler.err.attribute.value.must.be.constant=\u5C5E\u6027\u306E\u5024\u306F\u5B9A\u6570\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
   37.26  
   37.27 +# 0: statement type
   37.28 +compiler.err.bad.initializer={0}\u306E\u4E0D\u6B63\u306A\u521D\u671F\u5316\u5B50
   37.29 +
   37.30  compiler.err.break.outside.switch.loop=break\u304Cswitch\u6587\u307E\u305F\u306F\u30EB\u30FC\u30D7\u306E\u5916\u306B\u3042\u308A\u307E\u3059
   37.31  
   37.32  # 0: name
   37.33  compiler.err.call.must.be.first.stmt.in.ctor={0}\u306E\u547C\u51FA\u3057\u306F\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u5148\u982D\u6587\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
   37.34  
   37.35 -compiler.err.cant.apply.symbol={4} {5}\u306E{0} {1}\u306F\u6307\u5B9A\u3055\u308C\u305F\u578B\u306B\u9069\u7528\u3067\u304D\u307E\u305B\u3093\n\u671F\u5F85\u5024: {2}\n\u691C\u51FA\u5024: {3}
   37.36 -
   37.37  # 0: symbol kind, 1: name, 2: list of type or message segment, 3: list of type or message segment, 4: symbol kind, 5: type, 6: message segment
   37.38 -compiler.err.cant.apply.symbol.1={4} {5}\u306E{0} {1}\u306F\u6307\u5B9A\u3055\u308C\u305F\u578B\u306B\u9069\u7528\u3067\u304D\u307E\u305B\u3093\u3002\n\u671F\u5F85\u5024: {2}\n\u691C\u51FA\u5024: {3}\n\u7406\u7531: {6}
   37.39 +compiler.err.cant.apply.symbol={4} {5}\u306E{0} {1}\u306F\u6307\u5B9A\u3055\u308C\u305F\u578B\u306B\u9069\u7528\u3067\u304D\u307E\u305B\u3093\u3002\n\u671F\u5F85\u5024: {2}\n\u691C\u51FA\u5024: {3}\n\u7406\u7531: {6}
   37.40  
   37.41  # 0: symbol kind, 1: name, 2: list of type
   37.42  compiler.err.cant.apply.symbols={1}\u306B\u9069\u5207\u306A{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093({2})
   37.43  
   37.44 +# 0: symbol kind, 1: name, 2: list of type or message segment, 3: list of type or message segment, 4: symbol kind, 5: type, 6: message segment
   37.45 +compiler.misc.cant.apply.symbol={4} {5}\u306E{0} {1}\u306F\u6307\u5B9A\u3055\u308C\u305F\u578B\u306B\u9069\u7528\u3067\u304D\u307E\u305B\u3093\n\u671F\u5F85\u5024: {2}\n\u691C\u51FA\u5024: {3}\n\u7406\u7531: {6}
   37.46 +
   37.47 +# 0: symbol kind, 1: name, 2: list of type
   37.48 +compiler.misc.cant.apply.symbols={1}\u306B\u9069\u5207\u306A{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093({2})
   37.49 +
   37.50 +# 0: symbol kind, 1: symbol
   37.51 +compiler.misc.no.abstracts={0} {1}\u3067\u62BD\u8C61\u30E1\u30BD\u30C3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
   37.52 +
   37.53 +# 0: symbol kind, 1: symbol
   37.54 +compiler.misc.incompatible.abstracts={0} {1}\u3067\u8907\u6570\u306E\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u306A\u3044\u62BD\u8C61\u30E1\u30BD\u30C3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F
   37.55 +
   37.56 +compiler.err.bad.functional.intf.anno=\u4E88\u671F\u3057\u306A\u3044@FunctionalInterface\u6CE8\u91C8
   37.57 +
   37.58 +# 0: message segment
   37.59 +compiler.err.bad.functional.intf.anno.1=\u4E88\u671F\u3057\u306A\u3044@FunctionalInterface\u6CE8\u91C8\n{0}
   37.60 +
   37.61 +# 0: symbol
   37.62 +compiler.misc.not.a.functional.intf={0}\u306F\u6A5F\u80FD\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
   37.63 +
   37.64 +# 0: symbol, 1: message segment
   37.65 +compiler.misc.not.a.functional.intf.1={0}\u306F\u6A5F\u80FD\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\n{1}
   37.66 +
   37.67 +# 0: symbol, 1: symbol kind, 2: symbol
   37.68 +compiler.misc.invalid.generic.lambda.target=\u30E9\u30E0\u30C0\u5F0F\u306E\u6A5F\u80FD\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u304C\u7121\u52B9\u3067\u3059\n{1} {2}\u306E\u30E1\u30BD\u30C3\u30C9{0}\u306F\u6C4E\u7528\u3067\u3059
   37.69 +
   37.70 +# 0: symbol kind, 1: symbol
   37.71 +compiler.misc.incompatible.descs.in.functional.intf={0} {1}\u3067\u4E0D\u9069\u5408\u306A\u6A5F\u80FD\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F
   37.72 +
   37.73 +# 0: name, 1: list of type, 2: type, 3: list of type
   37.74 +compiler.misc.descriptor=\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF: {2} {0}({1})
   37.75 +
   37.76 +# 0: name, 1: list of type, 2: type, 3: list of type
   37.77 +compiler.misc.descriptor.throws=\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF: {2} {0}({1})\u3067{3}\u304C\u30B9\u30ED\u30FC\u3055\u308C\u307E\u3059
   37.78 +
   37.79 +# 0: type
   37.80 +compiler.misc.no.suitable.functional.intf.inst={0}\u306E\u6A5F\u80FD\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093
   37.81 +
   37.82 +# 0: type
   37.83 +compiler.misc.secondary.bound.must.be.marker.intf=\u30BB\u30AB\u30F3\u30C0\u30EA\u30FB\u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0{0}\u306F\u30DE\u30FC\u30AB\u30FC\u30FB\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
   37.84 +
   37.85 +# 0: symbol kind, 1: message segment
   37.86 +compiler.err.invalid.mref={0}\u53C2\u7167\u304C\u7121\u52B9\u3067\u3059\u3002{1}
   37.87 +
   37.88 +# 0: symbol kind, 1: message segment
   37.89 +compiler.misc.invalid.mref={0}\u53C2\u7167\u304C\u7121\u52B9\u3067\u3059\u3002{1}
   37.90 +
   37.91 +compiler.misc.static.mref.with.targs=static\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u5316\u3055\u308C\u305F\u4FEE\u98FE\u5B50
   37.92 +
   37.93 +compiler.misc.static.bound.mref=static\u306E\u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9\u53C2\u7167
   37.94 +
   37.95  # 0: symbol
   37.96  compiler.err.cant.assign.val.to.final.var=final\u5909\u6570{0}\u306B\u5024\u3092\u4EE3\u5165\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
   37.97  
   37.98 +# 0: symbol, 1: message segment
   37.99 +compiler.err.cant.ref.non.effectively.final.var={1}\u304B\u3089\u53C2\u7167\u3055\u308C\u308B\u30ED\u30FC\u30AB\u30EB\u5909\u6570\u306F\u3001final\u307E\u305F\u306F\u4E8B\u5B9F\u4E0A\u306Efinal\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
  37.100 +
  37.101 +
  37.102 +compiler.misc.lambda=\u30E9\u30E0\u30C0\u5F0F
  37.103 +
  37.104 +compiler.misc.inner.cls=\u5185\u90E8\u30AF\u30E9\u30B9
  37.105 +
  37.106  # 0: type
  37.107  compiler.err.cant.deref={0}\u306F\u9593\u63A5\u53C2\u7167\u3067\u304D\u307E\u305B\u3093
  37.108  
  37.109 @@ -142,8 +201,6 @@
  37.110  # 0: symbol
  37.111  compiler.err.cant.ref.before.ctor.called=\u30B9\u30FC\u30D1\u30FC\u30BF\u30A4\u30D7\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u547C\u51FA\u3057\u524D\u306F{0}\u3092\u53C2\u7167\u3067\u304D\u307E\u305B\u3093
  37.112  
  37.113 -compiler.err.cant.ret.val.from.meth.decl.void=\u623B\u308A\u5024\u306E\u578B\u304Cvoid\u306E\u30E1\u30BD\u30C3\u30C9\u304B\u3089\u306F\u5024\u3092\u8FD4\u305B\u307E\u305B\u3093
  37.114 -
  37.115  compiler.err.cant.select.static.class.from.param.type=\u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u3055\u308C\u305F\u578B\u304B\u3089static\u30AF\u30E9\u30B9\u3092\u9078\u629E\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
  37.116  
  37.117  # 0: symbol, 1: string, 2: string
  37.118 @@ -154,6 +211,8 @@
  37.119  # 0: symbol kind, 1: symbol
  37.120  compiler.err.clash.with.pkg.of.same.name={0} {1}\u306F\u540C\u540D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3068\u7AF6\u5408\u3057\u307E\u3059
  37.121  
  37.122 +compiler.err.class.not.allowed=\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u307E\u305F\u306F\u5217\u6319\u578B\u306E\u5BA3\u8A00\u3092\u3053\u3053\u3067\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
  37.123 +
  37.124  compiler.err.const.expr.req=\u5B9A\u6570\u5F0F\u304C\u5FC5\u8981\u3067\u3059
  37.125  
  37.126  compiler.err.cont.outside.loop=continue\u304C\u30EB\u30FC\u30D7\u306E\u5916\u306B\u3042\u308A\u307E\u3059
  37.127 @@ -169,10 +228,8 @@
  37.128  # 0: type
  37.129  compiler.err.no.superclass={0}\u306B\u306F\u30B9\u30FC\u30D1\u30FC\u30AF\u30E9\u30B9\u304C\u3042\u308A\u307E\u305B\u3093
  37.130  
  37.131 -compiler.err.wrong.target.for.polymorphic.signature.definition=MethodHandle API\u306E\u4F5C\u6210\u306B\u306F-target 7\u30E9\u30F3\u30BF\u30A4\u30E0\u4EE5\u4E0A\u304C\u5FC5\u8981\u3067\u3059\u3002\u73FE\u5728\u306F-target {0}\u3067\u3059
  37.132 -
  37.133  # 0: symbol, 1: type, 2: symbol, 3: type, 4: unused
  37.134 -compiler.err.concrete.inheritance.conflict={1}\u306E\u30E1\u30BD\u30C3\u30C9{0}\u3068{3}\u306E{2}\u306F\u540C\u3058\u30B7\u30B0\u30CB\u30C1\u30E3\u304B\u3089\u7D99\u627F\u3055\u308C\u3066\u3044\u307E\u3059
  37.135 +compiler.err.concrete.inheritance.conflict={1}\u306E\u30E1\u30BD\u30C3\u30C9{0}\u3068{3}\u306E{2}\u306F\u540C\u3058\u30B7\u30B0\u30CD\u30C1\u30E3\u304B\u3089\u7D99\u627F\u3055\u308C\u3066\u3044\u307E\u3059
  37.136  
  37.137  compiler.err.default.allowed.in.intf.annotation.member=\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u306F@interface\u30E1\u30F3\u30D0\u30FC\u5185\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059
  37.138  
  37.139 @@ -181,9 +238,48 @@
  37.140  
  37.141  compiler.err.duplicate.annotation=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059
  37.142  
  37.143 +# 0: type
  37.144 +compiler.err.duplicate.annotation.invalid.repeated=\u6CE8\u91C8{0}\u3092\u7E70\u308A\u8FD4\u305B\u307E\u305B\u3093\n\u6709\u52B9\u306A\u5305\u542B\u3059\u308B\u6CE8\u91C8\u304C\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
  37.145 +
  37.146  # 0: name, 1: type
  37.147  compiler.err.duplicate.annotation.member.value={1}\u306E\u6CE8\u91C8\u30E1\u30F3\u30D0\u30FC\u306E\u5024{0}\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059
  37.148  
  37.149 +# 0: type, 1: type
  37.150 +compiler.err.duplicate.annotation.missing.container=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059\u3002{0}\u306E\u5BA3\u8A00\u306B\u306F\u6709\u52B9\u306A{1}\u6CE8\u91C8\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
  37.151 +
  37.152 +# 0: type
  37.153 +compiler.err.invalid.repeatable.annotation=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059\u3002{0}\u306F\u7121\u52B9\u306A\u7E70\u8FD4\u3057\u53EF\u80FD\u6CE8\u91C8\u3067\u6CE8\u91C8\u4ED8\u3051\u3055\u308C\u3066\u3044\u307E\u3059
  37.154 +
  37.155 +# 0: type
  37.156 +compiler.err.invalid.repeatable.annotation.no.value=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059\u3002{0}\u306F\u6709\u52B9\u306A\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u3082\u306E\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u5024\u8981\u7D20\u30E1\u30BD\u30C3\u30C9\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093
  37.157 +
  37.158 +# 0: type, 1: number
  37.159 +compiler.err.invalid.repeatable.annotation.multiple.values=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059\u3002{0}\u306F\u6709\u52B9\u306A\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u3082\u306E\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002{1}\u5024\u8981\u7D20\u30E1\u30BD\u30C3\u30C9\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059
  37.160 +
  37.161 +# 0: type
  37.162 +compiler.err.invalid.repeatable.annotation.invalid.value=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059\u3002{0}\u306F\u6709\u52B9\u306A\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u3082\u306E\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u5024\u8981\u7D20\u304C\u7121\u52B9\u3067\u3059\u3002\u30E1\u30BD\u30C3\u30C9\u304C\u5FC5\u8981\u3067\u3059
  37.163 +
  37.164 +# 0: type, 1: type, 2: type
  37.165 +compiler.err.invalid.repeatable.annotation.value.return=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059\u3002\u5305\u542B\u3059\u308B\u6CE8\u91C8{0}\u306E\u5024\u8981\u7D20\u306B\u306F\u578B{2}\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002{1}\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F
  37.166 +
  37.167 +# 0: type, 1: symbol
  37.168 +compiler.err.invalid.repeatable.annotation.elem.nondefault=\u5305\u542B\u3059\u308B\u6CE8\u91C8{0}\u306B\u306F\u8981\u7D20{1}\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
  37.169 +
  37.170 +# 0: symbol, 1: type, 2: symbol, 3: type
  37.171 +compiler.err.invalid.repeatable.annotation.retention=\u5305\u542B\u3059\u308B\u6CE8\u91C8{0}\u306B\u306F\u3001\u4FDD\u6709{3}\u3092\u542B\u3080\u5305\u542B\u3055\u308C\u305F\u6CE8\u91C8{2}\u3088\u308A\u77ED\u3044\u4FDD\u6709({1})\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059
  37.172 +
  37.173 +# 0: symbol, 1: symbol
  37.174 +compiler.err.invalid.repeatable.annotation.not.documented=\u7E70\u308A\u8FD4\u3055\u308C\u305F\u6CE8\u91C8{1}\u306F@Documented\u3067\u3059\u304C\u3001\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30BF\u30A4\u30D7{0}\u306F\u9055\u3044\u307E\u3059
  37.175 +
  37.176 +# 0: symbol, 1: symbol
  37.177 +compiler.err.invalid.repeatable.annotation.not.inherited=\u308A\u8FD4\u3055\u308C\u305F\u6CE8\u91C8\u30BF\u30A4\u30D7{1}\u306F@Inherited\u3067\u3059\u304C\u3001\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30BF\u30A4\u30D7{0}\u306F\u9055\u3044\u307E\u3059
  37.178 +
  37.179 +# 0: symbol, 1: symbol
  37.180 +compiler.err.invalid.repeatable.annotation.incompatible.target=\u30B3\u30F3\u30C6\u30CA\u6CE8\u91C8{0}\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u306F\u3001\u7E70\u308A\u8FD4\u3055\u308C\u305F\u6CE8\u91C8{1}\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u306E\u30B5\u30D6\u30BB\u30C3\u30C8\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
  37.181 +
  37.182 +# 0: symbol
  37.183 +compiler.err.invalid.repeatable.annotation.repeated.and.container.present=\u30B3\u30F3\u30C6\u30CA{0}\u306F\u542B\u307E\u308C\u3066\u3044\u308B\u8981\u7D20\u3068\u540C\u6642\u306B\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093
  37.184 +
  37.185  # 0: name
  37.186  compiler.err.duplicate.class=\u30AF\u30E9\u30B9{0}\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059
  37.187  
  37.188 @@ -245,10 +341,10 @@
  37.189  compiler.err.generic.throwable=\u6C4E\u7528\u30AF\u30E9\u30B9\u306Fjava.lang.Throwable\u3092\u62E1\u5F35\u3067\u304D\u307E\u305B\u3093
  37.190  
  37.191  # 0: symbol
  37.192 -compiler.err.icls.cant.have.static.decl=\u5185\u90E8\u30AF\u30E9\u30B9{0}\u306E\u9759\u7684\u5BA3\u8A00\u304C\u4E0D\u6B63\u3067\u3059\n\u4FEE\u98FE\u5B50\''static\''\u306F\u5B9A\u6570\u304A\u3088\u3073\u5909\u6570\u306E\u5BA3\u8A00\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059
  37.193 +compiler.err.icls.cant.have.static.decl=\u5185\u90E8\u30AF\u30E9\u30B9{0}\u306E\u9759\u7684\u5BA3\u8A00\u304C\u4E0D\u6B63\u3067\u3059\n\u4FEE\u98FE\u5B50''static''\u306F\u5B9A\u6570\u304A\u3088\u3073\u5909\u6570\u306E\u5BA3\u8A00\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059
  37.194  
  37.195  # 0: string
  37.196 -compiler.err.illegal.char=\\{0}\u306F\u4E0D\u6B63\u306A\u6587\u5B57\u3067\u3059
  37.197 +compiler.err.illegal.char=''{0}''\u306F\u4E0D\u6B63\u306A\u6587\u5B57\u3067\u3059
  37.198  
  37.199  compiler.err.illegal.char.for.encoding=\u3053\u306E\u6587\u5B57\u306F\u3001\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0{0}\u306B\u30DE\u30C3\u30D7\u3067\u304D\u307E\u305B\u3093
  37.200  
  37.201 @@ -280,11 +376,15 @@
  37.202  
  37.203  compiler.err.illegal.underscore=\u4E0D\u6B63\u306A\u30A2\u30F3\u30C0\u30FC\u30B9\u30B3\u30A2\u3067\u3059
  37.204  
  37.205 +compiler.err.illegal.dot=\u4E0D\u6B63\u306A''.''\u3067\u3059
  37.206 +
  37.207  # 0: symbol
  37.208  compiler.err.illegal.qual.not.icls=\u4FEE\u98FE\u5B50\u304C\u4E0D\u6B63\u3067\u3059\u3002{0}\u306F\u5185\u90E8\u30AF\u30E9\u30B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
  37.209  
  37.210  compiler.err.illegal.start.of.expr=\u5F0F\u306E\u958B\u59CB\u304C\u4E0D\u6B63\u3067\u3059
  37.211  
  37.212 +compiler.err.illegal.start.of.stmt=\u6587\u306E\u958B\u59CB\u304C\u4E0D\u6B63\u3067\u3059
  37.213 +
  37.214  compiler.err.illegal.start.of.type=\u578B\u306E\u958B\u59CB\u304C\u4E0D\u6B63\u3067\u3059
  37.215  
  37.216  compiler.err.illegal.unicode.esc=Unicode\u30A8\u30B9\u30B1\u30FC\u30D7\u304C\u4E0D\u6B63\u3067\u3059
  37.217 @@ -302,8 +402,6 @@
  37.218  # 0: number
  37.219  compiler.err.int.number.too.large=\u6574\u6570{0}\u304C\u5927\u304D\u3059\u304E\u307E\u3059
  37.220  
  37.221 -compiler.err.internal.error.cant.instantiate=\u5185\u90E8\u30A8\u30E9\u30FC\u3067\u3059\u3002{0}\u3092{1}\u3067({2})\u306B\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u751F\u6210\u3067\u304D\u307E\u305B\u3093
  37.222 -
  37.223  compiler.err.intf.annotation.members.cant.have.params=@interface\u30E1\u30F3\u30D0\u30FC\u304C\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
  37.224  
  37.225  compiler.err.intf.annotation.cant.have.type.params=@interface\u304C\u578B\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
  37.226 @@ -315,7 +413,7 @@
  37.227  
  37.228  compiler.err.intf.expected.here=\u3053\u3053\u306B\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304C\u5FC5\u8981\u3067\u3059
  37.229  
  37.230 -compiler.err.intf.meth.cant.have.body=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u30FB\u30E1\u30BD\u30C3\u30C9\u304C\u672C\u4F53\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
  37.231 +compiler.err.intf.meth.cant.have.body=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u62BD\u8C61\u30E1\u30BD\u30C3\u30C9\u304C\u672C\u4F53\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
  37.232  
  37.233  compiler.err.invalid.annotation.member.type=\u6CE8\u91C8\u30E1\u30F3\u30D0\u30FC\u306E\u578B\u304C\u4E0D\u6B63\u3067\u3059
  37.234  
  37.235 @@ -327,6 +425,8 @@
  37.236  
  37.237  compiler.err.varargs.and.old.array.syntax=\u65E7\u5F0F\u306E\u914D\u5217\u8868\u8A18\u6CD5\u306F\u53EF\u5909\u5F15\u6570\u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
  37.238  
  37.239 +compiler.err.variable.not.allowed=\u5909\u6570\u306E\u5BA3\u8A00\u3092\u3053\u3053\u3067\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
  37.240 +
  37.241  # 0: name
  37.242  compiler.err.label.already.in.use=\u30E9\u30D9\u30EB{0}\u306F\u3059\u3067\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
  37.243  
  37.244 @@ -337,6 +437,8 @@
  37.245  
  37.246  compiler.err.cannot.create.array.with.type.arguments=\u578B\u5F15\u6570\u3092\u6301\u3064\u914D\u5217\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
  37.247  
  37.248 +compiler.err.cannot.create.array.with.diamond=''<>''\u3092\u6301\u3064\u914D\u5217\u306F\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
  37.249 +
  37.250  #
  37.251  # limits.  We don't give the limits in the diagnostic because we expect
  37.252  # them to change, yet we want to use the same diagnostic.  These are all
  37.253 @@ -360,7 +462,7 @@
  37.254  
  37.255  compiler.err.limit.string=\u5B9A\u6570\u6587\u5B57\u5217\u304C\u9577\u3059\u304E\u307E\u3059
  37.256  
  37.257 -compiler.err.limit.string.overflow=\u6587\u5B57\u5217\"{0}...\"\u306EUTF8\u8868\u73FE\u304C\u3001\u5B9A\u6570\u30D7\u30FC\u30EB\u306B\u5BFE\u3057\u3066\u9577\u3059\u304E\u307E\u3059
  37.258 +compiler.err.limit.string.overflow=\u6587\u5B57\u5217"{0}..."\u306EUTF8\u8868\u73FE\u304C\u3001\u5B9A\u6570\u30D7\u30FC\u30EB\u306B\u5BFE\u3057\u3066\u9577\u3059\u304E\u307E\u3059
  37.259  
  37.260  compiler.err.malformed.fp.lit=\u6D6E\u52D5\u5C0F\u6570\u70B9\u30EA\u30C6\u30E9\u30EB\u304C\u4E0D\u6B63\u3067\u3059
  37.261  
  37.262 @@ -370,7 +472,9 @@
  37.263  
  37.264  compiler.err.missing.ret.stmt=return\u6587\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
  37.265  
  37.266 -compiler.err.missing.ret.val=\u623B\u308A\u5024\u304C\u3042\u308A\u307E\u305B\u3093
  37.267 +compiler.misc.missing.ret.val=\u623B\u308A\u5024\u304C\u3042\u308A\u307E\u305B\u3093
  37.268 +
  37.269 +compiler.misc.unexpected.ret.val=\u4E88\u671F\u3057\u306A\u3044\u623B\u308A\u5024
  37.270  
  37.271  # 0: set of modifier
  37.272  compiler.err.mod.not.allowed.here=\u4FEE\u98FE\u5B50{0}\u3092\u3053\u3053\u3067\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
  37.273 @@ -396,7 +500,26 @@
  37.274  compiler.err.native.meth.cant.have.body=native\u30E1\u30BD\u30C3\u30C9\u304C\u672C\u4F53\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
  37.275  
  37.276  # 0: type, 1: type
  37.277 -compiler.err.neither.conditional.subtype=?\u306B\u5BFE\u3059\u308B\u4E92\u63DB\u6027\u306E\u306A\u3044\u578B : \u3069\u3061\u3089\u3082\u4ED6\u65B9\u306E\u30B5\u30D6\u30BF\u30A4\u30D7\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\n2\u756A\u76EE\u306E\u30AA\u30DA\u30E9\u30F3\u30C9 : {0}\n3\u756A\u76EE\u306E\u30AA\u30DA\u30E9\u30F3\u30C9 : {1}
  37.278 +compiler.err.neither.conditional.subtype=?\u306B\u5BFE\u3059\u308B\u4E0D\u9069\u5408\u306A\u578B : \u3069\u3061\u3089\u3082\u4ED6\u65B9\u306E\u30B5\u30D6\u30BF\u30A4\u30D7\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\n2\u756A\u76EE\u306E\u30AA\u30DA\u30E9\u30F3\u30C9 : {0}\n3\u756A\u76EE\u306E\u30AA\u30DA\u30E9\u30F3\u30C9 : {1}
  37.279 +
  37.280 +# 0: message segment
  37.281 +compiler.misc.incompatible.type.in.conditional=\u6761\u4EF6\u5F0F\u306E\u578B\u304C\u4E0D\u6B63\u3067\u3059\u3002{0}
  37.282 +
  37.283 +compiler.misc.conditional.target.cant.be.void=\u6761\u4EF6\u5F0F\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u578B\u306Fvoid\u306B\u3067\u304D\u307E\u305B\u3093
  37.284 +
  37.285 +# 0: type
  37.286 +compiler.misc.incompatible.ret.type.in.lambda=\u30E9\u30E0\u30C0\u5F0F\u306E\u623B\u308A\u578B\u304C\u4E0D\u6B63\u3067\u3059\n{0}
  37.287 +
  37.288 +# 0: type
  37.289 +compiler.misc.incompatible.ret.type.in.mref=\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u306E\u623B\u308A\u578B\u304C\u4E0D\u6B63\u3067\u3059\n{0}
  37.290 +
  37.291 +# 0: list of type
  37.292 +compiler.err.incompatible.thrown.types.in.lambda=\u30E9\u30E0\u30C0\u5F0F\u3067\u30B9\u30ED\u30FC\u3055\u308C\u305F\u30BF\u30A4\u30D7{0}\u306F\u4E0D\u9069\u5408\u3067\u3059
  37.293 +
  37.294 +# 0: list of type
  37.295 +compiler.err.incompatible.thrown.types.in.mref=\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u306E\u30B9\u30ED\u30FC\u3055\u308C\u305F\u30BF\u30A4\u30D7{0}\u306F\u4E0D\u9069\u5408\u3067\u3059
  37.296 +
  37.297 +compiler.misc.incompatible.arg.types.in.lambda=\u30E9\u30E0\u30C0\u5F0F\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u578B\u306F\u4E0D\u9069\u5408\u3067\u3059
  37.298  
  37.299  compiler.err.new.not.allowed.in.annotation=''new''\u306F\u6CE8\u91C8\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
  37.300  
  37.301 @@ -414,6 +537,12 @@
  37.302  compiler.err.not.def.access.class.intf.cant.access={1}\u306E{0}\u304C\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u306A\u3044\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059
  37.303  
  37.304  # 0: symbol, 1: symbol
  37.305 +compiler.misc.not.def.access.class.intf.cant.access={1}\u306E{0}\u304C\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u306A\u3044\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059
  37.306 +
  37.307 +# 0: symbol, 1: list of type, 2: type
  37.308 +compiler.misc.cant.access.inner.cls.constr=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF{0}({1})\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n\u5185\u90E8\u30AF\u30E9\u30B9\u3092\u56F2\u3080\u578B{2}\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u30B9\u30B3\u30FC\u30D7\u5185\u306B\u3042\u308A\u307E\u305B\u3093
  37.309 +
  37.310 +# 0: symbol, 1: symbol
  37.311  compiler.err.not.def.public.cant.access={1}\u306E{0}\u306Fpublic\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u5916\u304B\u3089\u306F\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093
  37.312  
  37.313  # 0: name
  37.314 @@ -440,7 +569,7 @@
  37.315  # Errors related to annotation processing
  37.316  
  37.317  # 0: symbol, 1: string, 2: stack-trace
  37.318 -compiler.err.proc.cant.access={0}\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n{1}\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n{2}
  37.319 +compiler.err.proc.cant.access={0}\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n{1}\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n{2}
  37.320  
  37.321  # 0: symbol, 1: string
  37.322  compiler.err.proc.cant.access.1={0}\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n{1}
  37.323 @@ -455,15 +584,13 @@
  37.324  # 0: list of string
  37.325  compiler.err.proc.no.explicit.annotation.processing.requested=\u30AF\u30E9\u30B9\u540D''{0}''\u304C\u53D7\u3051\u5165\u308C\u3089\u308C\u308B\u306E\u306F\u3001\u6CE8\u91C8\u51E6\u7406\u304C\u660E\u793A\u7684\u306B\u30EA\u30AF\u30A8\u30B9\u30C8\u3055\u308C\u305F\u5834\u5408\u306E\u307F\u3067\u3059
  37.326  
  37.327 -compiler.err.proc.no.service=\u30B5\u30FC\u30D3\u30B9\u30FB\u30ED\u30FC\u30C0\u30FC\u30FB\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002\njava.util.ServiceLoader\u304Bsun.misc.Service\u304C\u4F7F\u7528\u3067\u304D\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
  37.328 +compiler.err.proc.no.service=\u30B5\u30FC\u30D3\u30B9\u30FB\u30ED\u30FC\u30C0\u30FC\u304C\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u304C\u3001\u6CE8\u91C8\u51E6\u7406\u306B\u5FC5\u8981\u3067\u3059\u3002
  37.329  
  37.330  compiler.err.proc.processor.bad.option.name=\u30D7\u30ED\u30BB\u30C3\u30B5''{1}''\u306B\u3088\u3063\u3066\u6307\u5B9A\u3055\u308C\u305F\u30AA\u30D7\u30B7\u30E7\u30F3\u540D''{0}''\u304C\u4E0D\u6B63\u3067\u3059
  37.331  
  37.332  # 0: string
  37.333  compiler.err.proc.processor.cant.instantiate=\u30D7\u30ED\u30BB\u30C3\u30B5''{0}''\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
  37.334  
  37.335 -compiler.err.proc.processor.constructor.error=\u30D7\u30ED\u30BB\u30C3\u30B5\u30FB\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u69CB\u7BC9\u4E2D\u306B\u4F8B\u5916\u304C\u30B9\u30ED\u30FC\u3055\u308C\u307E\u3057\u305F: {0}
  37.336 -
  37.337  # 0: string
  37.338  compiler.err.proc.processor.not.found=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5''{0}''\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
  37.339  
  37.340 @@ -482,7 +609,10 @@
  37.341  compiler.err.recursive.ctor.invocation=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u547C\u51FA\u3057\u304C\u518D\u5E30\u7684\u3067\u3059
  37.342  
  37.343  # 0: name, 1: symbol kind, 2: symbol, 3: symbol, 4: symbol kind, 5: symbol, 6: symbol
  37.344 -compiler.err.ref.ambiguous={0}\u306E\u53C2\u7167\u306F\u3042\u3044\u307E\u3044\u3067\u3059\u3002{3}\u306E{1} {2}\u3068{6}\u306E{4} {5}\u304C\u4E21\u65B9\u9069\u5408\u3057\u307E\u3059
  37.345 +compiler.err.ref.ambiguous={0}\u306E\u53C2\u7167\u306F\u3042\u3044\u307E\u3044\u3067\u3059\n{3}\u306E{1} {2}\u3068{6}\u306E{4} {5}\u306E\u4E21\u65B9\u304C\u4E00\u81F4\u3057\u307E\u3059
  37.346 +
  37.347 +# 0: name, 1: symbol kind, 2: symbol, 3: symbol, 4: symbol kind, 5: symbol, 6: symbol
  37.348 +compiler.misc.ref.ambiguous={0}\u306E\u53C2\u7167\u306F\u3042\u3044\u307E\u3044\u3067\u3059\n{3}\u306E{1} {2}\u3068{6}\u306E{4} {5}\u306E\u4E21\u65B9\u304C\u4E00\u81F4\u3057\u307E\u3059
  37.349  
  37.350  compiler.err.repeated.annotation.target=\u6CE8\u91C8\u30BF\u30FC\u30B2\u30C3\u30C8\u304C\u7E70\u308A\u8FD4\u3055\u308C\u3066\u3044\u307E\u3059
  37.351  
  37.352 @@ -495,9 +625,9 @@
  37.353  
  37.354  compiler.err.ret.outside.meth=\u30E1\u30BD\u30C3\u30C9\u306E\u5916\u306Ereturn\u6587\u3067\u3059
  37.355  
  37.356 -compiler.err.signature.doesnt.match.supertype=\u30B7\u30B0\u30CB\u30C1\u30E3\u304C{0}\u306B\u9069\u5408\u3057\u307E\u305B\u3093\u3002\u4E92\u63DB\u6027\u306E\u306A\u3044\u30B9\u30FC\u30D1\u30FC\u30BF\u30A4\u30D7\u3067\u3059
  37.357 -
  37.358 -compiler.err.signature.doesnt.match.intf=\u30B7\u30B0\u30CB\u30C1\u30E3\u304C{0}\u306B\u9069\u5408\u3057\u307E\u305B\u3093\u3002\u4E92\u63DB\u6027\u306E\u306A\u3044\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u3059
  37.359 +compiler.err.signature.doesnt.match.supertype=\u30B7\u30B0\u30CD\u30C1\u30E3\u304C{0}\u306B\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002\u4E0D\u9069\u5408\u306A\u30B9\u30FC\u30D1\u30FC\u30BF\u30A4\u30D7\u3067\u3059
  37.360 +
  37.361 +compiler.err.signature.doesnt.match.intf=\u30B7\u30B0\u30CD\u30C1\u30E3\u304C{0}\u306B\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002\u4E0D\u9069\u5408\u306A\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u3059
  37.362  
  37.363  # 0: symbol, 1: symbol, 2: symbol
  37.364  compiler.err.does.not.override.abstract={0}\u306Fabstract\u3067\u306A\u304F\u3001{2}\u5185\u306Eabstract\u30E1\u30BD\u30C3\u30C9{1}\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u305B\u3093
  37.365 @@ -534,7 +664,28 @@
  37.366  compiler.err.type.var.more.than.once.in.result=\u578B\u5909\u6570{0}\u306F{1}\u306E\u578B\u30672\u56DE\u4EE5\u4E0A\u51FA\u73FE\u3057\u307E\u3059\u3002\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u751F\u6210\u3055\u308C\u306A\u3044\u307E\u307E\u306B\u306F\u3067\u304D\u307E\u305B\u3093
  37.367  
  37.368  # 0: type, 1: type, 2: string
  37.369 -compiler.err.types.incompatible.diff.ret=\u578B{0}\u3068\u578B{1}\u306E\u4E92\u63DB\u6027\u304C\u3042\u308A\u307E\u305B\u3093\u3002\u4E21\u65B9\u3068\u3082{2}\u3092\u5B9A\u7FA9\u3057\u3066\u3044\u307E\u3059\u304C\u3001\u623B\u308A\u5024\u306E\u578B\u304C\u7121\u95A2\u4FC2\u3067\u3059
  37.370 +compiler.err.types.incompatible.diff.ret=\u578B{0}\u3068\u578B{1}\u304C\u9069\u5408\u3057\u3066\u3044\u307E\u305B\u3093\u3002\u4E21\u65B9\u3068\u3082{2}\u3092\u5B9A\u7FA9\u3057\u3066\u3044\u307E\u3059\u304C\u3001\u623B\u308A\u5024\u306E\u578B\u304C\u7121\u95A2\u4FC2\u3067\u3059
  37.371 +
  37.372 +# 0: kind, 1: type, 2: name, 3: list of type, 4: symbol, 5: symbol
  37.373 +compiler.err.types.incompatible.unrelated.defaults={0} {1}\u306F\u578B{4}\u3068{5}\u304B\u3089{2}({3})\u306E\u95A2\u9023\u3057\u306A\u3044\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u7D99\u627F\u3057\u307E\u3059
  37.374 +
  37.375 +# 0: kind, 1: type, 2: name, 3: list of type, 4: symbol, 5: symbol
  37.376 +compiler.err.types.incompatible.abstract.default={0} {1}\u306F\u578B{4}\u3068{5}\u304B\u3089{2}({3})\u306E\u62BD\u8C61\u3068\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u7D99\u627F\u3057\u307E\u3059
  37.377 +
  37.378 +# 0: name, 1: kind, 2: symbol
  37.379 +compiler.err.default.overrides.object.member={1} {2}\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30E1\u30BD\u30C3\u30C9{0}\u306Fjava.lang.Object\u306E\u30E1\u30F3\u30D0\u30FC\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059
  37.380 +
  37.381 +# 0: type
  37.382 +compiler.err.illegal.static.intf.meth.call=static\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u30FB\u30E1\u30BD\u30C3\u30C9\u30FB\u30B3\u30FC\u30EB\u304C\u4E0D\u6B63\u3067\u3059\n\u53D7\u4FE1\u5F0F\u306F\u578B\u4FEE\u98FE\u5B50''{0}''\u3067\u7F6E\u63DB\u3055\u308C\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
  37.383 +
  37.384 +# 0: type, 1: message segment
  37.385 +compiler.err.illegal.default.super.call=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30B9\u30FC\u30D1\u30FC\u30FB\u30B3\u30FC\u30EB\u306E\u578B\u4FEE\u98FE\u5B50{0}\u304C\u4E0D\u6B63\u3067\u3059\n{1}
  37.386 +
  37.387 +# 0: symbol, 1: type
  37.388 +compiler.misc.overridden.default={1}\u306E\u30E1\u30BD\u30C3\u30C9{0}\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3055\u308C\u307E\u3059
  37.389 +
  37.390 +# 0: symbol, 1: symbol
  37.391 +compiler.misc.redundant.supertype=\u5197\u9577\u306A\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9{0}\u306F{1}\u306B\u3088\u3063\u3066\u62E1\u5F35\u3055\u308C\u307E\u3057\u305F
  37.392  
  37.393  compiler.err.unclosed.char.lit=\u6587\u5B57\u30EA\u30C6\u30E9\u30EB\u304C\u9589\u3058\u3089\u308C\u3066\u3044\u307E\u305B\u3093
  37.394  
  37.395 @@ -550,19 +701,14 @@
  37.396  # 0: name
  37.397  compiler.err.undef.label=\u30E9\u30D9\u30EB{0}\u306F\u672A\u5B9A\u7FA9\u3067\u3059
  37.398  
  37.399 -compiler.err.undetermined.type={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u5B9A\u3067\u304D\u307E\u305B\u3093
  37.400 -
  37.401 -# 0: type, 1: message segment
  37.402 -compiler.err.undetermined.type.1={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002\n\u7406\u7531: {1}
  37.403 -
  37.404 -# 0: list of type, 1: message segment
  37.405 -compiler.err.invalid.inferred.types={0}\u306E\u63A8\u5B9A\u578B\u304C\u7121\u52B9\u3067\u3059\u3002{1}
  37.406 -
  37.407  # 0: message segment, 1: unused
  37.408 -compiler.err.cant.apply.diamond={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u5B9A\u3067\u304D\u307E\u305B\u3093
  37.409 -
  37.410 -# 0: message segment, 1: message segment
  37.411 -compiler.err.cant.apply.diamond.1={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002\n\u7406\u7531: {1}
  37.412 +compiler.err.cant.apply.diamond={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093
  37.413 +
  37.414 +# 0: message segment or type, 1: message segment
  37.415 +compiler.err.cant.apply.diamond.1={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093\n\u7406\u7531: {1}
  37.416 +
  37.417 +# 0: message segment or type, 1: message segment
  37.418 +compiler.misc.cant.apply.diamond.1={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093\n\u7406\u7531: {1}
  37.419  
  37.420  compiler.err.unreachable.stmt=\u3053\u306E\u6587\u306B\u5236\u5FA1\u304C\u79FB\u308B\u3053\u3068\u306F\u3042\u308A\u307E\u305B\u3093
  37.421  
  37.422 @@ -605,7 +751,7 @@
  37.423  # 0: symbol
  37.424  compiler.misc.varargs.trustme.on.virtual.varargs=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u30FB\u30E1\u30BD\u30C3\u30C9{0}\u306Ffinal\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
  37.425  
  37.426 -# 0: type, 1: kind, 2: symbol
  37.427 +# 0: type, 1: symbol kind, 2: symbol
  37.428  compiler.misc.inaccessible.varargs.type=\u4EEE\u53EF\u5909\u5F15\u6570\u8981\u7D20\u578B{0}\u306F{1} {2}\u304B\u3089\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093
  37.429  
  37.430  # In the following string, {1} will always be the detail message from
  37.431 @@ -620,7 +766,7 @@
  37.432  
  37.433  ## All errors which do not refer to a particular line in the source code are
  37.434  ## preceded by this string.
  37.435 -compiler.err.error=\u30A8\u30E9\u30FC:\u0020
  37.436 +compiler.err.error=\u30A8\u30E9\u30FC: 
  37.437  
  37.438  # The following error messages do not refer to a line in the source code.
  37.439  compiler.err.cant.read.file={0}\u3092\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093
  37.440 @@ -637,7 +783,7 @@
  37.441  
  37.442  compiler.misc.fatal.err.cant.locate.ctor=\u81F4\u547D\u7684\u30A8\u30E9\u30FC: {0}\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3092\u691C\u51FA\u3067\u304D\u307E\u305B\u3093
  37.443  
  37.444 -compiler.misc.fatal.err.cant.close.loader=\u81F4\u547D\u7684\u30A8\u30E9\u30FC: \u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u306E\u30AF\u30E9\u30B9\u30FB\u30ED\u30FC\u30C0\u30FC\u3092\u9589\u3058\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093
  37.445 +compiler.misc.fatal.err.cant.close=\u81F4\u547D\u7684\u30A8\u30E9\u30FC: \u30B3\u30F3\u30D1\u30A4\u30E9\u30FB\u30EA\u30BD\u30FC\u30B9\u3092\u9589\u3058\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093
  37.446  
  37.447  #####
  37.448  
  37.449 @@ -659,21 +805,24 @@
  37.450  
  37.451  ## The following string will appear before all messages keyed as:
  37.452  ## "compiler.note".
  37.453 +
  37.454 +compiler.note.potential.lambda.found=\u3053\u306E\u533F\u540D\u5185\u90E8\u30AF\u30E9\u30B9\u3092\u30E9\u30E0\u30C0\u5F0F\u306B\u5909\u63DB\u3067\u304D\u307E\u3059\u3002
  37.455 +
  37.456  compiler.note.note=\u6CE8\u610F:
  37.457  
  37.458  # 0: file name
  37.459 -compiler.note.deprecated.filename={0}\u306F\u63A8\u5968\u3055\u308C\u306A\u3044API\u3092\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u3059\u3002
  37.460 -
  37.461 -compiler.note.deprecated.plural=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u63A8\u5968\u3055\u308C\u306A\u3044API\u3092\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u3059\u3002
  37.462 +compiler.note.deprecated.filename={0}\u306F\u975E\u63A8\u5968\u306EAPI\u3092\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u3059\u3002
  37.463 +
  37.464 +compiler.note.deprecated.plural=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u975E\u63A8\u5968\u306EAPI\u3092\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u3059\u3002
  37.465  
  37.466  # The following string may appear after one of the above deprecation
  37.467  # messages.
  37.468  compiler.note.deprecated.recompile=\u8A73\u7D30\u306F\u3001-Xlint:deprecation\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u3066\u518D\u30B3\u30F3\u30D1\u30A4\u30EB\u3057\u3066\u304F\u3060\u3055\u3044\u3002
  37.469  
  37.470  # 0: file name
  37.471 -compiler.note.deprecated.filename.additional={0}\u306B\u63A8\u5968\u3055\u308C\u306A\u3044API\u306E\u8FFD\u52A0\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u304C\u3042\u308A\u307E\u3059\u3002
  37.472 -
  37.473 -compiler.note.deprecated.plural.additional=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u63A8\u5968\u3055\u308C\u306A\u3044API\u3092\u8FFD\u52A0\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u3059\u3002
  37.474 +compiler.note.deprecated.filename.additional={0}\u306B\u975E\u63A8\u5968\u306EAPI\u306E\u8FFD\u52A0\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u304C\u3042\u308A\u307E\u3059\u3002
  37.475 +
  37.476 +compiler.note.deprecated.plural.additional=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u975E\u63A8\u5968\u306EAPI\u3092\u8FFD\u52A0\u4F7F\u7528\u307E\u305F\u306F\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u3066\u3044\u307E\u3059\u3002
  37.477  
  37.478  # 0: file name
  37.479  compiler.note.unchecked.filename={0}\u306E\u64CD\u4F5C\u306F\u3001\u672A\u30C1\u30A7\u30C3\u30AF\u307E\u305F\u306F\u5B89\u5168\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
  37.480 @@ -773,12 +922,12 @@
  37.481  ##
  37.482  
  37.483  ## All warning messages are preceded by the following string.
  37.484 -compiler.warn.warning=\u8B66\u544A:
  37.485 +compiler.warn.warning=\u8B66\u544A: 
  37.486  
  37.487  ## Warning messages may also include the following prefix to identify a
  37.488  ## lint option
  37.489  # 0: option name
  37.490 -compiler.warn.lintOption=[{0}]\u0020
  37.491 +compiler.warn.lintOption=[{0}] 
  37.492  
  37.493  # 0: symbol
  37.494  compiler.warn.constant.SVUID=serialVersionUID\u306F\u30AF\u30E9\u30B9{0}\u306E\u5B9A\u6570\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
  37.495 @@ -789,7 +938,7 @@
  37.496  compiler.warn.finally.cannot.complete=finally\u7BC0\u304C\u6B63\u5E38\u306B\u5B8C\u4E86\u3067\u304D\u307E\u305B\u3093
  37.497  
  37.498  # 0: symbol, 1: symbol
  37.499 -compiler.warn.has.been.deprecated={1}\u306E{0}\u306F\u63A8\u5968\u3055\u308C\u307E\u305B\u3093
  37.500 +compiler.warn.has.been.deprecated={1}\u306E{0}\u306F\u975E\u63A8\u5968\u306B\u306A\u308A\u307E\u3057\u305F
  37.501  
  37.502  # 0: symbol
  37.503  compiler.warn.sun.proprietary={0}\u306F\u5185\u90E8\u6240\u6709\u306EAPI\u3067\u3042\u308A\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059
  37.504 @@ -925,7 +1074,7 @@
  37.505  # 0: symbol
  37.506  compiler.warn.varargs.unsafe.use.varargs.param=\u53EF\u5909\u5F15\u6570\u30E1\u30BD\u30C3\u30C9\u306F\u3001\u578B\u60C5\u5831\u4FDD\u6301\u53EF\u80FD\u3067\u306A\u3044\u53EF\u5909\u5F15\u6570\u30D1\u30E9\u30E1\u30FC\u30BF{0}\u304B\u3089\u306E\u30D2\u30FC\u30D7\u6C5A\u67D3\u306E\u539F\u56E0\u3068\u306A\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059
  37.507  
  37.508 -compiler.warn.missing.deprecated.annotation=\u63A8\u5968\u3055\u308C\u306A\u3044\u9805\u76EE\u306F@Deprecated\u3067\u6CE8\u91C8\u304C\u4ED8\u3051\u3089\u308C\u3066\u3044\u307E\u305B\u3093
  37.509 +compiler.warn.missing.deprecated.annotation=\u975E\u63A8\u5968\u306E\u9805\u76EE\u306F@Deprecated\u3067\u6CE8\u91C8\u304C\u4ED8\u3051\u3089\u308C\u3066\u3044\u307E\u305B\u3093
  37.510  
  37.511  compiler.warn.invalid.archive.file=\u30D1\u30B9\u4E0A\u306E\u4E88\u671F\u3057\u306A\u3044\u30D5\u30A1\u30A4\u30EB: {0}
  37.512  
  37.513 @@ -952,7 +1101,7 @@
  37.514  compiler.warn.diamond.redundant.args=\u65B0\u3057\u3044\u5F0F\u306E\u578B\u5F15\u6570\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059(\u304B\u308F\u308A\u306B\u30C0\u30A4\u30E4\u30E2\u30F3\u30C9\u6F14\u7B97\u5B50\u3092\u4F7F\u7528\u3057\u307E\u3059)\u3002
  37.515  
  37.516  # 0: type, 1: type
  37.517 -compiler.warn.diamond.redundant.args.1=\u65B0\u3057\u3044\u5F0F\u306E\u578B\u5F15\u6570\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059(\u304B\u308F\u308A\u306B\u30C0\u30A4\u30E4\u30E2\u30F3\u30C9\u6F14\u7B97\u5B50\u3092\u4F7F\u7528\u3057\u307E\u3059)\u3002\n\u660E\u793A\u7684: {0}\n\u63A8\u5B9A: {1}
  37.518 +compiler.warn.diamond.redundant.args.1=\u65B0\u3057\u3044\u5F0F\u306E\u578B\u5F15\u6570\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059(\u304B\u308F\u308A\u306B\u30C0\u30A4\u30E4\u30E2\u30F3\u30C9\u6F14\u7B97\u5B50\u3092\u4F7F\u7528\u3057\u307E\u3059)\u3002\n\u660E\u793A\u7684: {0}\n\u63A8\u8AD6: {1}
  37.519  
  37.520  # 0: symbol, 1: message segment
  37.521  compiler.warn.varargs.redundant.trustme.anno={0}\u6CE8\u91C8\u304C\u5197\u9577\u3067\u3059\u3002{1}
  37.522 @@ -1030,7 +1179,7 @@
  37.523  
  37.524  ## The following are all possible strings for the second argument ({1}) of the
  37.525  ## above strings.
  37.526 -compiler.misc.bad.class.signature=\u30AF\u30E9\u30B9{0}\u306E\u30B7\u30B0\u30CB\u30C1\u30E3\u304C\u4E0D\u6B63\u3067\u3059
  37.527 +compiler.misc.bad.class.signature=\u30AF\u30E9\u30B9{0}\u306E\u30B7\u30B0\u30CD\u30C1\u30E3\u304C\u4E0D\u6B63\u3067\u3059
  37.528  
  37.529  #0: symbol, 1: symbol
  37.530  compiler.misc.bad.enclosing.class={0}\u306E\u5185\u90E8\u30AF\u30E9\u30B9\u304C\u4E0D\u6B63\u3067\u3059: {1}
  37.531 @@ -1044,7 +1193,9 @@
  37.532  
  37.533  compiler.misc.bad.const.pool.tag.at=\u5B9A\u6570\u30D7\u30FC\u30EB\u30FB\u30BF\u30B0{1}\u3067\u306E{0}\u304C\u4E0D\u6B63\u3067\u3059
  37.534  
  37.535 -compiler.misc.bad.signature=\u30B7\u30B0\u30CB\u30C1\u30E3{0}\u304C\u4E0D\u6B63\u3067\u3059
  37.536 +compiler.misc.bad.signature=\u30B7\u30B0\u30CD\u30C1\u30E3{0}\u304C\u4E0D\u6B63\u3067\u3059
  37.537 +
  37.538 +compiler.misc.bad.type.annotation.value=\u6CE8\u91C8\u30BF\u30FC\u30B2\u30C3\u30C8\u578B\u306E\u5024\u306E\u578B\u304C\u4E0D\u6B63\u3067\u3059: {0}
  37.539  
  37.540  compiler.misc.class.file.wrong.class=\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB{0}\u306B\u4E0D\u6B63\u306A\u30AF\u30E9\u30B9\u304C\u3042\u308A\u307E\u3059
  37.541  
  37.542 @@ -1077,24 +1228,17 @@
  37.543  
  37.544  #####
  37.545  
  37.546 -# 0: message segment, 1: type, 2: type
  37.547 -compiler.err.prob.found.req={0}\n\u671F\u5F85\u5024: {2}\n\u691C\u51FA\u5024:    {1}
  37.548 +# 0: message segment
  37.549 +compiler.err.prob.found.req=\u4E0D\u9069\u5408\u306A\u578B: {0}
  37.550  
  37.551  # 0: message segment, 1: type, 2: type
  37.552  compiler.warn.prob.found.req={0}\n\u671F\u5F85\u5024: {2}\n\u691C\u51FA\u5024:    {1}
  37.553  
  37.554 -compiler.err.prob.found.req.1={0} {3}\n\u671F\u5F85\u5024: {2}\n\u691C\u51FA\u5024:    {1}
  37.555 -
  37.556 -## The following are all possible strings for the first argument ({0}) of the
  37.557 -## above strings.
  37.558 -compiler.misc.incompatible.types=\u4E92\u63DB\u6027\u306E\u306A\u3044\u578B
  37.559 -
  37.560 -# 0: message segment
  37.561 -compiler.misc.incompatible.types.1=\u4E92\u63DB\u6027\u306E\u306A\u3044\u578B\u3002{0}
  37.562 -
  37.563 -compiler.misc.inconvertible.types=\u5909\u63DB\u3067\u304D\u306A\u3044\u578B
  37.564 -
  37.565 -compiler.misc.possible.loss.of.precision=\u7CBE\u5EA6\u304C\u4F4E\u4E0B\u3057\u3066\u3044\u308B\u53EF\u80FD\u6027
  37.566 +# 0: type, 1: type
  37.567 +compiler.misc.inconvertible.types={0}\u3092{1}\u306B\u5909\u63DB\u3067\u304D\u307E\u305B\u3093:
  37.568 +
  37.569 +# 0: type, 1: type
  37.570 +compiler.misc.possible.loss.of.precision=\u7CBE\u5EA6\u304C\u5931\u308F\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308B{0}\u304B\u3089{1}\u3078\u306E\u5909\u63DB
  37.571  
  37.572  compiler.misc.unchecked.assign=\u7121\u691C\u67FB\u5909\u63DB
  37.573  
  37.574 @@ -1104,16 +1248,13 @@
  37.575  #     assigned array cannot dynamically check its stores
  37.576  compiler.misc.unchecked.cast.to.type=\u7121\u691C\u67FB\u30AD\u30E3\u30B9\u30C8
  37.577  
  37.578 -compiler.misc.assignment.from.super-bound=\u30B9\u30FC\u30D1\u30FC\u30D0\u30A6\u30F3\u30C9\u578B{0}\u304B\u3089\u306E\u4EE3\u5165
  37.579 -
  37.580 -compiler.misc.assignment.to.extends-bound=\u62E1\u5F35\u30D0\u30A6\u30F3\u30C9\u578B{0}\u3078\u306E\u4EE3\u5165
  37.581 -
  37.582  # compiler.err.star.expected=\
  37.583  #     ''*'' expected
  37.584  # compiler.err.no.elem.type=\
  37.585  #     \[\*\] cannot have a type
  37.586  
  37.587 -compiler.misc.try.not.applicable.to.type=try-with-resource\u306F\u5909\u6570\u578B\u306B\u9069\u7528\u3055\u308C\u307E\u305B\u3093
  37.588 +# 0: type
  37.589 +compiler.misc.try.not.applicable.to.type=try-with-resource\u306F\u5909\u6570\u578B\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\n({0})
  37.590  
  37.591  #####
  37.592  
  37.593 @@ -1139,25 +1280,44 @@
  37.594  
  37.595  ## The following are all possible strings for the last argument of all those
  37.596  ## diagnostics whose key ends in ".1"
  37.597 -compiler.misc.undetermined.type=\u672A\u5B9A\u578B
  37.598 -
  37.599 -compiler.misc.type.variable.has.undetermined.type=\u578B\u5909\u6570{0}\u306F\u672A\u5B9A\u578B\u3067\u3059
  37.600  
  37.601  # 0: type, 1: list of type
  37.602  compiler.misc.no.unique.maximal.instance.exists=\u578B\u5909\u6570{0}(\u4E0A\u9650{1})\u306E\u56FA\u6709\u306E\u6700\u5927\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u5B58\u5728\u3057\u307E\u305B\u3093
  37.603  
  37.604  compiler.misc.no.unique.minimal.instance.exists=\u578B\u5909\u6570{0}(\u4E0B\u9650{1})\u306E\u56FA\u6709\u306E\u6700\u5C0F\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u5B58\u5728\u3057\u307E\u305B\u3093
  37.605  
  37.606 +# 0: type, 1: list of type
  37.607 +compiler.misc.incompatible.upper.bounds=\u63A8\u8AD6\u5909\u6570{0}\u306B\u306F\u3001\u4E0D\u9069\u5408\u306A\u4E0A\u9650{1}\u304C\u3042\u308A\u307E\u3059
  37.608 +
  37.609 +# 0: type, 1: list of type, 2: list of type
  37.610 +compiler.misc.incompatible.eq.upper.bounds=\u63A8\u8AD6\u5909\u6570{0}\u306B\u306F\u3001\u4E0D\u9069\u5408\u306A\u5883\u754C\u304C\u3042\u308A\u307E\u3059\n\u7B49\u4FA1\u5236\u7D04: {1}\n\u4E0A\u9650: {2}
  37.611 +
  37.612 +# 0: type, 1: list of type, 2: list of type
  37.613 +compiler.misc.incompatible.eq.lower.bounds=\u63A8\u8AD6\u5909\u6570{0}\u306B\u306F\u3001\u4E0D\u9069\u5408\u306A\u5883\u754C\u304C\u3042\u308A\u307E\u3059\n\u7B49\u4FA1\u5236\u7D04: {1}\n\u4E0B\u9650: {2}
  37.614 +
  37.615  # 0: list of type, 1: type, 2: type
  37.616  compiler.misc.infer.no.conforming.instance.exists=\u578B\u5909\u6570{0}\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u5B58\u5728\u3057\u306A\u3044\u306E\u3067\u3001{1}\u306F{2}\u306B\u9069\u5408\u3057\u307E\u305B\u3093
  37.617  
  37.618 -# 0: list of type, 1: type, 2: type
  37.619 -compiler.misc.infer.no.conforming.assignment.exists=\u578B\u5909\u6570{0}\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u5B58\u5728\u3057\u306A\u3044\u306E\u3067\u3001\u5F15\u6570\u578B{1}\u306F\u4EEE\u30D1\u30E9\u30E1\u30FC\u30BF\u578B{2}\u306B\u9069\u5408\u3057\u307E\u305B\u3093
  37.620 -
  37.621 -compiler.misc.infer.arg.length.mismatch=\u5B9F\u5F15\u6570\u30EA\u30B9\u30C8\u3068\u4EEE\u5F15\u6570\u30EA\u30B9\u30C8\u306E\u9577\u3055\u304C\u7570\u306A\u308B\u305F\u3081\u3001\u5F15\u6570\u304B\u3089\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
  37.622 +# 0: list of type, 1: message segment
  37.623 +compiler.misc.infer.no.conforming.assignment.exists=\u578B\u5909\u6570{0}\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093\n(\u5F15\u6570\u306E\u4E0D\u4E00\u81F4: {1})
  37.624 +
  37.625 +# 0: list of type
  37.626 +compiler.misc.infer.arg.length.mismatch=\u578B\u5909\u6570{0}\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093\n(\u5B9F\u5F15\u6570\u30EA\u30B9\u30C8\u3068\u4EEE\u5F15\u6570\u30EA\u30B9\u30C8\u306E\u9577\u3055\u304C\u7570\u306A\u308A\u307E\u3059)
  37.627 +
  37.628 +# 0: list of type, 1: message segment
  37.629 +compiler.misc.infer.varargs.argument.mismatch=\u578B\u5909\u6570{0}\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093\n(\u53EF\u5909\u5F15\u6570\u306E\u4E0D\u4E00\u81F4: {1})
  37.630  
  37.631  # 0: type, 1: list of type
  37.632 -compiler.misc.inferred.do.not.conform.to.bounds=\u63A8\u5B9A\u578B\u306F\u5BA3\u8A00\u3055\u308C\u305F\u5883\u754C\u306B\u9069\u5408\u3057\u307E\u305B\u3093\n\u63A8\u5B9A: {0}\n\u5883\u754C: {1}
  37.633 +compiler.misc.inferred.do.not.conform.to.upper.bounds=\u63A8\u8AD6\u578B\u304C\u4E0A\u9650\u306B\u9069\u5408\u3057\u307E\u305B\u3093\n\u63A8\u8AD6: {0}\n\u4E0A\u9650: {1}
  37.634 +
  37.635 +# 0: type, 1: list of type
  37.636 +compiler.misc.inferred.do.not.conform.to.lower.bounds=\u63A8\u8AD6\u578B\u304C\u4E0B\u9650\u306B\u9069\u5408\u3057\u307E\u305B\u3093\n\u63A8\u8AD6: {0}\n\u4E0B\u9650: {1}
  37.637 +
  37.638 +# 0: type, 1: list of type
  37.639 +compiler.misc.inferred.do.not.conform.to.eq.bounds=\u63A8\u8AD6\u578B\u304C\u7B49\u4FA1\u5236\u7D04\u306B\u9069\u5408\u3057\u307E\u305B\u3093\n\u63A8\u8AD6: {0}\n\u7B49\u4FA1\u5236\u7D04: {1}
  37.640 +
  37.641 +# 0: list of type
  37.642 +compiler.misc.cyclic.inference=\u63A8\u8AD6\u306E\u30EB\u30FC\u30D7\u306E\u305F\u3081\u3001\u63A8\u8AD6\u5909\u6570{0}\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093
  37.643  
  37.644  # 0: symbol
  37.645  compiler.misc.diamond={0}<>
  37.646 @@ -1165,6 +1325,7 @@
  37.647  # 0: type
  37.648  compiler.misc.diamond.non.generic=\u975E\u6C4E\u7528\u30AF\u30E9\u30B9{0}\u3067''<>''\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
  37.649  
  37.650 +# 0: unused
  37.651  compiler.misc.diamond.and.explicit.params=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u660E\u793A\u7684\u306A\u578B\u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u306F''<>''\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
  37.652  
  37.653  # 0: type, 1: list of type
  37.654 @@ -1172,14 +1333,18 @@
  37.655  
  37.656  compiler.misc.arg.length.mismatch=\u5B9F\u5F15\u6570\u30EA\u30B9\u30C8\u3068\u4EEE\u5F15\u6570\u30EA\u30B9\u30C8\u306E\u9577\u3055\u304C\u7570\u306A\u308A\u307E\u3059
  37.657  
  37.658 -# 0: type, 1: type
  37.659 -compiler.misc.no.conforming.assignment.exists=\u5B9F\u5F15\u6570{0}\u306F\u30E1\u30BD\u30C3\u30C9\u547C\u51FA\u5909\u63DB\u306B\u3088\u3063\u3066{1}\u306B\u5909\u63DB\u3067\u304D\u307E\u305B\u3093
  37.660 -
  37.661 -# 0: type, 1: type
  37.662 -compiler.misc.varargs.argument.mismatch=\u5F15\u6570\u578B{0}\u306F\u53EF\u5909\u5F15\u6570\u8981\u7D20\u578B{1}\u306B\u9069\u5408\u3057\u307E\u305B\u3093
  37.663 +# 0: message segment
  37.664 +compiler.misc.no.conforming.assignment.exists=\u5F15\u6570\u306E\u4E0D\u4E00\u81F4: {0}
  37.665 +
  37.666 +# 0: message segment
  37.667 +compiler.misc.varargs.argument.mismatch=\u53EF\u5909\u5F15\u6570\u306E\u4E0D\u4E00\u81F4: {0}
  37.668  
  37.669  #####
  37.670  
  37.671 +# 0: type, 1: file name
  37.672 +compiler.warn.auxiliary.class.accessed.from.outside.of.its.source.file={1}\u306E\u88DC\u52A9\u30AF\u30E9\u30B9{0}\u306B\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u5916\u304B\u3089\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093
  37.673 +
  37.674 +
  37.675  ## The first argument ({0}) is a "kindname".
  37.676  # 0: symbol kind, 1: symbol, 2: symbol
  37.677  compiler.err.abstract.cant.be.accessed.directly=\u62BD\u8C61{0}\u3067\u3042\u308B{1}({2}\u5185)\u306B\u76F4\u63A5\u30A2\u30AF\u30BB\u30B9\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
  37.678 @@ -1188,10 +1353,17 @@
  37.679  # 0: symbol kind, 1: symbol
  37.680  compiler.err.non-static.cant.be.ref=static\u3067\u306A\u3044{0} {1}\u3092static\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u304B\u3089\u53C2\u7167\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
  37.681  
  37.682 +# 0: symbol kind, 1: symbol
  37.683 +compiler.misc.non-static.cant.be.ref=static\u3067\u306A\u3044{0} {1}\u3092static\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u304B\u3089\u53C2\u7167\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
  37.684 +
  37.685  ## Both arguments ({0}, {1}) are "kindname"s.  {0} is a comma-separated list
  37.686  ## of kindnames (the list should be identical to that provided in source.
  37.687  compiler.err.unexpected.type=\u4E88\u671F\u3057\u306A\u3044\u578B\n\u671F\u5F85\u5024: {0}\n\u691C\u51FA\u5024:    {1}
  37.688  
  37.689 +compiler.err.unexpected.lambda=\u3053\u3053\u3067\u306F\u30E9\u30E0\u30C0\u5F0F\u306F\u4E88\u671F\u3055\u308C\u3066\u3044\u307E\u305B\u3093
  37.690 +
  37.691 +compiler.err.unexpected.mref=\u3053\u3053\u3067\u306F\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u306F\u4E88\u671F\u3055\u308C\u3066\u3044\u307E\u305B\u3093
  37.692 +
  37.693  ## The first argument {0} is a "kindname" (e.g. 'constructor', 'field', etc.)
  37.694  ## The second argument {1} is the non-resolved symbol
  37.695  ## The third argument {2} is a list of type parameters (non-empty if {1} is a method)
  37.696 @@ -1216,12 +1388,20 @@
  37.697  # 0: symbol kind, 1: name, 2: list of type, 3: list, 4: message segment
  37.698  compiler.err.cant.resolve.location.args.params=\u30B7\u30F3\u30DC\u30EB\u3092\u898B\u3064\u3051\u3089\u308C\u307E\u305B\u3093\n\u30B7\u30F3\u30DC\u30EB:   {0} <{2}>{1}({3})\n\u5834\u6240: {4}
  37.699  
  37.700 +### Following are replicated/used for method reference diagnostics
  37.701 +
  37.702 +# 0: symbol kind, 1: name, 2: unused, 3: list of type, 4: message segment
  37.703 +compiler.misc.cant.resolve.location.args=\u30B7\u30F3\u30DC\u30EB\u3092\u898B\u3064\u3051\u3089\u308C\u307E\u305B\u3093\n\u30B7\u30F3\u30DC\u30EB:   {0} {1}({3})\n\u5834\u6240: {4}
  37.704 +
  37.705 +# 0: symbol kind, 1: name, 2: list of type, 3: list, 4: message segment
  37.706 +compiler.misc.cant.resolve.location.args.params=\u30B7\u30F3\u30DC\u30EB\u3092\u898B\u3064\u3051\u3089\u308C\u307E\u305B\u3093\n\u30B7\u30F3\u30DC\u30EB:   {0} <{2}>{1}({3})\n\u5834\u6240: {4}
  37.707 +
  37.708  ##a location subdiagnostic is composed as follows:
  37.709  ## The first argument {0} is the location "kindname" (e.g. 'constructor', 'field', etc.)
  37.710  ## The second argument {1} is the location name
  37.711  ## The third argument {2} is the location type (only when {1} is a variable name)
  37.712  
  37.713 -# 0: symbol kind, 1: symbol, 2: unused
  37.714 +# 0: symbol kind, 1: type or symbol, 2: unused
  37.715  compiler.misc.location={0} {1}
  37.716  
  37.717  # 0: symbol kind, 1: symbol, 2: type
  37.718 @@ -1236,7 +1416,7 @@
  37.719  
  37.720  compiler.misc.kindname.constructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
  37.721  
  37.722 -compiler.misc.kindname.enum=\u5217\u6319
  37.723 +compiler.misc.kindname.enum=\u5217\u6319\u578B
  37.724  
  37.725  compiler.misc.kindname.interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
  37.726  
  37.727 @@ -1256,6 +1436,10 @@
  37.728  
  37.729  compiler.misc.kindname.package=\u30D1\u30C3\u30B1\u30FC\u30B8
  37.730  
  37.731 +compiler.misc.kindname.static.init=static\u521D\u671F\u5316\u5B50
  37.732 +
  37.733 +compiler.misc.kindname.instance.init=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u521D\u671F\u5316\u5B50
  37.734 +
  37.735  #####
  37.736  
  37.737  compiler.misc.no.args=\u5F15\u6570\u304C\u3042\u308A\u307E\u305B\u3093
  37.738 @@ -1312,6 +1496,7 @@
  37.739  # 0: symbol, 1: symbol, 2: symbol, 3: symbol
  37.740  compiler.misc.varargs.clash.with={1}\u306E{0}\u306F{3}\u306E{2}\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059
  37.741  
  37.742 +# 0: unused
  37.743  compiler.misc.diamond.and.anon.class=\u533F\u540D\u5185\u90E8\u30AF\u30E9\u30B9\u3067\u306F''<>''\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
  37.744  
  37.745  # 0: symbol kind, 1: symbol, 2: symbol, 3: message segment
  37.746 @@ -1336,13 +1521,23 @@
  37.747  
  37.748  compiler.warn.assert.as.identifier=\u30EA\u30EA\u30FC\u30B91.4\u304B\u3089''assert''\u306F\u30AD\u30FC\u30EF\u30FC\u30C9\u306A\u306E\u3067\u3001\u8B58\u5225\u5B50\u3068\u3057\u3066\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\n(''assert''\u3092\u30AD\u30FC\u30EF\u30FC\u30C9\u3068\u3057\u3066\u4F7F\u7528\u3059\u308B\u306B\u306F\u3001-source 1.4\u4EE5\u964D\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044)
  37.749  
  37.750 +compiler.warn.underscore.as.identifier=\u8B58\u5225\u5B50\u3068\u3057\u3066''_''\u304C\u4F7F\u7528\u3055\u308C\u307E\u3057\u305F\n(\u8B58\u5225\u5B50\u3068\u3057\u3066\u306E''_''\u306E\u4F7F\u7528\u306F\u3001\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u306A\u3044\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059)
  37.751 +
  37.752  compiler.err.enum.as.identifier=\u30EA\u30EA\u30FC\u30B95\u304B\u3089''enum''\u306F\u30AD\u30FC\u30EF\u30FC\u30C9\u306A\u306E\u3067\u8B58\u5225\u5B50\u3068\u3057\u3066\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\n(''enum''\u3092\u8B58\u5225\u5B50\u3068\u3057\u3066\u4F7F\u7528\u3059\u308B\u306B\u306F-source 1.4\u4EE5\u524D\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044)
  37.753  
  37.754  compiler.err.assert.as.identifier=\u30EA\u30EA\u30FC\u30B91.4\u304B\u3089''assert''\u306F\u30AD\u30FC\u30EF\u30FC\u30C9\u306A\u306E\u3067\u3001\u8B58\u5225\u5B50\u3068\u3057\u3066\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\n(''assert''\u3092\u8B58\u5225\u5B50\u3068\u3057\u3066\u4F7F\u7528\u3059\u308B\u306B\u306F\u3001-source 1.3\u4EE5\u524D\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044)
  37.755  
  37.756  # TODO 308: make a better error message
  37.757 -# compiler.err.this.as.identifier=\
  37.758 -#    as of release 8, ''this'' is allowed as the parameter name for the receiver type only, which has to be the first parameter
  37.759 +compiler.err.this.as.identifier=\u30EA\u30EA\u30FC\u30B98\u304B\u3089''this''\u306F\u53D7\u4FE1\u30BF\u30A4\u30D7\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u540D\u3068\u3057\u3066\u306E\u307F\u8A31\u53EF\u3055\u308C\u3001\u6700\u521D\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
  37.760 +
  37.761 +# TODO 308: make a better error message
  37.762 +compiler.err.cant.annotate.static.class=\u5305\u542B\u3059\u308Bstatic\u306E\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306F\u6CE8\u91C8\u4ED8\u3051\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
  37.763 +# TODO 308: make a better error message
  37.764 +compiler.err.cant.annotate.nested.type=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30BF\u30A4\u30D7\u306F\u6CE8\u91C8\u4ED8\u3051\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
  37.765 +
  37.766 +compiler.err.incorrect.receiver.type=\u53D7\u4FE1\u30BF\u30A4\u30D7\u304C\u3001\u5305\u542B\u3059\u308B\u30AF\u30E9\u30B9\u30FB\u30BF\u30A4\u30D7\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093
  37.767 +
  37.768 +compiler.err.no.annotations.on.dot.class=\u6CE8\u91C8\u306F\u30AF\u30E9\u30B9\u30FB\u30EA\u30C6\u30E9\u30EB\u306E\u30BF\u30A4\u30D7\u3067\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
  37.769  
  37.770  # 0: string
  37.771  compiler.err.generics.not.supported.in.source=\u7DCF\u79F0\u578B\u306F-source {0}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n(\u7DCF\u79F0\u578B\u3092\u4F7F\u7528\u53EF\u80FD\u306B\u3059\u308B\u306B\u306F\u3001-source 5\u4EE5\u964D\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044)
  37.772 @@ -1353,9 +1548,8 @@
  37.773  # 0: string
  37.774  compiler.err.annotations.not.supported.in.source=\u6CE8\u91C8\u306F-source {0}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n(\u6CE8\u91C8\u3092\u4F7F\u7528\u53EF\u80FD\u306B\u3059\u308B\u306B\u306F\u3001-source 5\u4EE5\u964D\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044)
  37.775  
  37.776 -#308 compiler.err.type.annotations.not.supported.in.source=\
  37.777 -#308     type annotations are not supported in -source {0}\n\
  37.778 -#308 (use -source 8 or higher to enable type annotations)
  37.779 +# 0: string
  37.780 +compiler.err.type.annotations.not.supported.in.source=\u30BF\u30A4\u30D7\u6CE8\u91C8\u306F-source {0}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n(\u30BF\u30A4\u30D7\u6CE8\u91C8\u3092\u4F7F\u7528\u53EF\u80FD\u306B\u3059\u308B\u306B\u306F\u3001-source 8\u4EE5\u4E0A\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044)
  37.781  
  37.782  # 0: string
  37.783  compiler.err.foreach.not.supported.in.source=for-each\u30EB\u30FC\u30D7\u306F-source {0}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n(for-each\u30EB\u30FC\u30D7\u3092\u4F7F\u7528\u53EF\u80FD\u306B\u3059\u308B\u306B\u306F\u3001-source 5\u4EE5\u964D\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044)
  37.784 @@ -1375,6 +1569,47 @@
  37.785  # 0: string
  37.786  compiler.err.string.switch.not.supported.in.source=switch\u5185\u306E\u6587\u5B57\u5217\u306F-source {0}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n(switch\u5185\u306E\u6587\u5B57\u5217\u3092\u4F7F\u7528\u53EF\u80FD\u306B\u3059\u308B\u306B\u306F\u3001-source 7\u4EE5\u964D\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044)
  37.787  
  37.788 +# 0: string
  37.789 +compiler.err.lambda.not.supported.in.source=\u30E9\u30E0\u30C0\u5F0F\u306F-source {0}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n(\u30E9\u30E0\u30C0\u5F0F\u3092\u4F7F\u7528\u53EF\u80FD\u306B\u3059\u308B\u306B\u306F\u3001-source 8\u4EE5\u4E0A\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044)
  37.790 +
  37.791 +# 0: string
  37.792 +compiler.err.method.references.not.supported.in.source=\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u306F-source {0}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n(\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u3092\u4F7F\u7528\u53EF\u80FD\u306B\u3059\u308B\u306B\u306F\u3001-source 8\u4EE5\u4E0A\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044)
  37.793 +
  37.794 +# 0: string
  37.795 +compiler.err.default.methods.not.supported.in.source=\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30E1\u30BD\u30C3\u30C9\u306F-source {0}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n(\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30E1\u30BD\u30C3\u30C9\u3092\u4F7F\u7528\u53EF\u80FD\u306B\u3059\u308B\u306B\u306F\u3001-source 8\u4EE5\u4E0A\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044)
  37.796 +
  37.797 +# 0: string
  37.798 +compiler.err.intersection.types.in.cast.not.supported.in.source=\u30AD\u30E3\u30B9\u30C8\u5185\u306Eintersection\u578B\u306F-source {0}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n(\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30E1\u30BD\u30C3\u30C9\u3092\u4F7F\u7528\u53EF\u80FD\u306B\u3059\u308B\u306B\u306F\u3001-source 8\u4EE5\u4E0A\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044)
  37.799 +
  37.800 +# 0: string
  37.801 +compiler.err.static.intf.methods.not.supported.in.source=static\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306F-source {0}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n(static\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u4F7F\u7528\u53EF\u80FD\u306B\u3059\u308B\u306B\u306F\u3001-source 8\u4EE5\u4E0A\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044)
  37.802 +
  37.803 +########################################
  37.804 +# Diagnostics for verbose resolution
  37.805 +# used by Resolve (debug only)
  37.806 +########################################
  37.807 +
  37.808 +# 0: number, 1: symbol, 2: unused
  37.809 +compiler.misc.applicable.method.found=#{0}\u500B\u306E\u4F7F\u7528\u53EF\u80FD\u30E1\u30BD\u30C3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F: {1}
  37.810 +
  37.811 +# 0: number, 1: symbol, 2: message segment
  37.812 +compiler.misc.applicable.method.found.1=#{0}\u500B\u306E\u4F7F\u7528\u53EF\u80FD\u30E1\u30BD\u30C3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F: {1}\n({2})
  37.813 +
  37.814 +# 0: number, 1: symbol, 2: message segment
  37.815 +compiler.misc.not.applicable.method.found=#{0}\u500B\u306E\u4F7F\u7528\u3067\u304D\u306A\u3044\u30E1\u30BD\u30C3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F: {1}\n({2})
  37.816 +
  37.817 +# 0: type
  37.818 +compiler.misc.partial.inst.sig=\u90E8\u5206\u7684\u306B\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3055\u308C\u307E\u3057\u305F: {0}
  37.819 +
  37.820 +# 0: name, 1: symbol, 2: number, 3: MethodResolutionPhase, 4: list of type or message segment, 5: list of type or message segment
  37.821 +compiler.note.verbose.resolve.multi=\u578B{1}\u306E\u30E1\u30BD\u30C3\u30C9{0}\u3092\u5019\u88DC{2}\u306B\u89E3\u6C7A\u3057\u3066\u3044\u307E\u3059\n\u30D5\u30A7\u30FC\u30BA: {3}\n\u5B9F\u969B\u306E\u578B: {4}\n\u578B\u5F15\u6570: {5}\n\u5019\u88DC:
  37.822 +
  37.823 +# 0: name, 1: symbol, 2: unused, 3: MethodResolutionPhase, 4: list of type or message segment, 5: list of type or message segment
  37.824 +compiler.note.verbose.resolve.multi.1=\u578B{1}\u306E\u30E1\u30BD\u30C3\u30C9{0}\u306E\u89E3\u6C7A\u306B\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3059\n\u30D5\u30A7\u30FC\u30BA: {3}\n\u5B9F\u969B\u306E\u578B: {4}\n\u578B\u5F15\u6570: {5}\n\u5019\u88DC:
  37.825 +
  37.826 +# 0: symbol, 1: type, 2: type
  37.827 +compiler.note.deferred.method.inst=\u30E1\u30BD\u30C3\u30C9{0}\u306E\u9045\u5EF6\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\n\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3055\u308C\u305F\u30B7\u30B0\u30CD\u30C1\u30E3: {1}\n\u30BF\u30FC\u30B2\u30C3\u30C8\u578B: {2}
  37.828 +
  37.829  ########################################
  37.830  # Diagnostics for where clause implementation
  37.831  # used by the RichDiagnosticFormatter.
  37.832 @@ -1397,26 +1632,32 @@
  37.833  # where clause for captured type: contains upper ('extends {1}') and lower
  37.834  # ('super {2}') bound along with the wildcard that generated this captured type ({3})
  37.835  # 0: type, 1: type, 2: type, 3: type
  37.836 -compiler.misc.where.captured={3}\u306E\u30AD\u30E3\u30D7\u30C1\u30E3\u304B\u3089\u306E{0} extends {1} super: {2}
  37.837 +compiler.misc.where.captured={0}\u306F{3}\u306E\u30AD\u30E3\u30D7\u30C1\u30E3\u304B\u3089{1}\u3092\u62E1\u5F35\u3057{2}\u3092\u30B9\u30FC\u30D1\u30FC\u3057\u307E\u3059
  37.838  
  37.839  # compact where clause for captured type: contains upper ('extends {1}') along
  37.840  # with the wildcard that generated this captured type ({3})
  37.841  # 0: type, 1: type, 2: unused, 3: type
  37.842 -compiler.misc.where.captured.1={3}\u306E\u30AD\u30E3\u30D7\u30C1\u30E3\u304B\u3089\u306E{0} extends {1}
  37.843 +compiler.misc.where.captured.1={0}\u306F{3}\u306E\u30AD\u30E3\u30D7\u30C1\u30E3\u304B\u3089{1}\u3092\u62E1\u5F35\u3057\u307E\u3059
  37.844  
  37.845  # where clause for type variable: contains upper bound(s) ('extends {1}') along with
  37.846  # the kindname ({2}) and location ({3}) in which the typevar has been declared
  37.847  # 0: type, 1: list of type, 2: symbol kind, 3: symbol
  37.848 -compiler.misc.where.typevar={2} {3}\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B{0} extends {1}
  37.849 +compiler.misc.where.typevar={2} {3}\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B{0}\u306F{1}\u3092\u62E1\u5F35\u3057\u307E\u3059
  37.850  
  37.851  # compact where clause for type variable: contains the kindname ({2}) and location ({3})
  37.852  # in which the typevar has been declared
  37.853 +# 0: type, 1: list of type, 2: symbol kind, 3: symbol
  37.854  compiler.misc.where.typevar.1={2} {3}\u3067\u5BA3\u8A00\u3055\u308C\u305F{0}
  37.855  
  37.856 +# where clause for fresh type variable: contains upper bound(s) ('extends {1}').
  37.857 +# Since a fresh type-variable is synthetic - there's no location/kindname here.
  37.858 +# 0: type, 1: list of type
  37.859 +compiler.misc.where.fresh.typevar={0}\u306F{1}\u3092\u62E1\u5F35\u3057\u307E\u3059
  37.860 +
  37.861  # where clause for type variable: contains all the upper bound(s) ('extends {1}')
  37.862  # of this intersection type
  37.863  # 0: type, 1: list of type
  37.864 -compiler.misc.where.intersection={0} extends {1}
  37.865 +compiler.misc.where.intersection={0}\u306F{1}\u3092\u62E1\u5F35\u3057\u307E\u3059
  37.866  
  37.867  ### Where clause headers ###
  37.868  compiler.misc.where.description.captured={0}\u304C\u65B0\u3057\u3044\u578B\u5909\u6570\u306E\u5834\u5408:
  37.869 @@ -1435,4 +1676,39 @@
  37.870  
  37.871  compiler.misc.where.description.intersection.1={0}\u304Cintersection\u578B\u306E\u5834\u5408:
  37.872  
  37.873 -
  37.874 +###
  37.875 +# errors related to doc comments
  37.876 +
  37.877 +compiler.err.dc.bad.entity=HTML\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u304C\u4E0D\u6B63\u3067\u3059
  37.878 +
  37.879 +compiler.err.dc.bad.gt=''>''\u306E\u4F7F\u7528\u304C\u4E0D\u6B63\u3067\u3059
  37.880 +
  37.881 +compiler.err.dc.bad.inline.tag=\u30A4\u30F3\u30E9\u30A4\u30F3\u30FB\u30BF\u30B0\u306E\u4F7F\u7528\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093
  37.882 +
  37.883 +compiler.err.dc.identifier.expected=\u8B58\u5225\u5B50\u304C\u5FC5\u8981\u3067\u3059
  37.884 +
  37.885 +compiler.err.dc.malformed.html=HTML\u304C\u4E0D\u6B63\u3067\u3059
  37.886 +
  37.887 +compiler.err.dc.missing.semicolon=\u30BB\u30DF\u30B3\u30ED\u30F3\u304C\u3042\u308A\u307E\u305B\u3093
  37.888 +
  37.889 +compiler.err.dc.no.content=\u30B3\u30F3\u30C6\u30F3\u30C4\u306A\u3057
  37.890 +
  37.891 +compiler.err.dc.no.tag.name='@'\u306E\u5F8C\u306B\u30BF\u30B0\u540D\u304C\u3042\u308A\u307E\u305B\u3093
  37.892 +
  37.893 +compiler.err.dc.gt.expected=''>''\u304C\u5FC5\u8981\u3067\u3059
  37.894 +
  37.895 +compiler.err.dc.ref.bad.parens=\u53C2\u7167\u306B'')''\u304C\u3042\u308A\u307E\u305B\u3093
  37.896 +
  37.897 +compiler.err.dc.ref.syntax.error=\u53C2\u7167\u306B\u69CB\u6587\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3059
  37.898 +
  37.899 +compiler.err.dc.ref.unexpected.input=\u4E88\u671F\u3057\u306A\u3044\u30C6\u30AD\u30B9\u30C8\u3067\u3059
  37.900 +
  37.901 +compiler.err.dc.unexpected.content=\u4E88\u671F\u3057\u306A\u3044\u30B3\u30F3\u30C6\u30F3\u30C4\u3067\u3059
  37.902 +
  37.903 +compiler.err.dc.unterminated.inline.tag=\u30A4\u30F3\u30E9\u30A4\u30F3\u30FB\u30BF\u30B0\u304C\u7D42\u4E86\u3057\u3066\u3044\u307E\u305B\u3093
  37.904 +
  37.905 +compiler.err.dc.unterminated.signature=\u30B7\u30B0\u30CD\u30C1\u30E3\u304C\u7D42\u4E86\u3057\u3066\u3044\u307E\u305B\u3093
  37.906 +
  37.907 +compiler.err.dc.unterminated.string=\u6587\u5B57\u5217\u304C\u7D42\u4E86\u3057\u3066\u3044\u307E\u305B\u3093
  37.908 +
  37.909 +