Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java	Thu Dec 19 17:24:35 2013 -0800
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java	Mon Dec 23 14:46:25 2013 -0800
     1.3 @@ -115,12 +115,6 @@
     1.4          boolean nodeprecated = configuration.nodeprecated;
     1.5          performCopy(configuration.helpfile);
     1.6          performCopy(configuration.stylesheetfile);
     1.7 -        copyResourceFile("background.gif");
     1.8 -        copyResourceFile("tab.gif");
     1.9 -        copyResourceFile("titlebar.gif");
    1.10 -        copyResourceFile("titlebar_end.gif");
    1.11 -        copyResourceFile("activetitlebar.gif");
    1.12 -        copyResourceFile("activetitlebar_end.gif");
    1.13          // do early to reduce memory footprint
    1.14          if (configuration.classuse) {
    1.15              ClassUseWriter.generate(configuration, classtree);
    1.16 @@ -314,16 +308,6 @@
    1.17          return docletToStart.configuration.validOptions(options, reporter);
    1.18      }
    1.19  
    1.20 -    /**
    1.21 -     * Copy a file in the resources directory to the destination directory.
    1.22 -     * @param resource   The name of the resource file to copy
    1.23 -     */
    1.24 -    private void copyResourceFile(String resource) {
    1.25 -        DocPath p = DocPaths.RESOURCES.resolve(resource);
    1.26 -        DocFile f = DocFile.createFileForOutput(configuration, p);
    1.27 -        f.copyResource(p, false, false);
    1.28 -    }
    1.29 -
    1.30      private void performCopy(String filename) {
    1.31          if (filename.isEmpty())
    1.32              return;

     2.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Thu Dec 19 17:24:35 2013 -0800
     2.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Mon Dec 23 14:46:25 2013 -0800
     2.3 @@ -1363,7 +1363,7 @@
     2.4              return new ContentBuilder();
     2.5          }
     2.6  
     2.7 -        String seetext = replaceDocRootDir(see.text());
     2.8 +        String seetext = replaceDocRootDir(Util.normalizeNewlines(see.text()));
     2.9  
    2.10          //Check if @see is an href or "string"
    2.11          if (seetext.startsWith("<") || seetext.startsWith("\"")) {

     3.1 Binary file src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/activetitlebar.gif has changed

     4.1 Binary file src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/activetitlebar_end.gif has changed

     5.1 Binary file src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/background.gif has changed

     6.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties	Thu Dec 19 17:24:35 2013 -0800
     6.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties	Mon Dec 23 14:46:25 2013 -0800
     6.3 @@ -134,6 +134,7 @@
     6.4  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}
     6.5  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
     6.6  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
     6.7 +doclet.value_tag_invalid_use=@value\u30BF\u30B0\u306F\u3053\u3053\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
     6.8  doclet.dest_dir_create=\u5B9B\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u4F5C\u6210\u4E2D: "{0}"
     6.9  doclet.in={1}\u306E{0}
    6.10  doclet.Use_Table_Summary=\u8868\u3001{0}\u306E\u30EA\u30B9\u30C8\u304A\u3088\u3073\u8AAC\u660E\u306E\u4F7F\u7528

     7.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties	Thu Dec 19 17:24:35 2013 -0800
     7.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties	Mon Dec 23 14:46:25 2013 -0800
     7.3 @@ -134,6 +134,7 @@
     7.4  doclet.Groupname_already_used=\u5728 -group \u9009\u9879\u4E2D, groupname \u5DF2\u4F7F\u7528: {0}
     7.5  doclet.value_tag_invalid_reference={0} (\u7531 @value \u6807\u8BB0\u5F15\u7528) \u4E3A\u672A\u77E5\u5F15\u7528\u3002
     7.6  doclet.value_tag_invalid_constant=@value \u6807\u8BB0 (\u5F15\u7528{0}) \u53EA\u80FD\u5728\u5E38\u91CF\u4E2D\u4F7F\u7528\u3002
     7.7 +doclet.value_tag_invalid_use=\u6B64\u5904\u4E0D\u80FD\u4F7F\u7528 @value \u6807\u8BB0\u3002
     7.8  doclet.dest_dir_create=\u6B63\u5728\u521B\u5EFA\u76EE\u6807\u76EE\u5F55: "{0}"
     7.9  doclet.in={1}\u4E2D\u7684{0}
    7.10  doclet.Use_Table_Summary=\u4F7F\u7528\u8868, \u5217\u8868{0}\u548C\u89E3\u91CA

     8.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css	Thu Dec 19 17:24:35 2013 -0800
     8.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css	Mon Dec 23 14:46:25 2013 -0800
     8.3 @@ -2,16 +2,19 @@
     8.4  /*
     8.5  Overall document style
     8.6  */
     8.7 +
     8.8 +@import url('resources/fonts/dejavu.css');
     8.9 +
    8.10  body {
    8.11      background-color:#ffffff;
    8.12      color:#353833;
    8.13 -    font-family:Arial, Helvetica, sans-serif;
    8.14 -    font-size:76%;
    8.15 +    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
    8.16 +    font-size:14px;
    8.17      margin:0;
    8.18  }
    8.19  a:link, a:visited {
    8.20      text-decoration:none;
    8.21 -    color:#4c6b87;
    8.22 +    color:#4A6782;
    8.23  }
    8.24  a:hover, a:focus {
    8.25      text-decoration:none;
    8.26 @@ -19,7 +22,7 @@
    8.27  }
    8.28  a:active {
    8.29      text-decoration:none;
    8.30 -    color:#4c6b87;
    8.31 +    color:#4A6782;
    8.32  }
    8.33  a[name] {
    8.34      color:#353833;
    8.35 @@ -29,41 +32,51 @@
    8.36      color:#353833;
    8.37  }
    8.38  pre {
    8.39 -    font-size:1.3em;
    8.40 +    font-family:'DejaVu Sans Mono', monospace;
    8.41 +    font-size:14px;
    8.42  }
    8.43  h1 {
    8.44 -    font-size:1.8em;
    8.45 +    font-size:20px;
    8.46  }
    8.47  h2 {
    8.48 -    font-size:1.5em;
    8.49 +    font-size:18px;
    8.50  }
    8.51  h3 {
    8.52 -    font-size:1.4em;
    8.53 +    font-size:16px;
    8.54 +    font-style:italic;
    8.55  }
    8.56  h4 {
    8.57 -    font-size:1.3em;
    8.58 +    font-size:13px;
    8.59  }
    8.60  h5 {
    8.61 -    font-size:1.2em;
    8.62 +    font-size:12px;
    8.63  }
    8.64  h6 {
    8.65 -    font-size:1.1em;
    8.66 +    font-size:11px;
    8.67  }
    8.68  ul {
    8.69      list-style-type:disc;
    8.70  }
    8.71  code, tt {
    8.72 -    font-size:1.2em;
    8.73 +    font-family:'DejaVu Sans Mono', monospace;
    8.74 +    font-size:14px;
    8.75 +    padding-top:4px;
    8.76 +    margin-top:8px;
    8.77 +    line-height:1.4em;
    8.78  }
    8.79  dt code {
    8.80 -    font-size:1.2em;
    8.81 +    font-family:'DejaVu Sans Mono', monospace;
    8.82 +    font-size:14px;
    8.83 +    padding-top:4px;
    8.84  }
    8.85  table tr td dt code {
    8.86 -    font-size:1.2em;
    8.87 +    font-family:'DejaVu Sans Mono', monospace;
    8.88 +    font-size:14px;
    8.89      vertical-align:top;
    8.90 +    padding-top:4px;
    8.91  }
    8.92  sup {
    8.93 -    font-size:.6em;
    8.94 +    font-size:8px;
    8.95  }
    8.96  /*
    8.97  Document title and Copyright styles
    8.98 @@ -76,10 +89,9 @@
    8.99  .aboutLanguage {
   8.100      float:right;
   8.101      padding:0px 21px;
   8.102 -    font-size:.8em;
   8.103 -    font-style:italic;
   8.104 +    font-size:11px;
   8.105      z-index:200;
   8.106 -    margin-top:-7px;
   8.107 +    margin-top:-9px;
   8.108  }
   8.109  .legalCopy {
   8.110      margin-left:.5em;
   8.111 @@ -93,9 +105,6 @@
   8.112  }
   8.113  .tab {
   8.114      background-color:#0066FF;
   8.115 -    background-image:url(resources/titlebar.gif);
   8.116 -    background-position:left top;
   8.117 -    background-repeat:no-repeat;
   8.118      color:#ffffff;
   8.119      padding:8px;
   8.120      width:5em;
   8.121 @@ -105,17 +114,15 @@
   8.122  Navigation bar styles
   8.123  */
   8.124  .bar {
   8.125 -    background-image:url(resources/background.gif);
   8.126 -    background-repeat:repeat-x;
   8.127 +    background-color:#4D7A97;
   8.128      color:#FFFFFF;
   8.129      padding:.8em .5em .4em .8em;
   8.130      height:auto;/*height:1.8em;*/
   8.131 -    font-size:1em;
   8.132 +    font-size:11px;
   8.133      margin:0;
   8.134  }
   8.135  .topNav {
   8.136 -    background-image:url(resources/background.gif);
   8.137 -    background-repeat:repeat-x;
   8.138 +    background-color:#4D7A97;
   8.139      color:#FFFFFF;
   8.140      float:left;
   8.141      padding:0;
   8.142 @@ -124,11 +131,11 @@
   8.143      height:2.8em;
   8.144      padding-top:10px;
   8.145      overflow:hidden;
   8.146 +    font-size:12px; 
   8.147  }
   8.148  .bottomNav {
   8.149      margin-top:10px;
   8.150 -    background-image:url(resources/background.gif);
   8.151 -    background-repeat:repeat-x;
   8.152 +    background-color:#4D7A97;
   8.153      color:#FFFFFF;
   8.154      float:left;
   8.155      padding:0;
   8.156 @@ -137,18 +144,20 @@
   8.157      height:2.8em;
   8.158      padding-top:10px;
   8.159      overflow:hidden;
   8.160 +    font-size:12px;
   8.161  }
   8.162  .subNav {
   8.163      background-color:#dee3e9;
   8.164 -    border-bottom:1px solid #9eadc0;
   8.165      float:left;
   8.166      width:100%;
   8.167      overflow:hidden;
   8.168 +    font-size:12px;
   8.169  }
   8.170  .subNav div {
   8.171      clear:left;
   8.172      float:left;
   8.173      padding:0 0 5px 6px;
   8.174 +    text-transform:uppercase;
   8.175  }
   8.176  ul.navList, ul.subNavList {
   8.177      float:left;
   8.178 @@ -158,34 +167,34 @@
   8.179  ul.navList li{
   8.180      list-style:none;
   8.181      float:left;
   8.182 -    padding:3px 6px;
   8.183 +    padding: 5px 6px;
   8.184 +    text-transform:uppercase;
   8.185  }
   8.186  ul.subNavList li{
   8.187      list-style:none;
   8.188      float:left;
   8.189 -    font-size:90%;
   8.190  }
   8.191  .topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
   8.192      color:#FFFFFF;
   8.193      text-decoration:none;
   8.194 +    text-transform:uppercase;
   8.195  }
   8.196  .topNav a:hover, .bottomNav a:hover {
   8.197      text-decoration:none;
   8.198      color:#bb7a2a;
   8.199 +    text-transform:uppercase;
   8.200  }
   8.201  .navBarCell1Rev {
   8.202 -    background-image:url(resources/tab.gif);
   8.203 -    background-color:#a88834;
   8.204 -    color:#FFFFFF;
   8.205 +    background-color:#F8981D;
   8.206 +    color:#253441;
   8.207      margin: auto 5px;
   8.208 -    border:1px solid #c9aa44;
   8.209  }
   8.210  .skipNav {
   8.211      position:absolute;
   8.212      top:auto;
   8.213      left:-9999px;
   8.214      overflow:hidden;
   8.215 -    }
   8.216 +}
   8.217  /*
   8.218  Page header and footer styles
   8.219  */
   8.220 @@ -202,7 +211,7 @@
   8.221      margin-right:15px;
   8.222  }
   8.223  .indexHeader h1 {
   8.224 -    font-size:1.3em;
   8.225 +    font-size:13px;
   8.226  }
   8.227  .title {
   8.228      color:#2c4557;
   8.229 @@ -212,7 +221,7 @@
   8.230      margin:5px 0 0 0;
   8.231  }
   8.232  .header ul {
   8.233 -    margin:0 0 25px 0;
   8.234 +    margin:0 0 15px 0;
   8.235      padding:0;
   8.236  }
   8.237  .footer ul {
   8.238 @@ -220,24 +229,22 @@
   8.239  }
   8.240  .header ul li, .footer ul li {
   8.241      list-style:none;
   8.242 -    font-size:1.2em;
   8.243 +    font-size:13px;
   8.244  }
   8.245  /*
   8.246  Heading styles
   8.247  */
   8.248  div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
   8.249      background-color:#dee3e9;
   8.250 -    border-top:1px solid #9eadc0;
   8.251 -    border-bottom:1px solid #9eadc0;
   8.252 +    border:1px solid #d0d9e0;
   8.253      margin:0 0 6px -8px;
   8.254 -    padding:2px 5px;
   8.255 +    padding:7px 5px;
   8.256  }
   8.257  ul.blockList ul.blockList ul.blockList li.blockList h3 {
   8.258      background-color:#dee3e9;
   8.259 -    border-top:1px solid #9eadc0;
   8.260 -    border-bottom:1px solid #9eadc0;
   8.261 +    border:1px solid #d0d9e0;
   8.262      margin:0 0 6px -8px;
   8.263 -    padding:2px 5px;
   8.264 +    padding:7px 5px;
   8.265  }
   8.266  ul.blockList ul.blockList li.blockList h3 {
   8.267      padding:0;
   8.268 @@ -257,10 +264,10 @@
   8.269  .indexContainer {
   8.270      margin:10px;
   8.271      position:relative;
   8.272 -    font-size:1.0em;
   8.273 +    font-size:12px;
   8.274  }
   8.275  .indexContainer h2 {
   8.276 -    font-size:1.1em;
   8.277 +    font-size:13px;
   8.278      padding:0 0 3px 0;
   8.279  }
   8.280  .indexContainer ul {
   8.281 @@ -269,15 +276,18 @@
   8.282  }
   8.283  .indexContainer ul li {
   8.284      list-style:none;
   8.285 +    padding-top:2px;
   8.286  }
   8.287  .contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
   8.288 -    font-size:1.1em;
   8.289 +    font-size:12px;
   8.290      font-weight:bold;
   8.291      margin:10px 0 0 0;
   8.292      color:#4E4E4E;
   8.293  }
   8.294  .contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
   8.295 -    margin:10px 0 10px 20px;
   8.296 +    margin:5px 0 10px 0px;
   8.297 +    font-size:14px;
   8.298 +    font-family:'DejaVu Sans Mono',monospace;
   8.299  }
   8.300  .serializedFormContainer dl.nameValue dt {
   8.301      margin-left:1px;
   8.302 @@ -316,25 +326,24 @@
   8.303  }
   8.304  ul.blockList li.blockList, ul.blockListLast li.blockList {
   8.305      list-style:none;
   8.306 -    margin-bottom:25px;
   8.307 +    margin-bottom:15px;
   8.308 +    line-height:1.4;
   8.309  }
   8.310  ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
   8.311      padding:0px 20px 5px 10px;
   8.312 -    border:1px solid #9eadc0;
   8.313 -    background-color:#f9f9f9;
   8.314 +    border:1px solid #ededed; 
   8.315 +    background-color:#f8f8f8;
   8.316  }
   8.317  ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
   8.318      padding:0 0 5px 8px;
   8.319      background-color:#ffffff;
   8.320 -    border:1px solid #9eadc0;
   8.321 -    border-top:none;
   8.322 +    border:none;
   8.323  }
   8.324  ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
   8.325      margin-left:0;
   8.326      padding-left:0;
   8.327      padding-bottom:15px;
   8.328      border:none;
   8.329 -    border-bottom:1px solid #9eadc0;
   8.330  }
   8.331  ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
   8.332      list-style:none;
   8.333 @@ -349,9 +358,10 @@
   8.334  Table styles
   8.335  */
   8.336  .overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
   8.337 -    border-bottom:1px solid #9eadc0;
   8.338 -    margin:0 0 12px 0px;
   8.339      width:100%;
   8.340 +    border-left:1px solid #EEE; 
   8.341 +    border-right:1px solid #EEE; 
   8.342 +    border-bottom:1px solid #EEE; 
   8.343  }
   8.344  .overviewSummary, .memberSummary  {
   8.345      padding:0px;
   8.346 @@ -361,12 +371,15 @@
   8.347      position:relative;
   8.348      text-align:left;
   8.349      background-repeat:no-repeat;
   8.350 -    color:#FFFFFF;
   8.351 +    color:#253441;
   8.352      font-weight:bold;
   8.353      clear:none;
   8.354      overflow:hidden;
   8.355      padding:0px;
   8.356 +    padding-top:10px;
   8.357 +    padding-left:1px;
   8.358      margin:0px;
   8.359 +    white-space:pre;
   8.360  }
   8.361  .overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
   8.362  .useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
   8.363 @@ -381,89 +394,98 @@
   8.364  .overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
   8.365  .useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
   8.366      white-space:nowrap;
   8.367 -    padding-top:8px;
   8.368 -    padding-left:8px;
   8.369 +    padding-top:5px;
   8.370 +    padding-left:12px;
   8.371 +    padding-right:12px;
   8.372 +    padding-bottom:7px;
   8.373      display:inline-block;
   8.374      float:left;
   8.375 -    background-image:url(resources/titlebar.gif);
   8.376 +    background-color:#F8981D;
   8.377 +    border: none;
   8.378 +    height:16px;
   8.379  }
   8.380  .memberSummary caption span.activeTableTab span {
   8.381      white-space:nowrap;
   8.382 -    padding-top:8px;
   8.383 -    padding-left:8px;
   8.384 +    padding-top:5px;
   8.385 +    padding-left:12px;
   8.386 +    padding-right:12px;
   8.387 +    margin-right:3px;
   8.388      display:inline-block;
   8.389      float:left;
   8.390 -    background-image:url(resources/activetitlebar.gif);
   8.391 +    background-color:#F8981D;
   8.392 +    height:16px;
   8.393  }
   8.394  .memberSummary caption span.tableTab span {
   8.395      white-space:nowrap;
   8.396 -    padding-top:8px;
   8.397 -    padding-left:8px;
   8.398 +    padding-top:5px;
   8.399 +    padding-left:12px;
   8.400 +    padding-right:12px;
   8.401 +    margin-right:3px;
   8.402      display:inline-block;
   8.403      float:left;
   8.404 -    background-image:url(resources/titlebar.gif);
   8.405 +    background-color:#4D7A97;
   8.406 +    height:16px;
   8.407  }
   8.408  .memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
   8.409      padding-top:0px;
   8.410      padding-left:0px;
   8.411 +    padding-right:0px;
   8.412      background-image:none;
   8.413      float:none;
   8.414 -    display:inline-block;
   8.415 +    display:inline;
   8.416  }
   8.417  .overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
   8.418  .useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
   8.419 -    width:10px;
   8.420 -    background-image:url(resources/titlebar_end.gif);
   8.421 -    background-repeat:no-repeat;
   8.422 -    background-position:top right;
   8.423 +    display:none;
   8.424 +    width:5px;
   8.425      position:relative;
   8.426      float:left;
   8.427 +    background-color:#F8981D;
   8.428  }
   8.429  .memberSummary .activeTableTab .tabEnd {
   8.430 -    width:10px;
   8.431 -    margin-right:5px;
   8.432 -    background-image:url(resources/activetitlebar_end.gif);
   8.433 -    background-repeat:no-repeat;
   8.434 -    background-position:top right;
   8.435 -    position:relative;
   8.436 +    display:none;
   8.437 +    width:5px;
   8.438 +    margin-right:3px;
   8.439 +    position:relative; 
   8.440      float:left;
   8.441 +    background-color:#F8981D;
   8.442  }
   8.443  .memberSummary .tableTab .tabEnd {
   8.444 -    width:10px;
   8.445 -    margin-right:5px;
   8.446 -    background-image:url(resources/titlebar_end.gif);
   8.447 -    background-repeat:no-repeat;
   8.448 -    background-position:top right;
   8.449 +    display:none;
   8.450 +    width:5px;
   8.451 +    margin-right:3px;
   8.452      position:relative;
   8.453 +    background-color:#4D7A97;
   8.454      float:left;
   8.455 +
   8.456  }
   8.457  .overviewSummary td, .memberSummary td, .typeSummary td,
   8.458  .useSummary td, .constantsSummary td, .deprecatedSummary td {
   8.459      text-align:left;
   8.460 -    padding:3px 3px 3px 7px;
   8.461 +    padding:0px 0px 12px 10px;
   8.462 +    width:100%;
   8.463  }
   8.464  th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
   8.465  td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
   8.466      vertical-align:top;
   8.467 -    padding-right:3px;
   8.468 +    padding-right:0px;
   8.469 +    padding-top:8px;
   8.470 +    padding-bottom:3px;
   8.471  }
   8.472  th.colFirst, th.colLast, th.colOne, .constantsSummary th {
   8.473      background:#dee3e9;
   8.474 -    border-top:1px solid #9eadc0;
   8.475 -    border-bottom:1px solid #9eadc0;
   8.476      text-align:left;
   8.477 -    padding:3px 3px 3px 7px;
   8.478 +    padding:8px 3px 3px 7px;
   8.479  }
   8.480  td.colFirst, th.colFirst {
   8.481 -    border-left:1px solid #9eadc0;
   8.482      white-space:nowrap;
   8.483 +    font-size:13px;
   8.484  }
   8.485  td.colLast, th.colLast {
   8.486 -    border-right:1px solid #9eadc0;
   8.487 +    font-size:13px;
   8.488  }
   8.489  td.colOne, th.colOne {
   8.490 -    border-right:1px solid #9eadc0;
   8.491 -    border-left:1px solid #9eadc0;
   8.492 +    font-size:13px;
   8.493  }
   8.494  .overviewSummary td.colFirst, .overviewSummary th.colFirst,
   8.495  .overviewSummary td.colOne, .overviewSummary th.colOne,
   8.496 @@ -471,19 +493,19 @@
   8.497  .memberSummary td.colOne, .memberSummary th.colOne,
   8.498  .typeSummary td.colFirst{
   8.499      width:25%;
   8.500 -    vertical-align:middle;
   8.501 +    vertical-align:top;
   8.502  }
   8.503  td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
   8.504      font-weight:bold;
   8.505  }
   8.506  .tableSubHeadingColor {
   8.507 -    background-color: #EEEEFF;
   8.508 +    background-color:#EEEEFF;
   8.509  }
   8.510  .altColor {
   8.511 -    background-color:#eeeeef;
   8.512 +    background-color:#FFFFFF;
   8.513  }
   8.514  .rowColor {
   8.515 -    background-color:#ffffff;
   8.516 +    background-color:#EEEEEF;
   8.517  }
   8.518  /*
   8.519  Content styles
   8.520 @@ -498,6 +520,24 @@
   8.521  .docSummary {
   8.522      padding:0;
   8.523  }
   8.524 +
   8.525 +ul.blockList ul.blockList ul.blockList li.blockList h3 {
   8.526 +    font-style:normal;
   8.527 +}
   8.528 +
   8.529 +div.block {
   8.530 +    font-size:14px;
   8.531 +    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
   8.532 +}
   8.533 +
   8.534 +td.colLast div {
   8.535 +    padding-top:0px;
   8.536 +}
   8.537 +
   8.538 +
   8.539 +td.colLast a {
   8.540 +    padding-bottom:3px;
   8.541 +}
   8.542  /*
   8.543  Formatting effect styles
   8.544  */
   8.545 @@ -508,11 +548,12 @@
   8.546  h1.hidden {
   8.547      visibility:hidden;
   8.548      overflow:hidden;
   8.549 -    font-size:.9em;
   8.550 +    font-size:10px;
   8.551  }
   8.552  .block {
   8.553      display:block;
   8.554 -    margin:3px 0 0 0;
   8.555 +    margin:3px 10px 2px 0px;
   8.556 +    color:#474747;
   8.557  }
   8.558  .deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
   8.559  .overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,
   8.560 @@ -522,3 +563,12 @@
   8.561  .deprecationComment, .emphasizedPhrase, .interfaceName {
   8.562      font-style:italic;
   8.563  }
   8.564 +
   8.565 +div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,
   8.566 +div.block div.block span.interfaceName {
   8.567 +    font-style:normal;
   8.568 +}
   8.569 +
   8.570 +div.contentContainer ul.blockList li.blockList h2{
   8.571 +    padding-bottom:0px;
   8.572 +}

     9.1 Binary file src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/tab.gif has changed

    10.1 Binary file src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/titlebar.gif has changed

    11.1 Binary file src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/titlebar_end.gif has changed

    12.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java	Thu Dec 19 17:24:35 2013 -0800
    12.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java	Mon Dec 23 14:46:25 2013 -0800
    12.3 @@ -122,9 +122,7 @@
    12.4      /** The name of the file for the overview frame. */
    12.5      public static final DocPath PROFILE_OVERVIEW_FRAME = DocPath.create("profile-overview-frame.html");
    12.6  
    12.7 -    /** The name of the directory in which resources are generated.
    12.8 -     *  Also the name of the sub-package from which resources are read.
    12.9 -     */
   12.10 +    /** The name of the sub-package from which resources are read. */
   12.11      public static final DocPath RESOURCES = DocPath.create("resources");
   12.12  
   12.13      /** The name of the file for the serialized form info. */

    13.1 --- a/src/share/classes/com/sun/tools/doclint/resources/doclint_ja.properties	Thu Dec 19 17:24:35 2013 -0800
    13.2 +++ b/src/share/classes/com/sun/tools/doclint/resources/doclint_ja.properties	Mon Dec 23 14:46:25 2013 -0800
    13.3 @@ -67,7 +67,10 @@
    13.4  dc.tag.start.unmatched = \u7D42\u4E86\u30BF\u30B0\u304C\u3042\u308A\u307E\u305B\u3093: </{0}>
    13.5  dc.tag.unknown = \u4E0D\u660E\u306A\u30BF\u30B0: {0}
    13.6  dc.text.not.allowed = <{0}>\u8981\u7D20\u3067\u306F\u30C6\u30AD\u30B9\u30C8\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
    13.7 +dc.type.arg.not.allowed = \u578B\u5F15\u6570\u306F\u3053\u3053\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
    13.8  dc.unexpected.comment=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30B3\u30E1\u30F3\u30C8\u306F\u3053\u3053\u3067\u306F\u5FC5\u8981\u3042\u308A\u307E\u305B\u3093
    13.9 +dc.value.not.allowed.here='{@value}'\u306F\u3053\u3053\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
   13.10 +dc.value.not.a.constant=\u5024\u304C\u5B9A\u6570\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u305B\u3093
   13.11  
   13.12  dc.main.ioerror=IO\u30A8\u30E9\u30FC: {0}
   13.13  dc.main.no.files.given=\u30D5\u30A1\u30A4\u30EB\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093

    14.1 --- a/src/share/classes/com/sun/tools/doclint/resources/doclint_zh_CN.properties	Thu Dec 19 17:24:35 2013 -0800
    14.2 +++ b/src/share/classes/com/sun/tools/doclint/resources/doclint_zh_CN.properties	Mon Dec 23 14:46:25 2013 -0800
    14.3 @@ -67,7 +67,10 @@
    14.4  dc.tag.start.unmatched = \u7F3A\u5C11\u7ED3\u675F\u6807\u8BB0: </{0}>
    14.5  dc.tag.unknown = \u672A\u77E5\u6807\u8BB0: {0}
    14.6  dc.text.not.allowed = <{0}> \u5143\u7D20\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u6587\u672C
    14.7 +dc.type.arg.not.allowed = \u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528\u7C7B\u578B\u53C2\u6570
    14.8  dc.unexpected.comment=\u6B64\u5904\u672A\u9884\u671F\u6587\u6863\u6CE8\u91CA
    14.9 +dc.value.not.allowed.here=\u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528 '{@value}'
   14.10 +dc.value.not.a.constant=\u503C\u4E0D\u5F15\u7528\u5E38\u91CF
   14.11  
   14.12  dc.main.ioerror=IO \u9519\u8BEF: {0}
   14.13  dc.main.no.files.given=\u672A\u6307\u5B9A\u6587\u4EF6

    15.1 --- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Thu Dec 19 17:24:35 2013 -0800
    15.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Mon Dec 23 14:46:25 2013 -0800
    15.3 @@ -2590,15 +2590,61 @@
    15.4              }
    15.5          }
    15.6  
    15.7 +        /* Map to hold 'fake' clinit methods. If a lambda is used to initialize a
    15.8 +         * static field and that lambda has type annotations, these annotations will
    15.9 +         * also be stored at these fake clinit methods.
   15.10 +         *
   15.11 +         * LambdaToMethod also use fake clinit methods so they can be reused.
   15.12 +         * Also as LTM is a phase subsequent to attribution, the methods from
   15.13 +         * clinits can be safely removed by LTM to save memory.
   15.14 +         */
   15.15 +        private Map<ClassSymbol, MethodSymbol> clinits = new HashMap<>();
   15.16 +
   15.17 +        public MethodSymbol removeClinit(ClassSymbol sym) {
   15.18 +            return clinits.remove(sym);
   15.19 +        }
   15.20 +
   15.21 +        /* This method returns an environment to be used to attribute a lambda
   15.22 +         * expression.
   15.23 +         *
   15.24 +         * The owner of this environment is a method symbol. If the current owner
   15.25 +         * is not a method, for example if the lambda is used to initialize
   15.26 +         * a field, then if the field is:
   15.27 +         *
   15.28 +         * - an instance field, we use the first constructor.
   15.29 +         * - a static field, we create a fake clinit method.
   15.30 +         */
   15.31          private Env<AttrContext> lambdaEnv(JCLambda that, Env<AttrContext> env) {
   15.32              Env<AttrContext> lambdaEnv;
   15.33              Symbol owner = env.info.scope.owner;
   15.34              if (owner.kind == VAR && owner.owner.kind == TYP) {
   15.35                  //field initializer
   15.36                  lambdaEnv = env.dup(that, env.info.dup(env.info.scope.dupUnshared()));
   15.37 -                lambdaEnv.info.scope.owner =
   15.38 -                    new MethodSymbol((owner.flags() & STATIC) | BLOCK, names.empty, null,
   15.39 -                                     env.info.scope.owner);
   15.40 +                ClassSymbol enclClass = owner.enclClass();
   15.41 +                /* if the field isn't static, then we can get the first constructor
   15.42 +                 * and use it as the owner of the environment. This is what
   15.43 +                 * LTM code is doing to look for type annotations so we are fine.
   15.44 +                 */
   15.45 +                if ((owner.flags() & STATIC) == 0) {
   15.46 +                    for (Symbol s : enclClass.members_field.getElementsByName(names.init)) {
   15.47 +                        lambdaEnv.info.scope.owner = s;
   15.48 +                        break;
   15.49 +                    }
   15.50 +                } else {
   15.51 +                    /* if the field is static then we need to create a fake clinit
   15.52 +                     * method, this method can later be reused by LTM.
   15.53 +                     */
   15.54 +                    MethodSymbol clinit = clinits.get(enclClass);
   15.55 +                    if (clinit == null) {
   15.56 +                        Type clinitType = new MethodType(List.<Type>nil(),
   15.57 +                                syms.voidType, List.<Type>nil(), syms.methodClass);
   15.58 +                        clinit = new MethodSymbol(STATIC | SYNTHETIC | PRIVATE,
   15.59 +                                names.clinit, clinitType, enclClass);
   15.60 +                        clinit.params = List.<VarSymbol>nil();
   15.61 +                        clinits.put(enclClass, clinit);
   15.62 +                    }
   15.63 +                    lambdaEnv.info.scope.owner = clinit;
   15.64 +                }
   15.65              } else {
   15.66                  lambdaEnv = env.dup(that, env.info.dup(env.info.scope.dup()));
   15.67              }

    16.1 --- a/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java	Thu Dec 19 17:24:35 2013 -0800
    16.2 +++ b/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java	Mon Dec 23 14:46:25 2013 -0800
    16.3 @@ -1474,12 +1474,27 @@
    16.4          private Symbol initSym(ClassSymbol csym, long flags) {
    16.5              boolean isStatic = (flags & STATIC) != 0;
    16.6              if (isStatic) {
    16.7 -                //static clinits are generated in Gen - so we need to fake them
    16.8 -                Symbol clinit = clinits.get(csym);
    16.9 +                /* static clinits are generated in Gen, so we need to use a fake
   16.10 +                 * one. Attr creates a fake clinit method while attributing
   16.11 +                 * lambda expressions used as initializers of static fields, so
   16.12 +                 * let's use that one.
   16.13 +                 */
   16.14 +                MethodSymbol clinit = attr.removeClinit(csym);
   16.15 +                if (clinit != null) {
   16.16 +                    clinits.put(csym, clinit);
   16.17 +                    return clinit;
   16.18 +                }
   16.19 +
   16.20 +                /* if no clinit is found at Attr, then let's try at clinits.
   16.21 +                 */
   16.22 +                clinit = (MethodSymbol)clinits.get(csym);
   16.23                  if (clinit == null) {
   16.24 +                    /* no luck, let's create a new one
   16.25 +                     */
   16.26                      clinit = makePrivateSyntheticMethod(STATIC,
   16.27                              names.clinit,
   16.28 -                            new MethodType(List.<Type>nil(), syms.voidType, List.<Type>nil(), syms.methodClass),
   16.29 +                            new MethodType(List.<Type>nil(), syms.voidType,
   16.30 +                                List.<Type>nil(), syms.methodClass),
   16.31                              csym);
   16.32                      clinits.put(csym, clinit);
   16.33                  }

    17.1 --- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Thu Dec 19 17:24:35 2013 -0800
    17.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Mon Dec 23 14:46:25 2013 -0800
    17.3 @@ -1503,7 +1503,7 @@
    17.4              return ambiguityError(m1, m2);
    17.5          case AMBIGUOUS:
    17.6              //check if m1 is more specific than all ambiguous methods in m2
    17.7 -            AmbiguityError e = (AmbiguityError)m2;
    17.8 +            AmbiguityError e = (AmbiguityError)m2.baseSymbol();
    17.9              for (Symbol s : e.ambiguousSyms) {
   17.10                  if (mostSpecific(argtypes, m1, s, env, site, allowBoxing, useVarargs) != m1) {
   17.11                      return e.addAmbiguousSymbol(m1);
   17.12 @@ -3055,7 +3055,7 @@
   17.13          final Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) {
   17.14              Symbol sym = doLookup(env, phase);
   17.15              if (sym.kind == AMBIGUOUS) {
   17.16 -                AmbiguityError a_err = (AmbiguityError)sym;
   17.17 +                AmbiguityError a_err = (AmbiguityError)sym.baseSymbol();
   17.18                  sym = a_err.mergeAbstracts(site);
   17.19              }
   17.20              return sym;
   17.21 @@ -3125,7 +3125,7 @@
   17.22  
   17.23          Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym) {
   17.24              if (sym.kind == AMBIGUOUS) {
   17.25 -                AmbiguityError a_err = (AmbiguityError)sym;
   17.26 +                AmbiguityError a_err = (AmbiguityError)sym.baseSymbol();
   17.27                  sym = a_err.mergeAbstracts(site);
   17.28              }
   17.29              //skip error reporting
   17.30 @@ -3992,7 +3992,7 @@
   17.31  
   17.32          private List<Symbol> flatten(Symbol sym) {
   17.33              if (sym.kind == AMBIGUOUS) {
   17.34 -                return ((AmbiguityError)sym).ambiguousSyms;
   17.35 +                return ((AmbiguityError)sym.baseSymbol()).ambiguousSyms;
   17.36              } else {
   17.37                  return List.of(sym);
   17.38              }

    18.1 --- a/src/share/classes/com/sun/tools/javac/comp/TransTypes.java	Thu Dec 19 17:24:35 2013 -0800
    18.2 +++ b/src/share/classes/com/sun/tools/javac/comp/TransTypes.java	Mon Dec 23 14:46:25 2013 -0800
    18.3 @@ -586,7 +586,7 @@
    18.4          try {
    18.5              currentMethod = null;
    18.6              tree.params = translate(tree.params);
    18.7 -            tree.body = translate(tree.body, null);
    18.8 +            tree.body = translate(tree.body, tree.body.type==null? null : erasure(tree.body.type));
    18.9              tree.type = erasure(tree.type);
   18.10              result = tree;
   18.11          }

    19.1 --- a/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties	Thu Dec 19 17:24:35 2013 -0800
    19.2 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties	Mon Dec 23 14:46:25 2013 -0800
    19.3 @@ -72,21 +72,21 @@
    19.4  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
    19.5  
    19.6  # 0: string
    19.7 -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
    19.8 +compiler.err.already.defined.single.import=\u540C\u3058\u5358\u7D14\u540D\u306E\u578B\u304C{0}\u306E\u5358\u4E00\u578B\u30A4\u30F3\u30DD\u30FC\u30C8\u306B\u3088\u3063\u3066\u3059\u3067\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059
    19.9  
   19.10  # 0: string
   19.11 -compiler.err.already.defined.static.single.import={0}\u306Fstatic\u306E\u5358\u4E00\u306E\u578B\u30A4\u30F3\u30DD\u30FC\u30C8\u5BA3\u8A00\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059
   19.12 +compiler.err.already.defined.static.single.import=\u540C\u3058\u5358\u7D14\u540D\u306E\u578B\u304C{0}\u306Estatic\u5358\u4E00\u578B\u30A4\u30F3\u30DD\u30FC\u30C8\u306B\u3088\u3063\u3066\u3059\u3067\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059
   19.13  
   19.14  compiler.err.already.defined.this.unit={0}\u306F\u30B3\u30F3\u30D1\u30A4\u30EB\u5358\u4F4D\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059
   19.15  
   19.16  # 0: type, 1: list of name
   19.17 -compiler.err.annotation.missing.default.value=\u6CE8\u91C8{0}\u306B\u306F\u5C5E\u6027{1}\u306E\u5024\u304C\u3042\u308A\u307E\u305B\u3093
   19.18 +compiler.err.annotation.missing.default.value=\u6CE8\u91C8@{0}\u306B\u306F\u8981\u7D20''{1}''\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u304C\u3042\u308A\u307E\u305B\u3093
   19.19  
   19.20  # 0: type, 1: list of name
   19.21 -compiler.err.annotation.missing.default.value.1=\u6CE8\u91C8{0}\u306B\u306F\u5C5E\u6027{1}\u306E\u5024\u304C\u3042\u308A\u307E\u305B\u3093
   19.22 +compiler.err.annotation.missing.default.value.1=\u6CE8\u91C8@{0}\u306B\u306F\u8981\u7D20{1}\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u304C\u3042\u308A\u307E\u305B\u3093
   19.23  
   19.24  # 0: type
   19.25 -compiler.err.annotation.not.valid.for.type=\u6CE8\u91C8\u306F\u578B{0}\u306E\u5024\u306B\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
   19.26 +compiler.err.annotation.not.valid.for.type=\u6CE8\u91C8\u306F\u578B{0}\u306E\u8981\u7D20\u306B\u5BFE\u3057\u3066\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
   19.27  
   19.28  compiler.err.annotation.type.not.applicable=\u6CE8\u91C8\u578B\u306F\u3053\u306E\u7A2E\u985E\u306E\u5BA3\u8A00\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
   19.29  
   19.30 @@ -112,7 +112,7 @@
   19.31  # 0: type
   19.32  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
   19.33  
   19.34 -compiler.err.attribute.value.must.be.constant=\u5C5E\u6027\u306E\u5024\u306F\u5B9A\u6570\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
   19.35 +compiler.err.attribute.value.must.be.constant=\u8981\u7D20\u5024\u306F\u5B9A\u6570\u5F0F\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
   19.36  
   19.37  # 0: statement type
   19.38  compiler.err.bad.initializer={0}\u306E\u4E0D\u6B63\u306A\u521D\u671F\u5316\u5B50
   19.39 @@ -223,62 +223,61 @@
   19.40  # 0: symbol
   19.41  compiler.err.cyclic.inheritance={0}\u3092\u542B\u3080\u7D99\u627F\u304C\u30EB\u30FC\u30D7\u3057\u3066\u3044\u307E\u3059
   19.42  
   19.43 -compiler.err.cyclic.annotation.element=\u6CE8\u91C8\u306E\u8981\u7D20\u30BF\u30A4\u30D7\u304C\u30EB\u30FC\u30D7\u3057\u3066\u3044\u307E\u3059
   19.44 +# 0: symbol
   19.45 +compiler.err.cyclic.annotation.element=\u8981\u7D20{0}\u306E\u578B\u304C\u30EB\u30FC\u30D7\u3057\u3066\u3044\u307E\u3059
   19.46  
   19.47  # 0: unused
   19.48  compiler.err.call.to.super.not.allowed.in.enum.ctor=\u5217\u6319\u578B\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3067\u306F\u3001\u30B9\u30FC\u30D1\u30FC\u30AF\u30E9\u30B9\u306E\u547C\u51FA\u3057\u306F\u3067\u304D\u307E\u305B\u3093
   19.49  
   19.50  # 0: type
   19.51 -compiler.err.no.superclass={0}\u306B\u306F\u30B9\u30FC\u30D1\u30FC\u30AF\u30E9\u30B9\u304C\u3042\u308A\u307E\u305B\u3093
   19.52 +compiler.err.no.superclass={0}\u306B\u306F\u30B9\u30FC\u30D1\u30FC\u30AF\u30E9\u30B9\u304C\u3042\u308A\u307E\u305B\u3093\u3002
   19.53  
   19.54  # 0: symbol, 1: type, 2: symbol, 3: type, 4: unused
   19.55  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
   19.56  
   19.57 -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
   19.58 +compiler.err.default.allowed.in.intf.annotation.member=\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u306F\u6CE8\u91C8\u578B\u306E\u5BA3\u8A00\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059
   19.59  
   19.60  # 0: symbol
   19.61  compiler.err.doesnt.exist=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
   19.62  
   19.63 -compiler.err.duplicate.annotation=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059
   19.64 -
   19.65  # 0: type
   19.66 -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
   19.67 +compiler.err.duplicate.annotation.invalid.repeated=\u6CE8\u91C8{0}\u306F\u6709\u52B9\u306A\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u3067\u306F\u3042\u308A\u307E\u305B\u3093
   19.68  
   19.69  # 0: name, 1: type
   19.70 -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
   19.71 -
   19.72 -# 0: type, 1: type
   19.73 -compiler.err.duplicate.annotation.missing.container=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059: {0}\u306E\u5BA3\u8A00\u306B\u306F\u6709\u52B9\u306A{1}\u6CE8\u91C8\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
   19.74 +compiler.err.duplicate.annotation.member.value=\u6CE8\u91C8@{1}\u306B\u91CD\u8907\u3057\u305F\u8981\u7D20''{0}''\u304C\u3042\u308A\u307E\u3059\u3002
   19.75 +
   19.76 +# 0: name, 1: unused
   19.77 +compiler.err.duplicate.annotation.missing.container={0}\u306F\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u578B\u3067\u306F\u3042\u308A\u307E\u305B\u3093
   19.78 +
   19.79 +# 0: type, 1: unused
   19.80 +compiler.err.invalid.repeatable.annotation=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059: {0}\u306F\u7121\u52B9\u306A@Repeatable\u6CE8\u91C8\u3067\u6CE8\u91C8\u4ED8\u3051\u3055\u308C\u3066\u3044\u307E\u3059
   19.81 +
   19.82 +# 0: symbol or type
   19.83 +compiler.err.invalid.repeatable.annotation.no.value={0}\u306F\u6709\u52B9\u306A@Repeatable\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
   19.84 +
   19.85 +# 0: type, 1: number
   19.86 +compiler.err.invalid.repeatable.annotation.multiple.values={0}\u306F\u6709\u52B9\u306A@Repeatable\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002{1}\u8981\u7D20\u30E1\u30BD\u30C3\u30C9''value''\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059
   19.87  
   19.88  # 0: type
   19.89 -compiler.err.invalid.repeatable.annotation=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059: {0}\u306F\u7121\u52B9\u306A\u7E70\u8FD4\u3057\u53EF\u80FD\u6CE8\u91C8\u3067\u6CE8\u91C8\u4ED8\u3051\u3055\u308C\u3066\u3044\u307E\u3059
   19.90 -
   19.91 -# 0: symbol or type
   19.92 -compiler.err.invalid.repeatable.annotation.no.value=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059: {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
   19.93 -
   19.94 -# 0: type, 1: number
   19.95 -compiler.err.invalid.repeatable.annotation.multiple.values=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059: {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
   19.96 -
   19.97 -# 0: type
   19.98 -compiler.err.invalid.repeatable.annotation.invalid.value=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059: {0}\u306F\u6709\u52B9\u306A\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u3082\u306E\u3067\u306F\u3042\u308A\u307E\u305B\u3093: \u5024\u8981\u7D20\u304C\u7121\u52B9\u3067\u3059
   19.99 -
  19.100 -# 0: symbol type, 1: type, 2: type
  19.101 -compiler.err.invalid.repeatable.annotation.value.return=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059: \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
  19.102 +compiler.err.invalid.repeatable.annotation.invalid.value={0}\u306F\u6709\u52B9\u306A@Repeatable\u3067\u306F\u3042\u308A\u307E\u305B\u3093: \u5024\u8981\u7D20\u304C\u7121\u52B9\u3067\u3059
  19.103 +
  19.104 +# 0: symbol type, 1: unused, 2: type
  19.105 +compiler.err.invalid.repeatable.annotation.value.return=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u578B({0})\u306F\u578B{2}\u306E\u8981\u7D20''value''\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
  19.106  
  19.107  # 0: symbol or type, 1: symbol
  19.108 -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
  19.109 -
  19.110 -# 0: symbol, 1: type, 2: symbol, 3: type
  19.111 -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
  19.112 +compiler.err.invalid.repeatable.annotation.elem.nondefault=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u578B{0}\u306B\u306F\u8981\u7D20{1}\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
  19.113 +
  19.114 +# 0: symbol, 1: unused, 2: symbol, 3: unused
  19.115 +compiler.err.invalid.repeatable.annotation.retention=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u578B({0})\u306E\u4FDD\u6709\u304C\u3001\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u578B({2})\u306E\u4FDD\u6709\u3088\u308A\u77ED\u304F\u306A\u3063\u3066\u3044\u307E\u3059
  19.116  
  19.117  # 0: symbol, 1: symbol
  19.118 -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
  19.119 +compiler.err.invalid.repeatable.annotation.not.documented=\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u578B({1})\u306F@Documented\u3067\u3059\u304C\u3001\u5305\u542B\u3059\u308B\u6CE8\u91C8\u578B({0})\u306F\u9055\u3044\u307E\u3059
  19.120  
  19.121  # 0: symbol, 1: symbol
  19.122 -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
  19.123 +compiler.err.invalid.repeatable.annotation.not.inherited=\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u578B({1})\u306F@Inherited\u3067\u3059\u304C\u3001\u5305\u542B\u3059\u308B\u6CE8\u91C8\u578B({0})\u306F\u9055\u3044\u307E\u3059
  19.124  
  19.125  # 0: symbol, 1: symbol
  19.126 -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
  19.127 +compiler.err.invalid.repeatable.annotation.incompatible.target=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u578B({0})\u306F\u3001\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u578B({1})\u3088\u308A\u591A\u304F\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u306B\u9069\u7528\u3055\u308C\u307E\u3059
  19.128  
  19.129  # 0: symbol
  19.130  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
  19.131 @@ -408,20 +407,24 @@
  19.132  # 0: number
  19.133  compiler.err.int.number.too.large=\u6574\u6570{0}\u304C\u5927\u304D\u3059\u304E\u307E\u3059
  19.134  
  19.135 -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
  19.136 -
  19.137 -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
  19.138 -
  19.139 -compiler.err.intf.annotation.members.cant.have.type.params=@interface\u30E1\u30F3\u30D0\u30FC\u304C\u578B\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
  19.140 +compiler.err.intf.annotation.members.cant.have.params=\u6CE8\u91C8\u578B\u5BA3\u8A00\u5185\u306E\u8981\u7D20\u304C\u4EEE\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u5BA3\u8A00\u3067\u304D\u307E\u305B\u3093
  19.141 +
  19.142 +# 0: symbol
  19.143 +compiler.err.intf.annotation.cant.have.type.params=\u6CE8\u91C8\u578B{0}\u306F\u6C4E\u7528\u306B\u3067\u304D\u307E\u305B\u3093
  19.144 +
  19.145 +compiler.err.intf.annotation.members.cant.have.type.params=\u6CE8\u91C8\u578B\u5BA3\u8A00\u5185\u306E\u8981\u7D20\u306F\u6C4E\u7528\u30E1\u30BD\u30C3\u30C9\u306B\u3067\u304D\u307E\u305B\u3093
  19.146  
  19.147  # 0: symbol, 1: type
  19.148 -compiler.err.intf.annotation.member.clash=@interface\u30E1\u30F3\u30D0\u30FC\u306F{1}\u306E\u30E1\u30BD\u30C3\u30C9''{0}''\u3068\u7AF6\u5408\u3057\u307E\u3059
  19.149 +compiler.err.intf.annotation.member.clash=\u6CE8\u91C8\u578B{1}\u3067\u30E1\u30BD\u30C3\u30C9{0}\u3068\u540C\u3058\u540D\u524D\u306E\u8981\u7D20\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059
  19.150  
  19.151  compiler.err.intf.expected.here=\u3053\u3053\u306B\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304C\u5FC5\u8981\u3067\u3059
  19.152  
  19.153 +compiler.err.intf.or.array.expected.here=\u3053\u3053\u306B\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u307E\u305F\u306F\u914D\u5217\u578B\u304C\u5FC5\u8981\u3067\u3059
  19.154 +
  19.155  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
  19.156  
  19.157 -compiler.err.invalid.annotation.member.type=\u6CE8\u91C8\u30E1\u30F3\u30D0\u30FC\u306E\u578B\u304C\u4E0D\u6B63\u3067\u3059
  19.158 +# 0: symbol
  19.159 +compiler.err.invalid.annotation.member.type=\u6CE8\u91C8\u578B\u306E\u8981\u7D20{0}\u306E\u578B\u304C\u7121\u52B9\u3067\u3059
  19.160  
  19.161  compiler.err.invalid.binary.number=2\u9032\u6570\u5B57\u306F\u5C11\u306A\u304F\u3068\u30821\u6841\u306E2\u9032\u6570\u3092\u542B\u3080\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
  19.162  
  19.163 @@ -531,9 +534,6 @@
  19.164  
  19.165  compiler.misc.incompatible.arg.types.in.mref=\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u578B\u306F\u4E0D\u9069\u5408\u3067\u3059
  19.166  
  19.167 -# 0: list of type, 1: message segment
  19.168 -compiler.misc.bad.arg.types.in.lambda=\u63A8\u5B9A\u30D1\u30E9\u30E1\u30FC\u30BF\u578B\u3067\u306F\u30E9\u30E0\u30C0\u5F0F\u306E\u578B\u30C1\u30A7\u30C3\u30AF\u3092\u5B9F\u884C\u3067\u304D\u307E\u305B\u3093\n\u63A8\u5B9A\u578B: {0}
  19.169 -
  19.170  compiler.err.new.not.allowed.in.annotation=''new''\u306F\u6CE8\u91C8\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
  19.171  
  19.172  compiler.err.no.annotation.member={1}\u306E\u6CE8\u91C8\u30E1\u30F3\u30D0\u30FC{0}\u304C\u3042\u308A\u307E\u305B\u3093
  19.173 @@ -998,6 +998,9 @@
  19.174  # 0: symbol
  19.175  compiler.warn.missing.SVUID=\u76F4\u5217\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9{0}\u306B\u306F\u3001serialVersionUID\u304C\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u305B\u3093
  19.176  
  19.177 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol
  19.178 +compiler.warn.potentially.ambiguous.overload={1}\u5185\u306E{0}\u306F{3}\u5185\u306E{2}\u3068\u77DB\u76FE\u3059\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059
  19.179 +
  19.180  # 0: message segment
  19.181  compiler.warn.override.varargs.missing={0}\u3002\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9\u306B\u306F''...''\u304C\u3042\u308A\u307E\u305B\u3093
  19.182  
  19.183 @@ -1215,6 +1218,7 @@
  19.184  # 0: symbol, 1: message segment
  19.185  compiler.err.cant.access={0}\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n{1}
  19.186  
  19.187 +# 0: file name, 1: message segment
  19.188  compiler.misc.bad.class.file.header=\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB{0}\u306F\u4E0D\u6B63\u3067\u3059\n{1}\n\u524A\u9664\u3059\u308B\u304B\u3001\u30AF\u30E9\u30B9\u30D1\u30B9\u306E\u6B63\u3057\u3044\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u3042\u308B\u304B\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
  19.189  
  19.190  # 0: file name, 1: message segment
  19.191 @@ -1244,6 +1248,12 @@
  19.192  
  19.193  compiler.misc.class.file.not.found={0}\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
  19.194  
  19.195 +# 0: classfile major version, 1: classfile minor version
  19.196 +compiler.misc.invalid.default.interface=\u30D0\u30FC\u30B8\u30E7\u30F3{0}.{1}\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30E1\u30BD\u30C3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F
  19.197 +
  19.198 +# 0: classfile major version, 1: classfile minor version
  19.199 +compiler.misc.invalid.static.interface=\u30D0\u30FC\u30B8\u30E7\u30F3{0}.{1}\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306Bstatic\u30E1\u30BD\u30C3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F
  19.200 +
  19.201  # 0: name
  19.202  compiler.misc.file.doesnt.contain.class=\u30D5\u30A1\u30A4\u30EB\u306B\u30AF\u30E9\u30B9{0}\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093
  19.203  
  19.204 @@ -1362,9 +1372,6 @@
  19.205  # 0: type, 1: list of type
  19.206  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}
  19.207  
  19.208 -# 0: list of type
  19.209 -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
  19.210 -
  19.211  # 0: symbol
  19.212  compiler.misc.diamond={0}<>
  19.213  
  19.214 @@ -1374,6 +1381,9 @@
  19.215  # 0: unused
  19.216  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
  19.217  
  19.218 +# 0: unused
  19.219 +compiler.misc.mref.infer.and.explicit.params=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u660E\u793A\u7684\u306A\u578B\u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u306Fraw\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u53C2\u7167\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
  19.220 +
  19.221  # 0: type, 1: list of type
  19.222  compiler.misc.explicit.param.do.not.conform.to.bounds=\u660E\u793A\u7684\u306A\u578B\u5F15\u6570{0}\u306F\u3001\u5BA3\u8A00\u3055\u308C\u305F\u5883\u754C{1}\u306B\u9069\u5408\u3057\u307E\u305B\u3093
  19.223  
  19.224 @@ -1574,6 +1584,8 @@
  19.225  
  19.226  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\u3001Java SE 8\u3088\u308A\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u306A\u3044\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059)
  19.227  
  19.228 +compiler.err.underscore.as.identifier.in.lambda=''_''\u304C\u8B58\u5225\u5B50\u3068\u3057\u3066\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\n(\u30E9\u30E0\u30C0\u30FB\u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u306F''_''\u3092\u8B58\u5225\u5B50\u3068\u3057\u3066\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u7981\u6B62\u3055\u308C\u3066\u3044\u307E\u3059)
  19.229 +
  19.230  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)
  19.231  
  19.232  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)
  19.233 @@ -1585,11 +1597,12 @@
  19.234  compiler.err.receiver.parameter.not.applicable.constructor.toplevel.class=\u53D7\u53D6\u308A\u5074\u30D1\u30E9\u30E1\u30FC\u30BF\u306F\u6700\u4E0A\u4F4D\u30EC\u30D9\u30EB\u30FB\u30AF\u30E9\u30B9\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306B\u9069\u7528\u3067\u304D\u307E\u305B\u3093
  19.235  
  19.236  # TODO 308: make a better error message
  19.237 -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
  19.238 +# 0: symbol
  19.239 +compiler.err.cant.type.annotate.scoping.1=\u30B9\u30B3\u30FC\u30D7\u30FB\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30C8\u3092\u578B\u4F7F\u7528\u6CE8\u91C8\u3067\u6CE8\u91C8\u4ED8\u3051\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093: {0}
  19.240  
  19.241  # TODO 308: make a better error message
  19.242 -# 0: unused
  19.243 -compiler.err.cant.annotate.nested.type=static\u306E\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30BF\u30A4\u30D7\u306E\u30B9\u30B3\u30FC\u30D7\u30FB\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30C8\u306B\u306F\u6CE8\u91C8\u4ED8\u3051\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
  19.244 +# 0: list of symbol
  19.245 +compiler.err.cant.type.annotate.scoping=\u30B9\u30B3\u30FC\u30D7\u30FB\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30C8\u3092\u578B\u4F7F\u7528\u6CE8\u91C8\u3067\u6CE8\u91C8\u4ED8\u3051\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093: {0}
  19.246  
  19.247  # 0: type, 1: type
  19.248  compiler.err.incorrect.receiver.name=\u53D7\u53D6\u308A\u5074\u306E\u540D\u524D\u304C\u3001\u5305\u542B\u3059\u308B\u30AF\u30E9\u30B9\u30FB\u30BF\u30A4\u30D7\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093\n\u5FC5\u9808: {0}\n\u691C\u51FA: {1}
  19.249 @@ -1618,7 +1631,10 @@
  19.250  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)
  19.251  
  19.252  # 0: string
  19.253 -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)
  19.254 +compiler.err.repeatable.annotations.not.supported.in.source=\u7E70\u8FD4\u3057\u6CE8\u91C8\u306F-source {0}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n(\u7E70\u8FD4\u3057\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)
  19.255 +
  19.256 +# 0: string
  19.257 +compiler.err.foreach.not.supported.in.source=\u62E1\u5F35for\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)
  19.258  
  19.259  # 0: string
  19.260  compiler.err.static.import.not.supported.in.source=static import\u5BA3\u8A00\u306F -source {0}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n(static import\u5BA3\u8A00\u3092\u4F7F\u7528\u53EF\u80FD\u306B\u3059\u308B\u306B\u306F\u3001-source 5\u4EE5\u964D\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044)

    20.1 --- a/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties	Thu Dec 19 17:24:35 2013 -0800
    20.2 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties	Mon Dec 23 14:46:25 2013 -0800
    20.3 @@ -72,21 +72,21 @@
    20.4  compiler.err.already.defined.in.clinit=\u5DF2\u5728{3} {4}\u7684{2}\u4E2D\u5B9A\u4E49\u4E86{0} {1}
    20.5  
    20.6  # 0: string
    20.7 -compiler.err.already.defined.single.import=\u5DF2\u5728 single-type \u5BFC\u5165\u4E2D\u5B9A\u4E49{0}
    20.8 +compiler.err.already.defined.single.import={0}\u7684 single-type-import \u5DF2\u5B9A\u4E49\u5177\u6709\u76F8\u540C\u7B80\u540D\u7684\u7C7B\u578B
    20.9  
   20.10  # 0: string
   20.11 -compiler.err.already.defined.static.single.import=\u5DF2\u5728\u9759\u6001 single-type \u5BFC\u5165\u4E2D\u5B9A\u4E49{0}
   20.12 +compiler.err.already.defined.static.single.import={0}\u7684\u9759\u6001 single-type-import \u5DF2\u5B9A\u4E49\u5177\u6709\u76F8\u540C\u7B80\u540D\u7684\u7C7B\u578B
   20.13  
   20.14  compiler.err.already.defined.this.unit=\u5DF2\u5728\u8BE5\u7F16\u8BD1\u5355\u5143\u4E2D\u5B9A\u4E49{0}
   20.15  
   20.16  # 0: type, 1: list of name
   20.17 -compiler.err.annotation.missing.default.value=\u5BF9\u4E8E\u5C5E\u6027{1}, \u6CE8\u91CA{0}\u7F3A\u5C11\u503C
   20.18 +compiler.err.annotation.missing.default.value=\u5BF9\u4E8E\u5143\u7D20 ''{1}'', \u6CE8\u91CA @{0} \u7F3A\u5C11\u9ED8\u8BA4\u503C
   20.19  
   20.20  # 0: type, 1: list of name
   20.21 -compiler.err.annotation.missing.default.value.1=\u5BF9\u4E8E\u5C5E\u6027{1}, \u6CE8\u91CA{0}\u7F3A\u5C11\u503C
   20.22 +compiler.err.annotation.missing.default.value.1=\u5BF9\u4E8E\u5143\u7D20{1}, \u6CE8\u91CA @{0} \u7F3A\u5C11\u9ED8\u8BA4\u503C
   20.23  
   20.24  # 0: type
   20.25 -compiler.err.annotation.not.valid.for.type=\u5BF9\u4E8E\u7C7B\u578B\u4E3A{0}\u7684\u503C, \u6CE8\u91CA\u65E0\u6548
   20.26 +compiler.err.annotation.not.valid.for.type=\u6CE8\u91CA\u5BF9\u4E8E\u7C7B\u578B{0}\u7684\u5143\u7D20\u65E0\u6548
   20.27  
   20.28  compiler.err.annotation.type.not.applicable=\u6CE8\u91CA\u7C7B\u578B\u4E0D\u9002\u7528\u4E8E\u8BE5\u7C7B\u578B\u7684\u58F0\u660E
   20.29  
   20.30 @@ -112,7 +112,7 @@
   20.31  # 0: type
   20.32  compiler.err.array.req.but.found=\u9700\u8981\u6570\u7EC4, \u4F46\u627E\u5230{0}
   20.33  
   20.34 -compiler.err.attribute.value.must.be.constant=\u5C5E\u6027\u503C\u5FC5\u987B\u4E3A\u5E38\u91CF
   20.35 +compiler.err.attribute.value.must.be.constant=\u5143\u7D20\u503C\u5FC5\u987B\u4E3A\u5E38\u91CF\u8868\u8FBE\u5F0F
   20.36  
   20.37  # 0: statement type
   20.38  compiler.err.bad.initializer={0}\u7684\u521D\u59CB\u5316\u7A0B\u5E8F\u9519\u8BEF
   20.39 @@ -223,62 +223,61 @@
   20.40  # 0: symbol
   20.41  compiler.err.cyclic.inheritance=\u6D89\u53CA{0}\u7684\u5FAA\u73AF\u7EE7\u627F
   20.42  
   20.43 -compiler.err.cyclic.annotation.element=\u5FAA\u73AF\u6CE8\u91CA\u5143\u7D20\u7C7B\u578B
   20.44 +# 0: symbol
   20.45 +compiler.err.cyclic.annotation.element=\u5143\u7D20 {0} \u7684\u7C7B\u578B\u4E3A\u5FAA\u73AF
   20.46  
   20.47  # 0: unused
   20.48  compiler.err.call.to.super.not.allowed.in.enum.ctor=\u5728\u679A\u4E3E\u6784\u9020\u5668\u4E2D\u4E0D\u5141\u8BB8\u8C03\u7528\u8D85\u7C7B
   20.49  
   20.50  # 0: type
   20.51 -compiler.err.no.superclass={0}\u4E0D\u5177\u6709\u8D85\u7C7B
   20.52 +compiler.err.no.superclass={0}\u4E0D\u5177\u6709\u8D85\u7C7B\u3002
   20.53  
   20.54  # 0: symbol, 1: type, 2: symbol, 3: type, 4: unused
   20.55  compiler.err.concrete.inheritance.conflict={1}\u4E2D\u7684\u65B9\u6CD5{0}\u548C{3}\u4E2D\u7684\u65B9\u6CD5{2}\u662F\u4F7F\u7528\u76F8\u540C\u7684\u7B7E\u540D\u7EE7\u627F\u7684
   20.56  
   20.57 -compiler.err.default.allowed.in.intf.annotation.member=\u4EC5\u5728 @interface \u6210\u5458\u4E2D\u5141\u8BB8\u4F7F\u7528\u9ED8\u8BA4\u503C
   20.58 +compiler.err.default.allowed.in.intf.annotation.member=\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E\u4E2D\u4EC5\u5141\u8BB8\u9ED8\u8BA4\u503C
   20.59  
   20.60  # 0: symbol
   20.61  compiler.err.doesnt.exist=\u7A0B\u5E8F\u5305{0}\u4E0D\u5B58\u5728
   20.62  
   20.63 -compiler.err.duplicate.annotation=\u6CE8\u91CA\u91CD\u590D
   20.64 -
   20.65  # 0: type
   20.66 -compiler.err.duplicate.annotation.invalid.repeated=\u65E0\u6CD5\u91CD\u590D\u6CE8\u91CA{0}\n\u5B83\u6CA1\u6709\u5B9A\u4E49\u6709\u6548\u7684\u5305\u542B\u6CE8\u91CA\u3002
   20.67 +compiler.err.duplicate.annotation.invalid.repeated=\u6CE8\u91CA{0}\u4E0D\u662F\u6709\u6548\u7684\u53EF\u91CD\u590D\u6CE8\u91CA
   20.68  
   20.69  # 0: name, 1: type
   20.70 -compiler.err.duplicate.annotation.member.value={1}\u4E2D\u7684\u6CE8\u91CA\u6210\u5458\u503C{0}\u91CD\u590D
   20.71 -
   20.72 -# 0: type, 1: type
   20.73 -compiler.err.duplicate.annotation.missing.container=\u6CE8\u91CA\u91CD\u590D: {0}\u7684\u58F0\u660E\u6CA1\u6709\u6709\u6548\u7684{1}\u6CE8\u91CA
   20.74 +compiler.err.duplicate.annotation.member.value=\u6CE8\u91CA@{1}\u4E2D\u7684\u5143\u7D20 ''{0}'' \u91CD\u590D\u3002
   20.75 +
   20.76 +# 0: name, 1: unused
   20.77 +compiler.err.duplicate.annotation.missing.container={0} \u4E0D\u662F\u53EF\u91CD\u590D\u7684\u6CE8\u91CA\u7C7B\u578B
   20.78 +
   20.79 +# 0: type, 1: unused
   20.80 +compiler.err.invalid.repeatable.annotation=\u6CE8\u91CA\u91CD\u590D: \u4F7F\u7528\u65E0\u6548\u7684 @Repeatable \u6CE8\u91CA\u5BF9{0}\u8FDB\u884C\u4E86\u6CE8\u91CA
   20.81 +
   20.82 +# 0: symbol or type
   20.83 +compiler.err.invalid.repeatable.annotation.no.value={0}\u4E0D\u662F\u6709\u6548\u7684 @Repeatable, \u672A\u58F0\u660E\u4EFB\u4F55\u503C\u5143\u7D20\u65B9\u6CD5
   20.84 +
   20.85 +# 0: type, 1: number
   20.86 +compiler.err.invalid.repeatable.annotation.multiple.values={0}\u4E0D\u662F\u6709\u6548\u7684 @Repeatable, \u5DF2\u58F0\u660E {1} \u4E2A\u540D\u4E3A ''value'' \u7684\u5143\u7D20\u65B9\u6CD5
   20.87  
   20.88  # 0: type
   20.89 -compiler.err.invalid.repeatable.annotation=\u6CE8\u91CA\u91CD\u590D: \u4F7F\u7528\u65E0\u6548\u7684 Repeatable \u6CE8\u91CA\u5BF9{0}\u8FDB\u884C\u4E86\u6CE8\u91CA
   20.90 -
   20.91 -# 0: symbol or type
   20.92 -compiler.err.invalid.repeatable.annotation.no.value=\u6CE8\u91CA\u91CD\u590D: {0}\u4E0D\u662F\u6709\u6548\u7684 Repeatable, \u672A\u58F0\u660E\u4EFB\u4F55\u503C\u5143\u7D20\u65B9\u6CD5
   20.93 -
   20.94 -# 0: type, 1: number
   20.95 -compiler.err.invalid.repeatable.annotation.multiple.values=\u6CE8\u91CA\u91CD\u590D: {0}\u4E0D\u662F\u6709\u6548\u7684 Repeatable, \u5DF2\u58F0\u660E {1} \u4E2A\u503C\u5143\u7D20\u65B9\u6CD5
   20.96 -
   20.97 -# 0: type
   20.98 -compiler.err.invalid.repeatable.annotation.invalid.value=\u6CE8\u91CA\u91CD\u590D: {0}\u4E0D\u662F\u6709\u6548\u7684 Repeatable: \u503C\u5143\u7D20\u65E0\u6548
   20.99 -
  20.100 -# 0: symbol type, 1: type, 2: type
  20.101 -compiler.err.invalid.repeatable.annotation.value.return=\u6CE8\u91CA\u91CD\u590D: \u5305\u542B\u6CE8\u91CA{0}\u7684\u503C\u5143\u7D20\u5E94\u5177\u6709\u7C7B\u578B{2}, \u4F46\u627E\u5230\u7684\u662F{1}
  20.102 +compiler.err.invalid.repeatable.annotation.invalid.value={0}\u4E0D\u662F\u6709\u6548\u7684 @Repeatable: \u503C\u5143\u7D20\u65E0\u6548
  20.103 +
  20.104 +# 0: symbol type, 1: unused, 2: type
  20.105 +compiler.err.invalid.repeatable.annotation.value.return=\u5305\u542B\u6CE8\u91CA\u7C7B\u578B ({0}) \u5FC5\u987B\u58F0\u660E\u7C7B\u578B{2}\u7684\u540D\u4E3A ''value'' \u7684\u5143\u7D20
  20.106  
  20.107  # 0: symbol or type, 1: symbol
  20.108 -compiler.err.invalid.repeatable.annotation.elem.nondefault=\u5305\u542B\u6CE8\u91CA{0}\u6CA1\u6709\u5143\u7D20 {1} \u7684\u9ED8\u8BA4\u503C
  20.109 -
  20.110 -# 0: symbol, 1: type, 2: symbol, 3: type
  20.111 -compiler.err.invalid.repeatable.annotation.retention=\u5305\u542B\u6CE8\u91CA {0} \u7684\u4FDD\u7559\u671F ({1}) \u77ED\u4E8E\u5DF2\u5305\u542B\u6CE8\u91CA {2} \u7684\u4FDD\u7559\u671F ({3})
  20.112 +compiler.err.invalid.repeatable.annotation.elem.nondefault=\u5BF9\u4E8E\u5143\u7D20 {1}, \u5305\u542B\u6CE8\u91CA\u7C7B\u578B ({0}) \u6CA1\u6709\u9ED8\u8BA4\u503C
  20.113 +
  20.114 +# 0: symbol, 1: unused, 2: symbol, 3: unused
  20.115 +compiler.err.invalid.repeatable.annotation.retention=\u5305\u542B\u6CE8\u91CA\u7C7B\u578B ({0}) \u7684\u4FDD\u7559\u671F\u77ED\u4E8E\u53EF\u91CD\u590D\u6CE8\u91CA\u7C7B\u578B ({2}) \u7684\u4FDD\u7559\u671F
  20.116  
  20.117  # 0: symbol, 1: symbol
  20.118 -compiler.err.invalid.repeatable.annotation.not.documented=\u5305\u542B\u6CE8\u91CA\u7C7B\u578B {0} \u4E0D\u662F @Documented, \u800C\u91CD\u590D\u7684\u6CE8\u91CA\u7C7B\u578B {1} \u4E3A
  20.119 +compiler.err.invalid.repeatable.annotation.not.documented=\u53EF\u91CD\u590D\u6CE8\u91CA\u7C7B\u578B ({1}) \u662F @Documented, \u800C\u5305\u542B\u6CE8\u91CA\u7C7B\u578B ({0}) \u5219\u4E0D\u662F
  20.120  
  20.121  # 0: symbol, 1: symbol
  20.122 -compiler.err.invalid.repeatable.annotation.not.inherited=\u5305\u542B\u6CE8\u91CA\u7C7B\u578B {0} \u4E0D\u662F @Inherited, \u800C\u91CD\u590D\u7684\u6CE8\u91CA\u7C7B\u578B {1} \u4E3A
  20.123 +compiler.err.invalid.repeatable.annotation.not.inherited=\u53EF\u91CD\u590D\u6CE8\u91CA\u7C7B\u578B ({1}) \u662F @Inherited, \u800C\u5305\u542B\u6CE8\u91CA\u7C7B\u578B ({0}) \u5219\u4E0D\u662F
  20.124  
  20.125  # 0: symbol, 1: symbol
  20.126 -compiler.err.invalid.repeatable.annotation.incompatible.target=\u5BB9\u5668\u6CE8\u91CA {0} \u7684\u76EE\u6807\u4E0D\u662F\u91CD\u590D\u6CE8\u91CA {1} \u7684\u76EE\u6807\u5B50\u96C6
  20.127 +compiler.err.invalid.repeatable.annotation.incompatible.target=\u5305\u542B\u6CE8\u91CA\u7C7B\u578B ({0}) \u9002\u7528\u7684\u76EE\u6807\u591A\u4E8E\u53EF\u91CD\u590D\u6CE8\u91CA\u7C7B\u578B ({1})
  20.128  
  20.129  # 0: symbol
  20.130  compiler.err.invalid.repeatable.annotation.repeated.and.container.present=\u5BB9\u5668 {0} \u4E0D\u5F97\u4E0E\u5176\u5305\u542B\u7684\u5143\u7D20\u540C\u65F6\u5B58\u5728
  20.131 @@ -408,20 +407,24 @@
  20.132  # 0: number
  20.133  compiler.err.int.number.too.large=\u8FC7\u5927\u7684\u6574\u6570: {0}
  20.134  
  20.135 -compiler.err.intf.annotation.members.cant.have.params=@interface \u6210\u5458\u4E0D\u80FD\u5E26\u6709\u53C2\u6570
  20.136 -
  20.137 -compiler.err.intf.annotation.cant.have.type.params=@interface \u4E0D\u80FD\u5E26\u6709\u7C7B\u578B\u53C2\u6570
  20.138 -
  20.139 -compiler.err.intf.annotation.members.cant.have.type.params=@interface \u6210\u5458\u4E0D\u80FD\u5E26\u6709\u7C7B\u578B\u53C2\u6570
  20.140 +compiler.err.intf.annotation.members.cant.have.params=\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u65E0\u6CD5\u58F0\u660E\u5F62\u53C2
  20.141 +
  20.142 +# 0: symbol
  20.143 +compiler.err.intf.annotation.cant.have.type.params=\u6CE8\u91CA\u7C7B\u578B {0} \u4E0D\u80FD\u4E3A\u6CDB\u578B
  20.144 +
  20.145 +compiler.err.intf.annotation.members.cant.have.type.params=\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u4E0D\u80FD\u4E3A\u6CDB\u578B\u65B9\u6CD5
  20.146  
  20.147  # 0: symbol, 1: type
  20.148 -compiler.err.intf.annotation.member.clash=@interface \u6210\u5458\u4E0E{1}\u4E2D\u7684\u65B9\u6CD5 ''{0}'' \u51B2\u7A81
  20.149 +compiler.err.intf.annotation.member.clash=\u6CE8\u91CA\u7C7B\u578B{1}\u58F0\u660E\u4E0E\u65B9\u6CD5 {0} \u540C\u540D\u7684\u5143\u7D20
  20.150  
  20.151  compiler.err.intf.expected.here=\u6B64\u5904\u9700\u8981\u63A5\u53E3
  20.152  
  20.153 +compiler.err.intf.or.array.expected.here=\u6B64\u5904\u9884\u671F\u4E3A\u63A5\u53E3\u6216\u6570\u7EC4\u7C7B\u578B
  20.154 +
  20.155  compiler.err.intf.meth.cant.have.body=\u63A5\u53E3\u62BD\u8C61\u65B9\u6CD5\u4E0D\u80FD\u5E26\u6709\u4E3B\u4F53
  20.156  
  20.157 -compiler.err.invalid.annotation.member.type=\u6CE8\u91CA\u6210\u5458\u7684\u7C7B\u578B\u65E0\u6548
  20.158 +# 0: symbol
  20.159 +compiler.err.invalid.annotation.member.type=\u6CE8\u91CA\u7C7B\u578B\u5143\u7D20 {0} \u7684\u7C7B\u578B\u65E0\u6548
  20.160  
  20.161  compiler.err.invalid.binary.number=\u4E8C\u8FDB\u5236\u6570\u5B57\u4E2D\u5FC5\u987B\u5305\u542B\u81F3\u5C11\u4E00\u4E2A\u4E8C\u8FDB\u5236\u6570
  20.162  
  20.163 @@ -531,9 +534,6 @@
  20.164  
  20.165  compiler.misc.incompatible.arg.types.in.mref=\u65B9\u6CD5\u5F15\u7528\u4E2D\u7684\u53C2\u6570\u7C7B\u578B\u4E0D\u517C\u5BB9
  20.166  
  20.167 -# 0: list of type, 1: message segment
  20.168 -compiler.misc.bad.arg.types.in.lambda=\u65E0\u6CD5\u4F7F\u7528\u63A8\u65AD\u53C2\u6570\u7C7B\u578B\u5BF9 lambda \u8868\u8FBE\u5F0F\u8FDB\u884C\u7C7B\u578B\u68C0\u67E5\n\u63A8\u65AD\u7C7B\u578B: {0}
  20.169 -
  20.170  compiler.err.new.not.allowed.in.annotation=\u6CE8\u91CA\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528 ''new''
  20.171  
  20.172  compiler.err.no.annotation.member={1}\u4E2D\u6CA1\u6709\u6CE8\u91CA\u6210\u5458{0}
  20.173 @@ -998,6 +998,9 @@
  20.174  # 0: symbol
  20.175  compiler.warn.missing.SVUID=\u53EF\u5E8F\u5217\u5316\u7C7B{0}\u6CA1\u6709 serialVersionUID \u7684\u5B9A\u4E49
  20.176  
  20.177 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol
  20.178 +compiler.warn.potentially.ambiguous.overload={1} \u4E2D\u7684 {0} \u53EF\u80FD\u4E0E {3} \u4E2D\u7684 {2} \u6DF7\u6DC6
  20.179 +
  20.180  # 0: message segment
  20.181  compiler.warn.override.varargs.missing={0}; \u88AB\u8986\u76D6\u7684\u65B9\u6CD5\u6CA1\u6709 ''...''
  20.182  
  20.183 @@ -1215,6 +1218,7 @@
  20.184  # 0: symbol, 1: message segment
  20.185  compiler.err.cant.access=\u65E0\u6CD5\u8BBF\u95EE{0}\n{1}
  20.186  
  20.187 +# 0: file name, 1: message segment
  20.188  compiler.misc.bad.class.file.header=\u9519\u8BEF\u7684\u7C7B\u6587\u4EF6: {0}\n{1}\n\u8BF7\u5220\u9664\u8BE5\u6587\u4EF6\u6216\u786E\u4FDD\u8BE5\u6587\u4EF6\u4F4D\u4E8E\u6B63\u786E\u7684\u7C7B\u8DEF\u5F84\u5B50\u76EE\u5F55\u4E2D\u3002
  20.189  
  20.190  # 0: file name, 1: message segment
  20.191 @@ -1244,6 +1248,12 @@
  20.192  
  20.193  compiler.misc.class.file.not.found=\u627E\u4E0D\u5230{0}\u7684\u7C7B\u6587\u4EF6
  20.194  
  20.195 +# 0: classfile major version, 1: classfile minor version
  20.196 +compiler.misc.invalid.default.interface=\u5728 {0}.{1} \u7248\u7C7B\u6587\u4EF6\u4E2D\u627E\u5230\u9ED8\u8BA4\u65B9\u6CD5
  20.197 +
  20.198 +# 0: classfile major version, 1: classfile minor version
  20.199 +compiler.misc.invalid.static.interface=\u5728 {0}.{1} \u7248\u7C7B\u6587\u4EF6\u4E2D\u627E\u5230\u9759\u6001\u65B9\u6CD5
  20.200 +
  20.201  # 0: name
  20.202  compiler.misc.file.doesnt.contain.class=\u6587\u4EF6\u4E0D\u5305\u542B\u7C7B{0}
  20.203  
  20.204 @@ -1362,9 +1372,6 @@
  20.205  # 0: type, 1: list of type
  20.206  compiler.misc.inferred.do.not.conform.to.eq.bounds=\u63A8\u65AD\u7C7B\u578B\u4E0D\u7B26\u5408\u7B49\u5F0F\u7EA6\u675F\u6761\u4EF6\n\u63A8\u65AD: {0}\n\u7B49\u5F0F\u7EA6\u675F\u6761\u4EF6: {1}
  20.207  
  20.208 -# 0: list of type
  20.209 -compiler.misc.cyclic.inference=\u7531\u4E8E\u63A8\u8BBA\u5FAA\u73AF, \u65E0\u6CD5\u5B9E\u4F8B\u5316\u63A8\u8BBA\u53D8\u91CF{0}
  20.210 -
  20.211  # 0: symbol
  20.212  compiler.misc.diamond={0}<>
  20.213  
  20.214 @@ -1374,6 +1381,9 @@
  20.215  # 0: unused
  20.216  compiler.misc.diamond.and.explicit.params=\u4E0D\u80FD\u5C06 ''<>'' \u4E0E\u6784\u9020\u5668\u7684\u663E\u5F0F\u7C7B\u578B\u53C2\u6570\u4E00\u8D77\u4F7F\u7528
  20.217  
  20.218 +# 0: unused
  20.219 +compiler.misc.mref.infer.and.explicit.params=\u4E0D\u80FD\u5C06\u539F\u59CB\u6784\u9020\u5668\u5F15\u7528\u4E0E\u6784\u9020\u5668\u7684\u663E\u5F0F\u7C7B\u578B\u53C2\u6570\u4E00\u8D77\u4F7F\u7528
  20.220 +
  20.221  # 0: type, 1: list of type
  20.222  compiler.misc.explicit.param.do.not.conform.to.bounds=\u663E\u5F0F\u7C7B\u578B\u53C2\u6570{0}\u4E0D\u7B26\u5408\u58F0\u660E\u7684\u8303\u56F4{1}
  20.223  
  20.224 @@ -1574,6 +1584,8 @@
  20.225  
  20.226  compiler.warn.underscore.as.identifier=''_'' \u7528\u4F5C\u6807\u8BC6\u7B26\n(Java SE 8 \u4E4B\u540E\u7684\u53D1\u884C\u7248\u4E2D\u53EF\u80FD\u4E0D\u652F\u6301\u4F7F\u7528 ''_'' \u4F5C\u4E3A\u6807\u8BC6\u7B26)
  20.227  
  20.228 +compiler.err.underscore.as.identifier.in.lambda=''_'' \u7528\u4F5C\u6807\u8BC6\u7B26\n(\u5BF9\u4E8E lambda \u53C2\u6570, \u7981\u6B62\u5C06 ''_'' \u7528\u4F5C\u6807\u8BC6\u7B26)
  20.229 +
  20.230  compiler.err.enum.as.identifier=\u4ECE\u53D1\u884C\u7248 5 \u5F00\u59CB, ''enum'' \u4E3A\u5173\u952E\u5B57, \u800C\u4E0D\u7528\u4F5C\u6807\u8BC6\u7B26\n(\u8BF7\u4F7F\u7528 -source 1.4 \u6216\u66F4\u4F4E\u7248\u672C\u4EE5\u5C06 ''enum'' \u7528\u4F5C\u6807\u8BC6\u7B26)
  20.231  
  20.232  compiler.err.assert.as.identifier=\u4ECE\u53D1\u884C\u7248 1.4 \u5F00\u59CB, ''assert'' \u662F\u4E00\u4E2A\u5173\u952E\u5B57, \u4F46\u4E0D\u80FD\u7528\u4F5C\u6807\u8BC6\u7B26\n(\u8BF7\u4F7F\u7528 -source 1.3 \u6216\u66F4\u4F4E\u7248\u672C\u4EE5\u5C06 ''assert'' \u7528\u4F5C\u6807\u8BC6\u7B26)
  20.233 @@ -1585,11 +1597,12 @@
  20.234  compiler.err.receiver.parameter.not.applicable.constructor.toplevel.class=\u63A5\u6536\u65B9\u53C2\u6570\u4E0D\u9002\u7528\u4E8E\u9876\u5C42\u7C7B\u7684\u6784\u9020\u5668
  20.235  
  20.236  # TODO 308: make a better error message
  20.237 -compiler.err.cant.annotate.static.class=\u65E0\u6CD5\u5BF9\u5C01\u95ED\u9759\u6001\u5D4C\u5957\u7C7B\u8FDB\u884C\u6CE8\u91CA
  20.238 +# 0: symbol
  20.239 +compiler.err.cant.type.annotate.scoping.1=\u65E0\u6CD5\u4F7F\u7528 type-use \u6CE8\u91CA {0} \u6765\u6CE8\u91CA\u786E\u5B9A\u4F5C\u7528\u57DF\u7ED3\u6784
  20.240  
  20.241  # TODO 308: make a better error message
  20.242 -# 0: unused
  20.243 -compiler.err.cant.annotate.nested.type=\u65E0\u6CD5\u6CE8\u91CA\u7528\u4E8E\u9759\u6001\u5D4C\u5957\u7C7B\u578B\u7684\u786E\u5B9A\u4F5C\u7528\u57DF\u7ED3\u6784
  20.244 +# 0: list of symbol
  20.245 +compiler.err.cant.type.annotate.scoping=\u65E0\u6CD5\u4F7F\u7528 type-use \u6CE8\u91CA {0} \u6765\u6CE8\u91CA\u786E\u5B9A\u4F5C\u7528\u57DF\u7ED3\u6784
  20.246  
  20.247  # 0: type, 1: type
  20.248  compiler.err.incorrect.receiver.name=\u63A5\u6536\u65B9\u540D\u79F0\u4E0E\u5C01\u95ED\u7C7B\u7C7B\u578B\u4E0D\u5339\u914D\n\u9700\u8981: {0}\n\u627E\u5230: {1}
  20.249 @@ -1618,7 +1631,10 @@
  20.250  compiler.err.type.annotations.not.supported.in.source=-source {0} \u4E2D\u4E0D\u652F\u6301\u7C7B\u578B\u6CE8\u91CA\n(\u8BF7\u4F7F\u7528 -source 8 \u6216\u66F4\u9AD8\u7248\u672C\u4EE5\u542F\u7528\u7C7B\u578B\u6CE8\u91CA)
  20.251  
  20.252  # 0: string
  20.253 -compiler.err.foreach.not.supported.in.source=-source {0} \u4E2D\u4E0D\u652F\u6301 for-each \u5FAA\u73AF\n(\u8BF7\u4F7F\u7528 -source 5 \u6216\u66F4\u9AD8\u7248\u672C\u4EE5\u542F\u7528 for-each \u5FAA\u73AF)
  20.254 +compiler.err.repeatable.annotations.not.supported.in.source=-source {0}\u4E2D\u4E0D\u652F\u6301\u91CD\u590D\u6CE8\u91CA\n(\u8BF7\u4F7F\u7528 -source 8 \u6216\u66F4\u9AD8\u7248\u672C\u4EE5\u542F\u7528\u91CD\u590D\u6CE8\u91CA)
  20.255 +
  20.256 +# 0: string
  20.257 +compiler.err.foreach.not.supported.in.source=-source {0}\u4E2D\u4E0D\u652F\u6301\u589E\u5F3A\u578B for \u5FAA\u73AF\n(\u4F7F\u7528 -source 5 \u6216\u66F4\u9AD8\u7248\u672C\u4EE5\u542F\u7528 for-each \u5FAA\u73AF)
  20.258  
  20.259  # 0: string
  20.260  compiler.err.static.import.not.supported.in.source=-source {0} \u4E2D\u4E0D\u652F\u6301\u9759\u6001\u5BFC\u5165\u58F0\u660E\n(\u8BF7\u4F7F\u7528 -source 5 \u6216\u66F4\u9AD8\u7248\u672C\u4EE5\u542F\u7528\u9759\u6001\u5BFC\u5165\u58F0\u660E)

    21.1 --- a/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties	Thu Dec 19 17:24:35 2013 -0800
    21.2 +++ b/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties	Mon Dec 23 14:46:25 2013 -0800
    21.3 @@ -55,8 +55,8 @@
    21.4  main.opt.o=\  -o <file>                \u51FA\u529B\u30D5\u30A1\u30A4\u30EB(-d\u304B-o\u306E\u3069\u3061\u3089\u304B\u4E00\u65B9\u3092\u4F7F\u7528\u3059\u308B)
    21.5  main.opt.d=\  -d <dir>                 \u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
    21.6  main.opt.v=\  -v  -verbose             \u8A73\u7D30\u306A\u51FA\u529B\u3092\u884C\u3046
    21.7 -main.opt.h=\  -h  --help  -?           \u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3059\u308B
    21.8 -main.opt.version=\  -version                 \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u8868\u793A\u3059\u308B
    21.9 +main.opt.h=\  -h  --help  -?           \u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3059\u308B
   21.10 +main.opt.version=\  -version                 \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3059\u308B
   21.11  main.opt.jni=\  -jni                     JNI\u5F62\u5F0F\u306E\u30D8\u30C3\u30C0\u30FC\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u751F\u6210\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8)
   21.12  main.opt.force=\  -force                   \u5E38\u306B\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u3092\u66F8\u304D\u8FBC\u3080
   21.13  main.opt.classpath=\  -classpath <path>        \u30AF\u30E9\u30B9\u3092\u30ED\u30FC\u30C9\u3059\u308B\u30D1\u30B9

    22.1 --- a/src/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties	Thu Dec 19 17:24:35 2013 -0800
    22.2 +++ b/src/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties	Mon Dec 23 14:46:25 2013 -0800
    22.3 @@ -1,31 +1,35 @@
    22.4  main.usage.summary=\u4F7F\u7528\u65B9\u6CD5: {0} <options> <classes...>\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30EA\u30B9\u30C8\u306B\u3064\u3044\u3066\u306F\u3001-h\u3001-?\u307E\u305F\u306F--help\u3092\u4F7F\u7528\u3057\u307E\u3059
    22.5  
    22.6 -main.usage=\u4F7F\u7528\u65B9\u6CD5: {0} <options> <classes...>\n<classes>\u306B\u306F\u3001.class\u30D5\u30A1\u30A4\u30EB\u306E\u30D1\u30B9\u540D\u3001\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001JAR\u30D5\u30A1\u30A4\u30EB\u3001\u5B8C\u5168\u4FEE\u98FE\u30AF\u30E9\u30B9\u540D\n\u307E\u305F\u306F\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9"*"\u3092\u6307\u5B9A\u3067\u304D\u307E\u3059\u3002\u4F7F\u7528\u3067\u304D\u308B\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:
    22.7 +main.usage=\u4F7F\u7528\u65B9\u6CD5: {0} <options> <classes...>\n<classes>\u306B\u306F\u3001.class\u30D5\u30A1\u30A4\u30EB\u306E\u30D1\u30B9\u540D\u3001\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001JAR\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u5B8C\u5168\u4FEE\u98FE\n\u30AF\u30E9\u30B9\u540D\u3092\u6307\u5B9A\u3067\u304D\u307E\u3059\u3002\u4F7F\u7528\u3067\u304D\u308B\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:
    22.8  
    22.9  error.prefix=\u30A8\u30E9\u30FC:
   22.10  warn.prefix=\u8B66\u544A:
   22.11  
   22.12 -main.opt.h=\  -h -?      --help                    \u3053\u306E\u4F7F\u7528\u65B9\u6CD5\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3059\u308B
   22.13 +main.opt.h=\  -h -?        -help                 \u3053\u306E\u4F7F\u7528\u65B9\u6CD5\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3057\u307E\u3059
   22.14  
   22.15 -main.opt.version=\             --version                 \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831
   22.16 +main.opt.version=\  -version                           \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831
   22.17  
   22.18 -main.opt.V=\  -V <level> --verbose-level=<level>   \u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EC\u30D9\u30EB\u307E\u305F\u306F\u30AF\u30E9\u30B9\u30FB\u30EC\u30D9\u30EB\u306E\u4F9D\u5B58\u6027\u3092\u51FA\u529B\u3059\u308B\n                                       \u6709\u52B9\u306A\u30EC\u30D9\u30EB: "package"\u304A\u3088\u3073"class"
   22.19 +main.opt.v=\  -v           -verbose              \u30AF\u30E9\u30B9\u30FB\u30EC\u30D9\u30EB\u306E\u4F9D\u5B58\u6027\u3092\u3059\u3079\u3066\u51FA\u529B\u3057\u307E\u3059\n  -verbose:package                   \u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EC\u30D9\u30EB\u306E\u4F9D\u5B58\u6027\u3092\u51FA\u529B\u3057\u307E\u3059\n                                     (\u540C\u3058\u30A2\u30FC\u30AB\u30A4\u30D6\u5185\u306E\u4F9D\u5B58\u6027\u3092\u9664\u304F)\n  -verbose:class                     \u30AF\u30E9\u30B9\u30FB\u30EC\u30D9\u30EB\u306E\u4F9D\u5B58\u6027\u3092\u51FA\u529B\u3057\u307E\u3059\n                                     (\u540C\u3058\u30A2\u30FC\u30AB\u30A4\u30D6\u5185\u306E\u4F9D\u5B58\u6027\u3092\u9664\u304F)
   22.20  
   22.21 -main.opt.v=\  -v         --verbose                 \u8FFD\u52A0\u60C5\u5831\u3092\u51FA\u529B\u3059\u308B
   22.22 +main.opt.s=\  -s           -summary              \u4F9D\u5B58\u6027\u306E\u8981\u7D04\u306E\u307F\u51FA\u529B\u3057\u307E\u3059
   22.23  
   22.24 -main.opt.s=\  -s         --summary                 \u4F9D\u5B58\u6027\u306E\u8981\u7D04\u306E\u307F\u51FA\u529B\u3059\u308B
   22.25 +main.opt.p=\  -p <pkgname> -package <pkgname>    \u6307\u5B9A\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u5185\u306E\u4F9D\u5B58\u6027\u3092\u691C\u51FA\u3057\u307E\u3059\n                                     (\u8907\u6570\u56DE\u6307\u5B9A\u53EF\u80FD)
   22.26  
   22.27 -main.opt.p=\  -p <pkg name> --package=<pkg name>   \u5206\u6790\u3092\u3053\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u306B\u5236\u9650\u3059\u308B\n                                       (\u8907\u6570\u56DE\u6307\u5B9A\u53EF\u80FD)
   22.28 +main.opt.e=\  -e <regex>   -regex <regex>        \u30D1\u30BF\u30FC\u30F3\u306B\u4E00\u81F4\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u5185\u306E\u4F9D\u5B58\u6027\u3092\u691C\u51FA\u3057\u307E\u3059\n                                     (-p\u3068-e\u306F\u6392\u4ED6\u7684)
   22.29  
   22.30 -main.opt.e=\  -e <regex> --regex=<regex>           \u5206\u6790\u3092\u30D1\u30BF\u30FC\u30F3\u306B\u4E00\u81F4\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u5236\u9650\u3059\u308B\n                                       (-p\u3068-e\u306F\u6392\u4ED6\u7684)
   22.31 +main.opt.include=\  -include <regex>                   \u30D1\u30BF\u30FC\u30F3\u306B\u4E00\u81F4\u3059\u308B\u30AF\u30E9\u30B9\u306B\u5206\u6790\u3092\u5236\u9650\u3057\u307E\u3059\n                                     \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\u5206\u6790\u5BFE\u8C61\u30AF\u30E9\u30B9\u306E\n                                     \u30EA\u30B9\u30C8\u304C\u30D5\u30A3\u30EB\u30BF\u51E6\u7406\u3055\u308C\u307E\u3059\u3002\u30D1\u30BF\u30FC\u30F3\u3092\u4F9D\u5B58\u6027\u306B\n                                     \u9069\u7528\u3059\u308B-p\u304A\u3088\u3073-e\u3068\u4E00\u7DD2\u306B\u4F7F\u7528\u3067\u304D\u307E\u3059
   22.32  
   22.33 -main.opt.P=\  -P         --profile                 \u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u542B\u3080\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30D5\u30A1\u30A4\u30EB\u3092\u8868\u793A\u3059\u308B
   22.34 +main.opt.P=\  -P           -profile              \u30D7\u30ED\u30D5\u30A1\u30A4\u30EB\u3001\u307E\u305F\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u542B\u3080\u30D5\u30A1\u30A4\u30EB\u3092\u8868\u793A\u3057\u307E\u3059
   22.35  
   22.36 -main.opt.c=\  -c <path>  --classpath=<path>        \u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B
   22.37 +main.opt.cp=\  -cp <path>   -classpath <path>     \u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u5834\u6240\u3092\u6307\u5B9A\u3057\u307E\u3059
   22.38  
   22.39 -main.opt.R=\  -R         --recursive               \u3059\u3079\u3066\u306E\u4F9D\u5B58\u6027\u3092\u53CD\u5FA9\u7684\u306B\u8D70\u67FB\u3059\u308B
   22.40 +main.opt.R=\  -R           -recursive            \u3059\u3079\u3066\u306E\u4F9D\u5B58\u6027\u3092\u53CD\u5FA9\u7684\u306B\u8D70\u67FB\u3057\u307E\u3059
   22.41  
   22.42 -main.opt.d=\  -d <depth> --depth=<depth>           \u63A8\u79FB\u7684\u306A\u4F9D\u5B58\u6027\u5206\u6790\u306E\u6DF1\u3055\u3092\u6307\u5B9A\u3059\u308B
   22.43 +main.opt.apionly=\  -apionly                           \u5206\u6790\u3092API\u3001\u3064\u307E\u308A\u3001\u30D1\u30D6\u30EA\u30C3\u30AF\u30FB\u30AF\u30E9\u30B9\u306E\n                                     \u30D1\u30D6\u30EA\u30C3\u30AF\u30FB\u30E1\u30F3\u30D0\u30FC\u304A\u3088\u3073\u4FDD\u8B77\u3055\u308C\u305F\u30E1\u30F3\u30D0\u30FC\u306E\n                                     \u7F72\u540D\u306B\u304A\u3051\u308B\u4F9D\u5B58\u6027(\u30D5\u30A3\u30FC\u30EB\u30C9\u30FB\u30BF\u30A4\u30D7\u3001\u30E1\u30BD\u30C3\u30C9\u30FB\n                                     \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30BF\u30A4\u30D7\u3001\u623B\u3055\u308C\u305F\u30BF\u30A4\u30D7\u3001\u30C1\u30A7\u30C3\u30AF\u3055\u308C\u305F\n                                     \u4F8B\u5916\u30BF\u30A4\u30D7\u306A\u3069)\u306B\u5236\u9650\u3057\u307E\u3059
   22.44 +
   22.45 +main.opt.dotoutput=\  -dotoutput <dir>                   DOT\u30D5\u30A1\u30A4\u30EB\u51FA\u529B\u306E\u5B9B\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
   22.46 +
   22.47 +main.opt.depth=\  -depth=<depth>                     \u63A8\u79FB\u7684\u306A\u4F9D\u5B58\u6027\u5206\u6790\u306E\u6DF1\u3055\u3092\n                                     \u6307\u5B9A\u3057\u307E\u3059
   22.48  
   22.49  err.unknown.option=\u4E0D\u660E\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
   22.50  err.missing.arg={0}\u306B\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
   22.51 @@ -34,6 +38,7 @@
   22.52  err.option.after.class=\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u30AF\u30E9\u30B9\u306E\u524D\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059: {0}
   22.53  err.option.unsupported={0}\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {1}
   22.54  err.profiles.msg=\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB\u60C5\u5831\u304C\u3042\u308A\u307E\u305B\u3093
   22.55 +err.dot.output.path=\u7121\u52B9\u306A\u30D1\u30B9: {0}
   22.56  warn.invalid.arg=\u7121\u52B9\u306A\u30AF\u30E9\u30B9\u540D\u307E\u305F\u306F\u30D1\u30B9\u540D\u304C\u5B58\u5728\u3057\u307E\u305B\u3093: {0}
   22.57  warn.split.package=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306F{1} {2}\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059
   22.58  

    23.1 --- a/src/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties	Thu Dec 19 17:24:35 2013 -0800
    23.2 +++ b/src/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties	Mon Dec 23 14:46:25 2013 -0800
    23.3 @@ -1,31 +1,35 @@
    23.4  main.usage.summary=\u7528\u6CD5: {0} <options> <classes...>\n\u4F7F\u7528 -h, -? \u6216 --help \u5217\u51FA\u53EF\u80FD\u7684\u9009\u9879
    23.5  
    23.6 -main.usage=\u7528\u6CD5: {0} <options> <classes...>\n\u5176\u4E2D, <classes> \u53EF\u4EE5\u662F .class \u6587\u4EF6, \u76EE\u5F55, JAR \u6587\u4EF6\u7684\u8DEF\u5F84\u540D,\n\u4E5F\u53EF\u4EE5\u662F\u5168\u9650\u5B9A\u7C7B\u540D\u6216\u901A\u914D\u7B26 "*"\u3002\u53EF\u80FD\u7684\u9009\u9879\u5305\u62EC:
    23.7 +main.usage=\u7528\u6CD5: {0} <options> <classes...>\n\u5176\u4E2D <classes> \u53EF\u4EE5\u662F .class \u6587\u4EF6, \u76EE\u5F55, JAR \u6587\u4EF6\u7684\u8DEF\u5F84\u540D,\n\u4E5F\u53EF\u4EE5\u662F\u5168\u9650\u5B9A\u7C7B\u540D\u3002\u53EF\u80FD\u7684\u9009\u9879\u5305\u62EC:
    23.8  
    23.9  error.prefix=\u9519\u8BEF:
   23.10  warn.prefix=\u8B66\u544A:
   23.11  
   23.12 -main.opt.h=\  -h -?      --help                    \u8F93\u51FA\u6B64\u7528\u6CD5\u6D88\u606F
   23.13 +main.opt.h=\  -h -?        -help                 \u8F93\u51FA\u6B64\u7528\u6CD5\u6D88\u606F
   23.14  
   23.15 -main.opt.version=\             --version                 \u7248\u672C\u4FE1\u606F
   23.16 +main.opt.version=\  -version                           \u7248\u672C\u4FE1\u606F
   23.17  
   23.18 -main.opt.V=\  -V <level> --verbose-level=<level>   \u8F93\u51FA\u7A0B\u5E8F\u5305\u7EA7\u522B\u6216\u7C7B\u7EA7\u522B\u88AB\u4F9D\u8D56\u5BF9\u8C61\n                                       \u6709\u6548\u7EA7\u522B\u4E3A: "\u7A0B\u5E8F\u5305" \u548C "\u7C7B"
   23.19 +main.opt.v=\  -v           -verbose              \u8F93\u51FA\u6240\u6709\u7C7B\u7EA7\u522B\u88AB\u4F9D\u8D56\u5BF9\u8C61\n  -verbose:package                   \u8F93\u51FA\u7A0B\u5E8F\u5305\u7EA7\u522B\u88AB\u4F9D\u8D56\u5BF9\u8C61, \u4E0D\u5305\u62EC\n                                     \u540C\u4E00\u6863\u6848\u4E2D\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\n  -verbose:class                     \u8F93\u51FA\u7C7B\u7EA7\u522B\u88AB\u4F9D\u8D56\u5BF9\u8C61, \u4E0D\u5305\u62EC\n                                     \u540C\u4E00\u6863\u6848\u4E2D\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61
   23.20  
   23.21 -main.opt.v=\  -v         --verbose                 \u8F93\u51FA\u9644\u52A0\u4FE1\u606F
   23.22 +main.opt.s=\  -s           -summary              \u4EC5\u8F93\u51FA\u88AB\u4F9D\u8D56\u5BF9\u8C61\u6982\u8981
   23.23  
   23.24 -main.opt.s=\  -s         --summary                 \u4EC5\u8F93\u51FA\u88AB\u4F9D\u8D56\u5BF9\u8C61\u6982\u8981
   23.25 +main.opt.p=\  -p <pkgname> -package <pkgname>    \u67E5\u627E\u7ED9\u5B9A\u7A0B\u5E8F\u5305\u4E2D\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\n                                     (\u53EF\u80FD\u591A\u6B21\u6307\u5B9A)
   23.26  
   23.27 -main.opt.p=\  -p <pkg name> --package=<pkg name>   \u5C06\u5206\u6790\u9650\u5236\u4E3A\u6B64\u7A0B\u5E8F\u5305\u4E2D\u7684\u7C7B\n                                       (\u53EF\u4EE5\u6307\u5B9A\u591A\u6B21)
   23.28 +main.opt.e=\  -e <regex>   -regex <regex>        \u67E5\u627E\u4E0E\u6A21\u5F0F\u5339\u914D\u7684\u7A0B\u5E8F\u5305\u4E2D\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\n                                     (-p \u548C -e \u4E92\u76F8\u6392\u65A5)
   23.29  
   23.30 -main.opt.e=\  -e <regex> --regex=<regex>           \u5C06\u5206\u6790\u9650\u5236\u4E3A\u4E0E\u6A21\u5F0F\u5339\u914D\u7684\u7A0B\u5E8F\u5305\n                                       (-p \u548C -e \u4E92\u65A5)
   23.31 +main.opt.include=\  -include <regex>                   \u5C06\u5206\u6790\u9650\u5236\u4E3A\u4E0E\u6A21\u5F0F\u5339\u914D\u7684\u7C7B\n                                     \u6B64\u9009\u9879\u7B5B\u9009\u8981\u5206\u6790\u7684\u7C7B\u7684\u5217\u8868\u3002\n                                     \u5B83\u53EF\u4EE5\u4E0E\u5411\u88AB\u4F9D\u8D56\u5BF9\u8C61\u5E94\u7528\u6A21\u5F0F\u7684\n                                     -p \u548C -e \u7ED3\u5408\u4F7F\u7528
   23.32  
   23.33 -main.opt.P=\  -P         --profile                 \u663E\u793A\u914D\u7F6E\u6587\u4EF6\u6216\u5305\u542B\u7A0B\u5E8F\u5305\u7684\u6587\u4EF6
   23.34 +main.opt.P=\  -P           -profile              \u663E\u793A\u914D\u7F6E\u6587\u4EF6\u6216\u5305\u542B\u7A0B\u5E8F\u5305\u7684\u6587\u4EF6
   23.35  
   23.36 -main.opt.c=\  -c <path>  --classpath=<path>        \u6307\u5B9A\u67E5\u627E\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E
   23.37 +main.opt.cp=\  -cp <path>   -classpath <path>     \u6307\u5B9A\u67E5\u627E\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E
   23.38  
   23.39 -main.opt.R=\  -R         --recursive               \u9012\u5F52\u904D\u5386\u6240\u6709\u88AB\u4F9D\u8D56\u5BF9\u8C61
   23.40 +main.opt.R=\  -R           -recursive            \u9012\u5F52\u904D\u5386\u6240\u6709\u88AB\u4F9D\u8D56\u5BF9\u8C61
   23.41  
   23.42 -main.opt.d=\  -d <depth> --depth=<depth>           \u6307\u5B9A\u8FC7\u6E21\u88AB\u4F9D\u8D56\u5BF9\u8C61\u5206\u6790\u7684\u6DF1\u5EA6
   23.43 +main.opt.apionly=\  -apionly                           \u901A\u8FC7\u516C\u5171\u7C7B (\u5305\u62EC\u5B57\u6BB5\u7C7B\u578B, \u65B9\u6CD5\u53C2\u6570\n                                     \u7C7B\u578B, \u8FD4\u56DE\u7C7B\u578B, \u53D7\u63A7\u5F02\u5E38\u9519\u8BEF\u7C7B\u578B\n                                     \u7B49) \u7684\u516C\u5171\u548C\u53D7\u4FDD\u62A4\u6210\u5458\u7684\u7B7E\u540D\n                                     \u9650\u5236\u5BF9 API (\u5373\u88AB\u4F9D\u8D56\u5BF9\u8C61)\n                                     \u8FDB\u884C\u5206\u6790
   23.44 +
   23.45 +main.opt.dotoutput=\  -dotoutput <dir>                   DOT \u6587\u4EF6\u8F93\u51FA\u7684\u76EE\u6807\u76EE\u5F55
   23.46 +
   23.47 +main.opt.depth=\  -depth=<depth>                     \u6307\u5B9A\u8FC7\u6E21\u88AB\u4F9D\u8D56\u5BF9\u8C61\u5206\u6790\n                                     \u7684\u6DF1\u5EA6
   23.48  
   23.49  err.unknown.option=\u672A\u77E5\u9009\u9879: {0}
   23.50  err.missing.arg=\u6CA1\u6709\u4E3A{0}\u6307\u5B9A\u503C
   23.51 @@ -34,6 +38,7 @@
   23.52  err.option.after.class=\u5FC5\u987B\u5728\u7C7B\u4E4B\u524D\u6307\u5B9A\u9009\u9879: {0}
   23.53  err.option.unsupported=\u4E0D\u652F\u6301{0}: {1}
   23.54  err.profiles.msg=\u6CA1\u6709\u914D\u7F6E\u6587\u4EF6\u4FE1\u606F
   23.55 +err.dot.output.path=\u65E0\u6548\u8DEF\u5F84: {0}
   23.56  warn.invalid.arg=\u7C7B\u540D\u65E0\u6548\u6216\u8DEF\u5F84\u540D\u4E0D\u5B58\u5728: {0}
   23.57  warn.split.package=\u5DF2\u5728{1} {2}\u4E2D\u5B9A\u4E49\u7A0B\u5E8F\u5305{0}
   23.58  

    24.1 --- a/src/share/classes/javax/lang/model/type/IntersectionType.java	Thu Dec 19 17:24:35 2013 -0800
    24.2 +++ b/src/share/classes/javax/lang/model/type/IntersectionType.java	Mon Dec 23 14:46:25 2013 -0800
    24.3 @@ -35,10 +35,12 @@
    24.4   * {@code <T extends Number & Runnable>} is an (implicit) intersection
    24.5   * type.  As of {@link javax.lang.model.SourceVersion#RELEASE_8
    24.6   * RELEASE_8}, this is represented by an {@code IntersectionType} with
    24.7 - * {@code Number} and {@code Runnable} as its bounds.  Also as of the
    24.8 - * {@link javax.lang.model.SourceVersion#RELEASE_8 RELEASE_8},
    24.9 - * intersection types can explicitly appear as the target type of a
   24.10 - * cast expression.
   24.11 + * {@code Number} and {@code Runnable} as its bounds.
   24.12 + *
   24.13 + * @implNote Also as of {@link
   24.14 + * javax.lang.model.SourceVersion#RELEASE_8 RELEASE_8}, in the
   24.15 + * reference implementation an {@code IntersectionType} is used to
   24.16 + * model the explicit target type of a cast expression.
   24.17   *
   24.18   * @since 1.8
   24.19   */

    25.1 --- a/src/share/classes/javax/lang/model/util/Types.java	Thu Dec 19 17:24:35 2013 -0800
    25.2 +++ b/src/share/classes/javax/lang/model/util/Types.java	Mon Dec 23 14:46:25 2013 -0800
    25.3 @@ -60,13 +60,6 @@
    25.4      /**
    25.5       * Tests whether two {@code TypeMirror} objects represent the same type.
    25.6       *
    25.7 -     * <p>Since annotations are only meta-data associated with a type,
    25.8 -     * the set of annotations on either argument is <em>not</em> taken
    25.9 -     * into account when computing whether or not two {@code
   25.10 -     * TypeMirror} objects are the same type. In particular, two
   25.11 -     * {@code TypeMirror} objects can have different annotations and
   25.12 -     * still be considered the same.
   25.13 -     *
   25.14       * <p>Caveat: if either of the arguments to this method represents a
   25.15       * wildcard, this method will return false.  As a consequence, a wildcard
   25.16       * is not the same type as itself.  This might be surprising at first,
   25.17 @@ -77,6 +70,13 @@
   25.18       *   {@code list.add(list.get(0));}
   25.19       * </pre>
   25.20       *
   25.21 +     * <p>Since annotations are only meta-data associated with a type,
   25.22 +     * the set of annotations on either argument is <em>not</em> taken
   25.23 +     * into account when computing whether or not two {@code
   25.24 +     * TypeMirror} objects are the same type. In particular, two
   25.25 +     * {@code TypeMirror} objects can have different annotations and
   25.26 +     * still be considered the same.
   25.27 +     *
   25.28       * @param t1  the first type
   25.29       * @param t2  the second type
   25.30       * @return {@code true} if and only if the two types are the same

    26.1 --- a/test/com/sun/javadoc/AccessH1/AccessH1.java	Thu Dec 19 17:24:35 2013 -0800
    26.2 +++ b/test/com/sun/javadoc/AccessH1/AccessH1.java	Mon Dec 23 14:46:25 2013 -0800
    26.3 @@ -1,5 +1,5 @@
    26.4  /*
    26.5 - * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
    26.6 + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
    26.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    26.8   *
    26.9   * This code is free software; you can redistribute it and/or modify it
   26.10 @@ -23,7 +23,7 @@
   26.11  
   26.12  /*
   26.13   * @test
   26.14 - * @bug 4636667 7052425
   26.15 + * @bug 4636667 7052425 8016549
   26.16   * @summary  Use <H1, <H2>, and <H3> in proper sequence for accessibility
   26.17   * @author dkramer
   26.18   * @run main AccessH1
   26.19 @@ -85,7 +85,7 @@
   26.20      private static final String[][] testArray = {
   26.21          // Test the style sheet
   26.22          {
   26.23 -            "h1 {" + LS + "    font-size:1.8em;" + LS +
   26.24 +            "h1 {" + LS + "    font-size:20px;" + LS +
   26.25              "}",
   26.26              TMPDEST_DIR1 + "stylesheet.css"
   26.27          },

    27.1 --- a/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java	Thu Dec 19 17:24:35 2013 -0800
    27.2 +++ b/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java	Mon Dec 23 14:46:25 2013 -0800
    27.3 @@ -23,7 +23,7 @@
    27.4  
    27.5  /*
    27.6   * @test
    27.7 - * @bug 6553182 8025416
    27.8 + * @bug 6553182 8025416 8029504
    27.9   * @summary This test verifies the -Xdocrootparent option.
   27.10   * @author Bhavesh Patel
   27.11   * @library ../lib/

    28.1 --- a/test/com/sun/javadoc/testStylesheet/TestStylesheet.java	Thu Dec 19 17:24:35 2013 -0800
    28.2 +++ b/test/com/sun/javadoc/testStylesheet/TestStylesheet.java	Mon Dec 23 14:46:25 2013 -0800
    28.3 @@ -23,7 +23,7 @@
    28.4  
    28.5  /*
    28.6   * @test
    28.7 - * @bug      4494033 7028815 7052425 8007338 8023608 8008164
    28.8 + * @bug      4494033 7028815 7052425 8007338 8023608 8008164 8016549
    28.9   * @summary  Run tests on doclet stylesheet.
   28.10   * @author   jamieh
   28.11   * @library  ../lib/
   28.12 @@ -54,8 +54,8 @@
   28.13          {BUG_ID + FS + "stylesheet.css",
   28.14              "body {" + NL + "    background-color:#ffffff;" + NL +
   28.15              "    color:#353833;" + NL +
   28.16 -            "    font-family:Arial, Helvetica, sans-serif;" + NL +
   28.17 -            "    font-size:76%;" + NL + "    margin:0;" + NL + "}"},
   28.18 +            "    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;" + NL +
   28.19 +            "    font-size:14px;" + NL + "    margin:0;" + NL + "}"},
   28.20          {BUG_ID + FS + "stylesheet.css",
   28.21              "ul {" + NL + "    list-style-type:disc;" + NL + "}"},
   28.22          {BUG_ID + FS + "stylesheet.css",
   28.23 @@ -64,49 +64,65 @@
   28.24              "    position:relative;" + NL +
   28.25              "    text-align:left;" + NL +
   28.26              "    background-repeat:no-repeat;" + NL +
   28.27 -            "    color:#FFFFFF;" + NL +
   28.28 +            "    color:#253441;" + NL +
   28.29              "    font-weight:bold;" + NL +
   28.30              "    clear:none;" + NL +
   28.31              "    overflow:hidden;" + NL +
   28.32              "    padding:0px;" + NL +
   28.33 +            "    padding-top:10px;" + NL +
   28.34 +            "    padding-left:1px;" + NL +
   28.35              "    margin:0px;" + NL +
   28.36 +            "    white-space:pre;" + NL +
   28.37              "}"},
   28.38          {BUG_ID + FS + "stylesheet.css",
   28.39              ".overviewSummary caption span, .memberSummary caption span, .typeSummary caption span," + NL +
   28.40              ".useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {" + NL +
   28.41              "    white-space:nowrap;" + NL +
   28.42 -            "    padding-top:8px;" + NL +
   28.43 -            "    padding-left:8px;" + NL +
   28.44 +            "    padding-top:5px;" + NL +
   28.45 +            "    padding-left:12px;" + NL +
   28.46 +            "    padding-right:12px;" + NL +
   28.47 +            "    padding-bottom:7px;" + NL +
   28.48              "    display:inline-block;" + NL +
   28.49              "    float:left;" + NL +
   28.50 -            "    background-image:url(resources/titlebar.gif);" + NL +
   28.51 +            "    background-color:#F8981D;" + NL +
   28.52 +            "    border: none;" + NL +
   28.53 +            "    height:16px;" + NL +
   28.54              "}"},
   28.55          {BUG_ID + FS + "stylesheet.css",
   28.56              ".memberSummary caption span.activeTableTab span {" + NL +
   28.57              "    white-space:nowrap;" + NL +
   28.58 -            "    padding-top:8px;" + NL +
   28.59 -            "    padding-left:8px;" + NL +
   28.60 +            "    padding-top:5px;" + NL +
   28.61 +            "    padding-left:12px;" + NL +
   28.62 +            "    padding-right:12px;" + NL +
   28.63 +            "    margin-right:3px;" + NL +
   28.64              "    display:inline-block;" + NL +
   28.65              "    float:left;" + NL +
   28.66 -            "    background-image:url(resources/activetitlebar.gif);" + NL +
   28.67 +            "    background-color:#F8981D;" + NL +
   28.68 +            "    height:16px;" + NL +
   28.69              "}"},
   28.70          {BUG_ID + FS + "stylesheet.css",
   28.71              ".memberSummary caption span.tableTab span {" + NL +
   28.72              "    white-space:nowrap;" + NL +
   28.73 -            "    padding-top:8px;" + NL +
   28.74 -            "    padding-left:8px;" + NL +
   28.75 +            "    padding-top:5px;" + NL +
   28.76 +            "    padding-left:12px;" + NL +
   28.77 +            "    padding-right:12px;" + NL +
   28.78 +            "    margin-right:3px;" + NL +
   28.79              "    display:inline-block;" + NL +
   28.80              "    float:left;" + NL +
   28.81 -            "    background-image:url(resources/titlebar.gif);" + NL +
   28.82 +            "    background-color:#4D7A97;" + NL +
   28.83 +            "    height:16px;" + NL +
   28.84              "}"},
   28.85          {BUG_ID + FS + "stylesheet.css",
   28.86              ".memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {" + NL +
   28.87              "    padding-top:0px;" + NL +
   28.88              "    padding-left:0px;" + NL +
   28.89 +            "    padding-right:0px;" + NL +
   28.90              "    background-image:none;" + NL +
   28.91              "    float:none;" + NL +
   28.92 -            "    display:inline-block;" + NL +
   28.93 +            "    display:inline;" + NL +
   28.94              "}"},
   28.95 +        {BUG_ID + FS + "stylesheet.css",
   28.96 +            "@import url('resources/fonts/dejavu.css');"},
   28.97          // Test whether a link to the stylesheet file is inserted properly
   28.98          // in the class documentation.
   28.99          {BUG_ID + FS + "pkg" + FS + "A.html",

    29.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    29.2 +++ b/test/tools/javac/T8029569/VarargsAmbiguityCrashTest.java	Mon Dec 23 14:46:25 2013 -0800
    29.3 @@ -0,0 +1,41 @@
    29.4 +/*
    29.5 + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
    29.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    29.7 + *
    29.8 + * This code is free software; you can redistribute it and/or modify it
    29.9 + * under the terms of the GNU General Public License version 2 only, as
   29.10 + * published by the Free Software Foundation.
   29.11 + *
   29.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
   29.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   29.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   29.15 + * version 2 for more details (a copy is included in the LICENSE file that
   29.16 + * accompanied this code).
   29.17 + *
   29.18 + * You should have received a copy of the GNU General Public License version
   29.19 + * 2 along with this work; if not, write to the Free Software Foundation,
   29.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   29.21 + *
   29.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   29.23 + * or visit www.oracle.com if you need additional information or have any
   29.24 + * questions.
   29.25 + */
   29.26 +
   29.27 +/*
   29.28 + * @test
   29.29 + * @bug 8029569
   29.30 + * @summary internal javac cast exception when resolving varargs ambiguity
   29.31 + * @compile/fail/ref=VarargsAmbiguityCrashTest.out -XDrawDiagnostics VarargsAmbiguityCrashTest.java
   29.32 + */
   29.33 +
   29.34 +public class VarargsAmbiguityCrashTest {
   29.35 +    void m1() {
   29.36 +        m2(null, new Exception());
   29.37 +    }
   29.38 +
   29.39 +    void m2(Long l) {}
   29.40 +
   29.41 +    void m2(Exception... exception) {}
   29.42 +
   29.43 +    void m2(Long l, Exception... exception) {}
   29.44 +}

    30.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    30.2 +++ b/test/tools/javac/T8029569/VarargsAmbiguityCrashTest.out	Mon Dec 23 14:46:25 2013 -0800
    30.3 @@ -0,0 +1,2 @@
    30.4 +VarargsAmbiguityCrashTest.java:33:9: compiler.err.ref.ambiguous: m2, kindname.method, m2(java.lang.Exception...), VarargsAmbiguityCrashTest, kindname.method, m2(java.lang.Long,java.lang.Exception...), VarargsAmbiguityCrashTest
    30.5 +1 error

    31.1 --- a/test/tools/javac/annotations/typeAnnotations/newlocations/Lambda.java	Thu Dec 19 17:24:35 2013 -0800
    31.2 +++ b/test/tools/javac/annotations/typeAnnotations/newlocations/Lambda.java	Mon Dec 23 14:46:25 2013 -0800
    31.3 @@ -23,8 +23,9 @@
    31.4  
    31.5  /*
    31.6   * @test
    31.7 - * @bug 8008077
    31.8 + * @bug 8008077 8029721
    31.9   * @summary new type annotation location: lambda expressions
   31.10 + * javac crash for annotated parameter type of lambda in a field
   31.11   * @compile Lambda.java
   31.12   * @author Werner Dietl
   31.13   */
   31.14 @@ -57,6 +58,14 @@
   31.15      LambdaInt2 getLambda() {
   31.16          return (@TA Object x, @TB Object y) -> { @TA Object l = null; System.out.println("We have: " + (@TB Object) x); };
   31.17      }
   31.18 +
   31.19 +    java.util.function.IntUnaryOperator x = (@TA int y) -> 1;
   31.20 +
   31.21 +    static java.util.function.IntUnaryOperator xx = (@TA int y) -> 1;
   31.22 +
   31.23 +    java.util.function.IntUnaryOperator foo() {
   31.24 +        return (@TA int y) -> 2;
   31.25 +    }
   31.26  }
   31.27  
   31.28  @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})

    32.1 --- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java	Thu Dec 19 17:24:35 2013 -0800
    32.2 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java	Mon Dec 23 14:46:25 2013 -0800
    32.3 @@ -23,8 +23,9 @@
    32.4  
    32.5  /*
    32.6   * @test
    32.7 - * @bug 8008077
    32.8 + * @bug 8008077 8029721
    32.9   * @summary Test population of reference info for lambda expressions
   32.10 + * javac crash for annotated parameter type of lambda in a field
   32.11   * @compile -g Driver.java ReferenceInfoUtil.java Lambda.java
   32.12   * @run main Driver Lambda
   32.13   * @author Werner Dietl
   32.14 @@ -285,4 +286,24 @@
   32.15                  "  }" +
   32.16                  "}";
   32.17      }
   32.18 +
   32.19 +    @TADescriptions({
   32.20 +        @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
   32.21 +            paramIndex = 0)})
   32.22 +    public String lambdaField1() {
   32.23 +        return
   32.24 +            "class Test {" +
   32.25 +                " java.util.function.IntUnaryOperator field = (@TA int y) -> 1;" +
   32.26 +            "}";
   32.27 +    }
   32.28 +
   32.29 +    @TADescriptions({
   32.30 +        @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
   32.31 +            paramIndex = 0)})
   32.32 +    public String lambdaField2() {
   32.33 +        return
   32.34 +            "class Test {" +
   32.35 +                " static java.util.function.IntUnaryOperator field = (@TA int y) -> 1;" +
   32.36 +            "}";
   32.37 +    }
   32.38  }

    33.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    33.2 +++ b/test/tools/javac/lambda/LambdaParenGeneric.java	Mon Dec 23 14:46:25 2013 -0800
    33.3 @@ -0,0 +1,48 @@
    33.4 +/*
    33.5 + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
    33.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    33.7 + *
    33.8 + * This code is free software; you can redistribute it and/or modify it
    33.9 + * under the terms of the GNU General Public License version 2 only, as
   33.10 + * published by the Free Software Foundation.
   33.11 + *
   33.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
   33.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   33.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   33.15 + * version 2 for more details (a copy is included in the LICENSE file that
   33.16 + * accompanied this code).
   33.17 + *
   33.18 + * You should have received a copy of the GNU General Public License version
   33.19 + * 2 along with this work; if not, write to the Free Software Foundation,
   33.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   33.21 + *
   33.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   33.23 + * or visit www.oracle.com if you need additional information or have any
   33.24 + * questions.
   33.25 + */
   33.26 +
   33.27 +/*
   33.28 + * @test
   33.29 + * @bug 8029558
   33.30 + * @summary VerifyError lambda body is parenthesized generic value
   33.31 + * @author  Robert Field
   33.32 + * @run main LambdaParenGeneric
   33.33 + */
   33.34 +
   33.35 +public class LambdaParenGeneric {
   33.36 +
   33.37 +    @FunctionalInterface
   33.38 +    public interface FI {
   33.39 +        Integer apply();
   33.40 +    }
   33.41 +
   33.42 +    public static class Val<A> {
   33.43 +        A value;
   33.44 +        Val(A v) { value = v; }
   33.45 +    }
   33.46 +
   33.47 +    public static void main(String[] args) {
   33.48 +        FI inc = () -> (new Val<Integer>(77).value);
   33.49 +        System.out.println(inc.apply());
   33.50 +    }
   33.51 +}

    34.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    34.2 +++ b/test/tools/javac/lambda/LambdaParenGenericOrig.java	Mon Dec 23 14:46:25 2013 -0800
    34.3 @@ -0,0 +1,49 @@
    34.4 +/*
    34.5 + * Copyright (c) 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.
   34.11 + *
   34.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
   34.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   34.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   34.15 + * version 2 for more details (a copy is included in the LICENSE file that
   34.16 + * accompanied this code).
   34.17 + *
   34.18 + * You should have received a copy of the GNU General Public License version
   34.19 + * 2 along with this work; if not, write to the Free Software Foundation,
   34.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   34.21 + *
   34.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   34.23 + * or visit www.oracle.com if you need additional information or have any
   34.24 + * questions.
   34.25 + */
   34.26 +
   34.27 +/*
   34.28 + * @test
   34.29 + * @bug 8029558
   34.30 + * @summary VerifyError lambda body is parenthesized generic value (originally submitted test)
   34.31 + * @author  Dmitrii Afanasyev
   34.32 + * @run main LambdaParenGenericOrig
   34.33 + */
   34.34 +
   34.35 +public class LambdaParenGenericOrig {
   34.36 +
   34.37 +    @FunctionalInterface
   34.38 +    public static interface Function1<R, A> {
   34.39 +        R apply(A input);
   34.40 +    }
   34.41 +
   34.42 +    @FunctionalInterface
   34.43 +    public static interface Function2<R, A1, A2> {
   34.44 +        R apply(A1 input1, A2 input2);
   34.45 +    }
   34.46 +
   34.47 +    public static void main(String[] args) {
   34.48 +        final Function2<Integer, Integer, Integer> add = (x, y) -> x + y;
   34.49 +        final Function1<Integer, Integer> inc = x -> (add.apply(x, 1));
   34.50 +        System.out.println(inc.apply(0));
   34.51 +    }
   34.52 +}

    35.1 --- a/test/tools/javac/lambda/LambdaScope05.out	Thu Dec 19 17:24:35 2013 -0800
    35.2 +++ b/test/tools/javac/lambda/LambdaScope05.out	Mon Dec 23 14:46:25 2013 -0800
    35.3 @@ -1,5 +1,5 @@
    35.4  LambdaScope05.java:13:47: compiler.err.already.defined.in.clinit: kindname.variable, p, kindname.static.init, kindname.class, LambdaScope05
    35.5 -LambdaScope05.java:14:40: compiler.err.already.defined.in.clinit: kindname.variable, p, kindname.instance.init, kindname.class, LambdaScope05
    35.6 +LambdaScope05.java:14:40: compiler.err.already.defined: kindname.variable, p, kindname.constructor, LambdaScope05()
    35.7  LambdaScope05.java:17:43: compiler.err.already.defined.in.clinit: kindname.variable, p, kindname.static.init, kindname.class, LambdaScope05
    35.8  LambdaScope05.java:21:43: compiler.err.already.defined.in.clinit: kindname.variable, p, kindname.instance.init, kindname.class, LambdaScope05
    35.9  LambdaScope05.java:25:43: compiler.err.already.defined: kindname.variable, p, kindname.method, m_static()

    36.1 --- a/test/tools/javadoc/api/basic/APITest.java	Thu Dec 19 17:24:35 2013 -0800
    36.2 +++ b/test/tools/javadoc/api/basic/APITest.java	Mon Dec 23 14:46:25 2013 -0800
    36.3 @@ -202,12 +202,6 @@
    36.4          "pkg/package-frame.html",
    36.5          "pkg/package-summary.html",
    36.6          "pkg/package-tree.html",
    36.7 -        "resources/background.gif",
    36.8 -        "resources/tab.gif",
    36.9 -        "resources/activetitlebar_end.gif",
   36.10 -        "resources/activetitlebar.gif",
   36.11 -        "resources/titlebar_end.gif",
   36.12 -        "resources/titlebar.gif",
   36.13          "script.js",
   36.14          "stylesheet.css"
   36.15      ));