jdk8-mips64-public/langtools: changeset 2317:30e3dad0ebbd

     1.1 --- a/.hgtags	Tue Dec 24 14:14:23 2013 -0800
     1.2 +++ b/.hgtags	Mon Jan 06 13:39:07 2014 -0800
     1.3 @@ -243,5 +243,6 @@
     1.4  43a80d75d06ed22d6942f25f067587a3be3a129d jdk8-b119
     1.5  b3d7e86a06474fe5100a7b15a95eaa10d41509a6 jdk8-b120
     1.6  afe63d41c699e0e2ee910ef20c41b60603c852a1 jdk8-b121
     1.7 +232b9cf6303aaf451c7000c5f93dfea842e9e9ae jdk8-b122
     1.8  519557cab6d4a7fd77b33226e71f92303090420b jdk8u5-b01
     1.9  9003a59a512e6b764d8a3f805aadc3996a58e5bd jdk8u5-b02

     2.1 --- a/make/Makefile	Tue Dec 24 14:14:23 2013 -0800
     2.2 +++ b/make/Makefile	Mon Jan 06 13:39:07 2014 -0800
     2.3 @@ -1,5 +1,5 @@
     2.4  #
     2.5 -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
     2.6 +# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
     2.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8  #
     2.9  # This code is free software; you can redistribute it and/or modify it

     3.1 --- a/src/share/classes/com/sun/javadoc/AnnotationDesc.java	Tue Dec 24 14:14:23 2013 -0800
     3.2 +++ b/src/share/classes/com/sun/javadoc/AnnotationDesc.java	Mon Jan 06 13:39:07 2014 -0800
     3.3 @@ -1,5 +1,5 @@
     3.4  /*
     3.5 - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
     3.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
     3.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8   *
     3.9   * This code is free software; you can redistribute it and/or modify it

     4.1 --- a/src/share/classes/com/sun/source/doctree/package-info.java	Tue Dec 24 14:14:23 2013 -0800
     4.2 +++ b/src/share/classes/com/sun/source/doctree/package-info.java	Mon Jan 06 13:39:07 2014 -0800
     4.3 @@ -1,5 +1,5 @@
     4.4  /*
     4.5 - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
     4.6 + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
     4.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8   *
     4.9   * This code is free software; you can redistribute it and/or modify it

     5.1 --- a/src/share/classes/com/sun/tools/classfile/AccessFlags.java	Tue Dec 24 14:14:23 2013 -0800
     5.2 +++ b/src/share/classes/com/sun/tools/classfile/AccessFlags.java	Mon Jan 06 13:39:07 2014 -0800
     5.3 @@ -1,5 +1,5 @@
     5.4  /*
     5.5 - * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
     5.6 + * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
     5.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     5.8   *
     5.9   * This code is free software; you can redistribute it and/or modify it

     6.1 --- a/src/share/classes/com/sun/tools/classfile/Dependencies.java	Tue Dec 24 14:14:23 2013 -0800
     6.2 +++ b/src/share/classes/com/sun/tools/classfile/Dependencies.java	Mon Jan 06 13:39:07 2014 -0800
     6.3 @@ -1,5 +1,5 @@
     6.4  /*
     6.5 - * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
     6.6 + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
     6.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     6.8   *
     6.9   * This code is free software; you can redistribute it and/or modify it

     7.1 --- a/src/share/classes/com/sun/tools/classfile/MethodParameters_attribute.java	Tue Dec 24 14:14:23 2013 -0800
     7.2 +++ b/src/share/classes/com/sun/tools/classfile/MethodParameters_attribute.java	Mon Jan 06 13:39:07 2014 -0800
     7.3 @@ -1,5 +1,5 @@
     7.4  /*
     7.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
     7.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
     7.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     7.8   *
     7.9   * This code is free software; you can redistribute it and/or modify it

     8.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java	Tue Dec 24 14:14:23 2013 -0800
     8.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java	Mon Jan 06 13:39:07 2014 -0800
     8.3 @@ -115,12 +115,6 @@
     8.4          boolean nodeprecated = configuration.nodeprecated;
     8.5          performCopy(configuration.helpfile);
     8.6          performCopy(configuration.stylesheetfile);
     8.7 -        copyResourceFile("background.gif");
     8.8 -        copyResourceFile("tab.gif");
     8.9 -        copyResourceFile("titlebar.gif");
    8.10 -        copyResourceFile("titlebar_end.gif");
    8.11 -        copyResourceFile("activetitlebar.gif");
    8.12 -        copyResourceFile("activetitlebar_end.gif");
    8.13          // do early to reduce memory footprint
    8.14          if (configuration.classuse) {
    8.15              ClassUseWriter.generate(configuration, classtree);
    8.16 @@ -314,16 +308,6 @@
    8.17          return docletToStart.configuration.validOptions(options, reporter);
    8.18      }
    8.19  
    8.20 -    /**
    8.21 -     * Copy a file in the resources directory to the destination directory.
    8.22 -     * @param resource   The name of the resource file to copy
    8.23 -     */
    8.24 -    private void copyResourceFile(String resource) {
    8.25 -        DocPath p = DocPaths.RESOURCES.resolve(resource);
    8.26 -        DocFile f = DocFile.createFileForOutput(configuration, p);
    8.27 -        f.copyResource(p, false, false);
    8.28 -    }
    8.29 -
    8.30      private void performCopy(String filename) {
    8.31          if (filename.isEmpty())
    8.32              return;

     9.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Tue Dec 24 14:14:23 2013 -0800
     9.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Mon Jan 06 13:39:07 2014 -0800
     9.3 @@ -1363,7 +1363,7 @@
     9.4              return new ContentBuilder();
     9.5          }
     9.6  
     9.7 -        String seetext = replaceDocRootDir(see.text());
     9.8 +        String seetext = replaceDocRootDir(Util.normalizeNewlines(see.text()));
     9.9  
    9.10          //Check if @see is an href or "string"
    9.11          if (seetext.startsWith("<") || seetext.startsWith("\"")) {

    10.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/LinkOutputImpl.java	Tue Dec 24 14:14:23 2013 -0800
    10.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/LinkOutputImpl.java	Mon Jan 06 13:39:07 2014 -0800
    10.3 @@ -1,5 +1,5 @@
    10.4  /*
    10.5 - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    10.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
    10.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    10.8   *
    10.9   * This code is free software; you can redistribute it and/or modify it

    11.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java	Tue Dec 24 14:14:23 2013 -0800
    11.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java	Mon Jan 06 13:39:07 2014 -0800
    11.3 @@ -1,5 +1,5 @@
    11.4  /*
    11.5 - * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
    11.6 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
    11.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    11.8   *
    11.9   * This code is free software; you can redistribute it and/or modify it

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

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

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

    15.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties	Tue Dec 24 14:14:23 2013 -0800
    15.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties	Mon Jan 06 13:39:07 2014 -0800
    15.3 @@ -134,6 +134,7 @@
    15.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}
    15.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
    15.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
    15.7 +doclet.value_tag_invalid_use=@value\u30BF\u30B0\u306F\u3053\u3053\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
    15.8  doclet.dest_dir_create=\u5B9B\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u4F5C\u6210\u4E2D: "{0}"
    15.9  doclet.in={1}\u306E{0}
   15.10  doclet.Use_Table_Summary=\u8868\u3001{0}\u306E\u30EA\u30B9\u30C8\u304A\u3088\u3073\u8AAC\u660E\u306E\u4F7F\u7528

    16.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties	Tue Dec 24 14:14:23 2013 -0800
    16.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties	Mon Jan 06 13:39:07 2014 -0800
    16.3 @@ -134,6 +134,7 @@
    16.4  doclet.Groupname_already_used=\u5728 -group \u9009\u9879\u4E2D, groupname \u5DF2\u4F7F\u7528: {0}
    16.5  doclet.value_tag_invalid_reference={0} (\u7531 @value \u6807\u8BB0\u5F15\u7528) \u4E3A\u672A\u77E5\u5F15\u7528\u3002
    16.6  doclet.value_tag_invalid_constant=@value \u6807\u8BB0 (\u5F15\u7528{0}) \u53EA\u80FD\u5728\u5E38\u91CF\u4E2D\u4F7F\u7528\u3002
    16.7 +doclet.value_tag_invalid_use=\u6B64\u5904\u4E0D\u80FD\u4F7F\u7528 @value \u6807\u8BB0\u3002
    16.8  doclet.dest_dir_create=\u6B63\u5728\u521B\u5EFA\u76EE\u6807\u76EE\u5F55: "{0}"
    16.9  doclet.in={1}\u4E2D\u7684{0}
   16.10  doclet.Use_Table_Summary=\u4F7F\u7528\u8868, \u5217\u8868{0}\u548C\u89E3\u91CA

    17.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css	Tue Dec 24 14:14:23 2013 -0800
    17.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css	Mon Jan 06 13:39:07 2014 -0800
    17.3 @@ -2,16 +2,19 @@
    17.4  /*
    17.5  Overall document style
    17.6  */
    17.7 +
    17.8 +@import url('resources/fonts/dejavu.css');
    17.9 +
   17.10  body {
   17.11      background-color:#ffffff;
   17.12      color:#353833;
   17.13 -    font-family:Arial, Helvetica, sans-serif;
   17.14 -    font-size:76%;
   17.15 +    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
   17.16 +    font-size:14px;
   17.17      margin:0;
   17.18  }
   17.19  a:link, a:visited {
   17.20      text-decoration:none;
   17.21 -    color:#4c6b87;
   17.22 +    color:#4A6782;
   17.23  }
   17.24  a:hover, a:focus {
   17.25      text-decoration:none;
   17.26 @@ -19,7 +22,7 @@
   17.27  }
   17.28  a:active {
   17.29      text-decoration:none;
   17.30 -    color:#4c6b87;
   17.31 +    color:#4A6782;
   17.32  }
   17.33  a[name] {
   17.34      color:#353833;
   17.35 @@ -29,41 +32,51 @@
   17.36      color:#353833;
   17.37  }
   17.38  pre {
   17.39 -    font-size:1.3em;
   17.40 +    font-family:'DejaVu Sans Mono', monospace;
   17.41 +    font-size:14px;
   17.42  }
   17.43  h1 {
   17.44 -    font-size:1.8em;
   17.45 +    font-size:20px;
   17.46  }
   17.47  h2 {
   17.48 -    font-size:1.5em;
   17.49 +    font-size:18px;
   17.50  }
   17.51  h3 {
   17.52 -    font-size:1.4em;
   17.53 +    font-size:16px;
   17.54 +    font-style:italic;
   17.55  }
   17.56  h4 {
   17.57 -    font-size:1.3em;
   17.58 +    font-size:13px;
   17.59  }
   17.60  h5 {
   17.61 -    font-size:1.2em;
   17.62 +    font-size:12px;
   17.63  }
   17.64  h6 {
   17.65 -    font-size:1.1em;
   17.66 +    font-size:11px;
   17.67  }
   17.68  ul {
   17.69      list-style-type:disc;
   17.70  }
   17.71  code, tt {
   17.72 -    font-size:1.2em;
   17.73 +    font-family:'DejaVu Sans Mono', monospace;
   17.74 +    font-size:14px;
   17.75 +    padding-top:4px;
   17.76 +    margin-top:8px;
   17.77 +    line-height:1.4em;
   17.78  }
   17.79  dt code {
   17.80 -    font-size:1.2em;
   17.81 +    font-family:'DejaVu Sans Mono', monospace;
   17.82 +    font-size:14px;
   17.83 +    padding-top:4px;
   17.84  }
   17.85  table tr td dt code {
   17.86 -    font-size:1.2em;
   17.87 +    font-family:'DejaVu Sans Mono', monospace;
   17.88 +    font-size:14px;
   17.89      vertical-align:top;
   17.90 +    padding-top:4px;
   17.91  }
   17.92  sup {
   17.93 -    font-size:.6em;
   17.94 +    font-size:8px;
   17.95  }
   17.96  /*
   17.97  Document title and Copyright styles
   17.98 @@ -76,10 +89,9 @@
   17.99  .aboutLanguage {
  17.100      float:right;
  17.101      padding:0px 21px;
  17.102 -    font-size:.8em;
  17.103 -    font-style:italic;
  17.104 +    font-size:11px;
  17.105      z-index:200;
  17.106 -    margin-top:-7px;
  17.107 +    margin-top:-9px;
  17.108  }
  17.109  .legalCopy {
  17.110      margin-left:.5em;
  17.111 @@ -93,9 +105,6 @@
  17.112  }
  17.113  .tab {
  17.114      background-color:#0066FF;
  17.115 -    background-image:url(resources/titlebar.gif);
  17.116 -    background-position:left top;
  17.117 -    background-repeat:no-repeat;
  17.118      color:#ffffff;
  17.119      padding:8px;
  17.120      width:5em;
  17.121 @@ -105,17 +114,15 @@
  17.122  Navigation bar styles
  17.123  */
  17.124  .bar {
  17.125 -    background-image:url(resources/background.gif);
  17.126 -    background-repeat:repeat-x;
  17.127 +    background-color:#4D7A97;
  17.128      color:#FFFFFF;
  17.129      padding:.8em .5em .4em .8em;
  17.130      height:auto;/*height:1.8em;*/
  17.131 -    font-size:1em;
  17.132 +    font-size:11px;
  17.133      margin:0;
  17.134  }
  17.135  .topNav {
  17.136 -    background-image:url(resources/background.gif);
  17.137 -    background-repeat:repeat-x;
  17.138 +    background-color:#4D7A97;
  17.139      color:#FFFFFF;
  17.140      float:left;
  17.141      padding:0;
  17.142 @@ -124,11 +131,11 @@
  17.143      height:2.8em;
  17.144      padding-top:10px;
  17.145      overflow:hidden;
  17.146 +    font-size:12px; 
  17.147  }
  17.148  .bottomNav {
  17.149      margin-top:10px;
  17.150 -    background-image:url(resources/background.gif);
  17.151 -    background-repeat:repeat-x;
  17.152 +    background-color:#4D7A97;
  17.153      color:#FFFFFF;
  17.154      float:left;
  17.155      padding:0;
  17.156 @@ -137,18 +144,20 @@
  17.157      height:2.8em;
  17.158      padding-top:10px;
  17.159      overflow:hidden;
  17.160 +    font-size:12px;
  17.161  }
  17.162  .subNav {
  17.163      background-color:#dee3e9;
  17.164 -    border-bottom:1px solid #9eadc0;
  17.165      float:left;
  17.166      width:100%;
  17.167      overflow:hidden;
  17.168 +    font-size:12px;
  17.169  }
  17.170  .subNav div {
  17.171      clear:left;
  17.172      float:left;
  17.173      padding:0 0 5px 6px;
  17.174 +    text-transform:uppercase;
  17.175  }
  17.176  ul.navList, ul.subNavList {
  17.177      float:left;
  17.178 @@ -158,34 +167,34 @@
  17.179  ul.navList li{
  17.180      list-style:none;
  17.181      float:left;
  17.182 -    padding:3px 6px;
  17.183 +    padding: 5px 6px;
  17.184 +    text-transform:uppercase;
  17.185  }
  17.186  ul.subNavList li{
  17.187      list-style:none;
  17.188      float:left;
  17.189 -    font-size:90%;
  17.190  }
  17.191  .topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
  17.192      color:#FFFFFF;
  17.193      text-decoration:none;
  17.194 +    text-transform:uppercase;
  17.195  }
  17.196  .topNav a:hover, .bottomNav a:hover {
  17.197      text-decoration:none;
  17.198      color:#bb7a2a;
  17.199 +    text-transform:uppercase;
  17.200  }
  17.201  .navBarCell1Rev {
  17.202 -    background-image:url(resources/tab.gif);
  17.203 -    background-color:#a88834;
  17.204 -    color:#FFFFFF;
  17.205 +    background-color:#F8981D;
  17.206 +    color:#253441;
  17.207      margin: auto 5px;
  17.208 -    border:1px solid #c9aa44;
  17.209  }
  17.210  .skipNav {
  17.211      position:absolute;
  17.212      top:auto;
  17.213      left:-9999px;
  17.214      overflow:hidden;
  17.215 -    }
  17.216 +}
  17.217  /*
  17.218  Page header and footer styles
  17.219  */
  17.220 @@ -202,7 +211,7 @@
  17.221      margin-right:15px;
  17.222  }
  17.223  .indexHeader h1 {
  17.224 -    font-size:1.3em;
  17.225 +    font-size:13px;
  17.226  }
  17.227  .title {
  17.228      color:#2c4557;
  17.229 @@ -212,7 +221,7 @@
  17.230      margin:5px 0 0 0;
  17.231  }
  17.232  .header ul {
  17.233 -    margin:0 0 25px 0;
  17.234 +    margin:0 0 15px 0;
  17.235      padding:0;
  17.236  }
  17.237  .footer ul {
  17.238 @@ -220,24 +229,22 @@
  17.239  }
  17.240  .header ul li, .footer ul li {
  17.241      list-style:none;
  17.242 -    font-size:1.2em;
  17.243 +    font-size:13px;
  17.244  }
  17.245  /*
  17.246  Heading styles
  17.247  */
  17.248  div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
  17.249      background-color:#dee3e9;
  17.250 -    border-top:1px solid #9eadc0;
  17.251 -    border-bottom:1px solid #9eadc0;
  17.252 +    border:1px solid #d0d9e0;
  17.253      margin:0 0 6px -8px;
  17.254 -    padding:2px 5px;
  17.255 +    padding:7px 5px;
  17.256  }
  17.257  ul.blockList ul.blockList ul.blockList li.blockList h3 {
  17.258      background-color:#dee3e9;
  17.259 -    border-top:1px solid #9eadc0;
  17.260 -    border-bottom:1px solid #9eadc0;
  17.261 +    border:1px solid #d0d9e0;
  17.262      margin:0 0 6px -8px;
  17.263 -    padding:2px 5px;
  17.264 +    padding:7px 5px;
  17.265  }
  17.266  ul.blockList ul.blockList li.blockList h3 {
  17.267      padding:0;
  17.268 @@ -257,10 +264,10 @@
  17.269  .indexContainer {
  17.270      margin:10px;
  17.271      position:relative;
  17.272 -    font-size:1.0em;
  17.273 +    font-size:12px;
  17.274  }
  17.275  .indexContainer h2 {
  17.276 -    font-size:1.1em;
  17.277 +    font-size:13px;
  17.278      padding:0 0 3px 0;
  17.279  }
  17.280  .indexContainer ul {
  17.281 @@ -269,15 +276,18 @@
  17.282  }
  17.283  .indexContainer ul li {
  17.284      list-style:none;
  17.285 +    padding-top:2px;
  17.286  }
  17.287  .contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
  17.288 -    font-size:1.1em;
  17.289 +    font-size:12px;
  17.290      font-weight:bold;
  17.291      margin:10px 0 0 0;
  17.292      color:#4E4E4E;
  17.293  }
  17.294  .contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
  17.295 -    margin:10px 0 10px 20px;
  17.296 +    margin:5px 0 10px 0px;
  17.297 +    font-size:14px;
  17.298 +    font-family:'DejaVu Sans Mono',monospace;
  17.299  }
  17.300  .serializedFormContainer dl.nameValue dt {
  17.301      margin-left:1px;
  17.302 @@ -316,25 +326,24 @@
  17.303  }
  17.304  ul.blockList li.blockList, ul.blockListLast li.blockList {
  17.305      list-style:none;
  17.306 -    margin-bottom:25px;
  17.307 +    margin-bottom:15px;
  17.308 +    line-height:1.4;
  17.309  }
  17.310  ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
  17.311      padding:0px 20px 5px 10px;
  17.312 -    border:1px solid #9eadc0;
  17.313 -    background-color:#f9f9f9;
  17.314 +    border:1px solid #ededed; 
  17.315 +    background-color:#f8f8f8;
  17.316  }
  17.317  ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
  17.318      padding:0 0 5px 8px;
  17.319      background-color:#ffffff;
  17.320 -    border:1px solid #9eadc0;
  17.321 -    border-top:none;
  17.322 +    border:none;
  17.323  }
  17.324  ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
  17.325      margin-left:0;
  17.326      padding-left:0;
  17.327      padding-bottom:15px;
  17.328      border:none;
  17.329 -    border-bottom:1px solid #9eadc0;
  17.330  }
  17.331  ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
  17.332      list-style:none;
  17.333 @@ -349,9 +358,10 @@
  17.334  Table styles
  17.335  */
  17.336  .overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
  17.337 -    border-bottom:1px solid #9eadc0;
  17.338 -    margin:0 0 12px 0px;
  17.339      width:100%;
  17.340 +    border-left:1px solid #EEE; 
  17.341 +    border-right:1px solid #EEE; 
  17.342 +    border-bottom:1px solid #EEE; 
  17.343  }
  17.344  .overviewSummary, .memberSummary  {
  17.345      padding:0px;
  17.346 @@ -361,12 +371,15 @@
  17.347      position:relative;
  17.348      text-align:left;
  17.349      background-repeat:no-repeat;
  17.350 -    color:#FFFFFF;
  17.351 +    color:#253441;
  17.352      font-weight:bold;
  17.353      clear:none;
  17.354      overflow:hidden;
  17.355      padding:0px;
  17.356 +    padding-top:10px;
  17.357 +    padding-left:1px;
  17.358      margin:0px;
  17.359 +    white-space:pre;
  17.360  }
  17.361  .overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
  17.362  .useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
  17.363 @@ -381,89 +394,98 @@
  17.364  .overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
  17.365  .useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
  17.366      white-space:nowrap;
  17.367 -    padding-top:8px;
  17.368 -    padding-left:8px;
  17.369 +    padding-top:5px;
  17.370 +    padding-left:12px;
  17.371 +    padding-right:12px;
  17.372 +    padding-bottom:7px;
  17.373      display:inline-block;
  17.374      float:left;
  17.375 -    background-image:url(resources/titlebar.gif);
  17.376 +    background-color:#F8981D;
  17.377 +    border: none;
  17.378 +    height:16px;
  17.379  }
  17.380  .memberSummary caption span.activeTableTab span {
  17.381      white-space:nowrap;
  17.382 -    padding-top:8px;
  17.383 -    padding-left:8px;
  17.384 +    padding-top:5px;
  17.385 +    padding-left:12px;
  17.386 +    padding-right:12px;
  17.387 +    margin-right:3px;
  17.388      display:inline-block;
  17.389      float:left;
  17.390 -    background-image:url(resources/activetitlebar.gif);
  17.391 +    background-color:#F8981D;
  17.392 +    height:16px;
  17.393  }
  17.394  .memberSummary caption span.tableTab span {
  17.395      white-space:nowrap;
  17.396 -    padding-top:8px;
  17.397 -    padding-left:8px;
  17.398 +    padding-top:5px;
  17.399 +    padding-left:12px;
  17.400 +    padding-right:12px;
  17.401 +    margin-right:3px;
  17.402      display:inline-block;
  17.403      float:left;
  17.404 -    background-image:url(resources/titlebar.gif);
  17.405 +    background-color:#4D7A97;
  17.406 +    height:16px;
  17.407  }
  17.408  .memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
  17.409      padding-top:0px;
  17.410      padding-left:0px;
  17.411 +    padding-right:0px;
  17.412      background-image:none;
  17.413      float:none;
  17.414 -    display:inline-block;
  17.415 +    display:inline;
  17.416  }
  17.417  .overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
  17.418  .useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
  17.419 -    width:10px;
  17.420 -    background-image:url(resources/titlebar_end.gif);
  17.421 -    background-repeat:no-repeat;
  17.422 -    background-position:top right;
  17.423 +    display:none;
  17.424 +    width:5px;
  17.425      position:relative;
  17.426      float:left;
  17.427 +    background-color:#F8981D;
  17.428  }
  17.429  .memberSummary .activeTableTab .tabEnd {
  17.430 -    width:10px;
  17.431 -    margin-right:5px;
  17.432 -    background-image:url(resources/activetitlebar_end.gif);
  17.433 -    background-repeat:no-repeat;
  17.434 -    background-position:top right;
  17.435 -    position:relative;
  17.436 +    display:none;
  17.437 +    width:5px;
  17.438 +    margin-right:3px;
  17.439 +    position:relative; 
  17.440      float:left;
  17.441 +    background-color:#F8981D;
  17.442  }
  17.443  .memberSummary .tableTab .tabEnd {
  17.444 -    width:10px;
  17.445 -    margin-right:5px;
  17.446 -    background-image:url(resources/titlebar_end.gif);
  17.447 -    background-repeat:no-repeat;
  17.448 -    background-position:top right;
  17.449 +    display:none;
  17.450 +    width:5px;
  17.451 +    margin-right:3px;
  17.452      position:relative;
  17.453 +    background-color:#4D7A97;
  17.454      float:left;
  17.455 +
  17.456  }
  17.457  .overviewSummary td, .memberSummary td, .typeSummary td,
  17.458  .useSummary td, .constantsSummary td, .deprecatedSummary td {
  17.459      text-align:left;
  17.460 -    padding:3px 3px 3px 7px;
  17.461 +    padding:0px 0px 12px 10px;
  17.462 +    width:100%;
  17.463  }
  17.464  th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
  17.465  td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
  17.466      vertical-align:top;
  17.467 -    padding-right:3px;
  17.468 +    padding-right:0px;
  17.469 +    padding-top:8px;
  17.470 +    padding-bottom:3px;
  17.471  }
  17.472  th.colFirst, th.colLast, th.colOne, .constantsSummary th {
  17.473      background:#dee3e9;
  17.474 -    border-top:1px solid #9eadc0;
  17.475 -    border-bottom:1px solid #9eadc0;
  17.476      text-align:left;
  17.477 -    padding:3px 3px 3px 7px;
  17.478 +    padding:8px 3px 3px 7px;
  17.479  }
  17.480  td.colFirst, th.colFirst {
  17.481 -    border-left:1px solid #9eadc0;
  17.482      white-space:nowrap;
  17.483 +    font-size:13px;
  17.484  }
  17.485  td.colLast, th.colLast {
  17.486 -    border-right:1px solid #9eadc0;
  17.487 +    font-size:13px;
  17.488  }
  17.489  td.colOne, th.colOne {
  17.490 -    border-right:1px solid #9eadc0;
  17.491 -    border-left:1px solid #9eadc0;
  17.492 +    font-size:13px;
  17.493  }
  17.494  .overviewSummary td.colFirst, .overviewSummary th.colFirst,
  17.495  .overviewSummary td.colOne, .overviewSummary th.colOne,
  17.496 @@ -471,19 +493,19 @@
  17.497  .memberSummary td.colOne, .memberSummary th.colOne,
  17.498  .typeSummary td.colFirst{
  17.499      width:25%;
  17.500 -    vertical-align:middle;
  17.501 +    vertical-align:top;
  17.502  }
  17.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 {
  17.504      font-weight:bold;
  17.505  }
  17.506  .tableSubHeadingColor {
  17.507 -    background-color: #EEEEFF;
  17.508 +    background-color:#EEEEFF;
  17.509  }
  17.510  .altColor {
  17.511 -    background-color:#eeeeef;
  17.512 +    background-color:#FFFFFF;
  17.513  }
  17.514  .rowColor {
  17.515 -    background-color:#ffffff;
  17.516 +    background-color:#EEEEEF;
  17.517  }
  17.518  /*
  17.519  Content styles
  17.520 @@ -498,6 +520,24 @@
  17.521  .docSummary {
  17.522      padding:0;
  17.523  }
  17.524 +
  17.525 +ul.blockList ul.blockList ul.blockList li.blockList h3 {
  17.526 +    font-style:normal;
  17.527 +}
  17.528 +
  17.529 +div.block {
  17.530 +    font-size:14px;
  17.531 +    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
  17.532 +}
  17.533 +
  17.534 +td.colLast div {
  17.535 +    padding-top:0px;
  17.536 +}
  17.537 +
  17.538 +
  17.539 +td.colLast a {
  17.540 +    padding-bottom:3px;
  17.541 +}
  17.542  /*
  17.543  Formatting effect styles
  17.544  */
  17.545 @@ -508,11 +548,12 @@
  17.546  h1.hidden {
  17.547      visibility:hidden;
  17.548      overflow:hidden;
  17.549 -    font-size:.9em;
  17.550 +    font-size:10px;
  17.551  }
  17.552  .block {
  17.553      display:block;
  17.554 -    margin:3px 0 0 0;
  17.555 +    margin:3px 10px 2px 0px;
  17.556 +    color:#474747;
  17.557  }
  17.558  .deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
  17.559  .overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,
  17.560 @@ -522,3 +563,12 @@
  17.561  .deprecationComment, .emphasizedPhrase, .interfaceName {
  17.562      font-style:italic;
  17.563  }
  17.564 +
  17.565 +div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,
  17.566 +div.block div.block span.interfaceName {
  17.567 +    font-style:normal;
  17.568 +}
  17.569 +
  17.570 +div.contentContainer ul.blockList li.blockList h2{
  17.571 +    padding-bottom:0px;
  17.572 +}

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

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

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

    21.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java	Tue Dec 24 14:14:23 2013 -0800
    21.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java	Mon Jan 06 13:39:07 2014 -0800
    21.3 @@ -122,9 +122,7 @@
    21.4      /** The name of the file for the overview frame. */
    21.5      public static final DocPath PROFILE_OVERVIEW_FRAME = DocPath.create("profile-overview-frame.html");
    21.6  
    21.7 -    /** The name of the directory in which resources are generated.
    21.8 -     *  Also the name of the sub-package from which resources are read.
    21.9 -     */
   21.10 +    /** The name of the sub-package from which resources are read. */
   21.11      public static final DocPath RESOURCES = DocPath.create("resources");
   21.12  
   21.13      /** The name of the file for the serialized form info. */

    22.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkOutput.java	Tue Dec 24 14:14:23 2013 -0800
    22.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkOutput.java	Mon Jan 06 13:39:07 2014 -0800
    22.3 @@ -1,5 +1,5 @@
    22.4  /*
    22.5 - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    22.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
    22.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    22.8   *
    22.9   * This code is free software; you can redistribute it and/or modify it

    23.1 --- a/src/share/classes/com/sun/tools/doclint/resources/doclint_ja.properties	Tue Dec 24 14:14:23 2013 -0800
    23.2 +++ b/src/share/classes/com/sun/tools/doclint/resources/doclint_ja.properties	Mon Jan 06 13:39:07 2014 -0800
    23.3 @@ -67,7 +67,10 @@
    23.4  dc.tag.start.unmatched = \u7D42\u4E86\u30BF\u30B0\u304C\u3042\u308A\u307E\u305B\u3093: </{0}>
    23.5  dc.tag.unknown = \u4E0D\u660E\u306A\u30BF\u30B0: {0}
    23.6  dc.text.not.allowed = <{0}>\u8981\u7D20\u3067\u306F\u30C6\u30AD\u30B9\u30C8\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
    23.7 +dc.type.arg.not.allowed = \u578B\u5F15\u6570\u306F\u3053\u3053\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
    23.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
    23.9 +dc.value.not.allowed.here='{@value}'\u306F\u3053\u3053\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
   23.10 +dc.value.not.a.constant=\u5024\u304C\u5B9A\u6570\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u305B\u3093
   23.11  
   23.12  dc.main.ioerror=IO\u30A8\u30E9\u30FC: {0}
   23.13  dc.main.no.files.given=\u30D5\u30A1\u30A4\u30EB\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093

    24.1 --- a/src/share/classes/com/sun/tools/doclint/resources/doclint_zh_CN.properties	Tue Dec 24 14:14:23 2013 -0800
    24.2 +++ b/src/share/classes/com/sun/tools/doclint/resources/doclint_zh_CN.properties	Mon Jan 06 13:39:07 2014 -0800
    24.3 @@ -67,7 +67,10 @@
    24.4  dc.tag.start.unmatched = \u7F3A\u5C11\u7ED3\u675F\u6807\u8BB0: </{0}>
    24.5  dc.tag.unknown = \u672A\u77E5\u6807\u8BB0: {0}
    24.6  dc.text.not.allowed = <{0}> \u5143\u7D20\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u6587\u672C
    24.7 +dc.type.arg.not.allowed = \u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528\u7C7B\u578B\u53C2\u6570
    24.8  dc.unexpected.comment=\u6B64\u5904\u672A\u9884\u671F\u6587\u6863\u6CE8\u91CA
    24.9 +dc.value.not.allowed.here=\u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528 '{@value}'
   24.10 +dc.value.not.a.constant=\u503C\u4E0D\u5F15\u7528\u5E38\u91CF
   24.11  
   24.12  dc.main.ioerror=IO \u9519\u8BEF: {0}
   24.13  dc.main.no.files.given=\u672A\u6307\u5B9A\u6587\u4EF6

    25.1 --- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Tue Dec 24 14:14:23 2013 -0800
    25.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Mon Jan 06 13:39:07 2014 -0800
    25.3 @@ -2590,15 +2590,61 @@
    25.4              }
    25.5          }
    25.6  
    25.7 +        /* Map to hold 'fake' clinit methods. If a lambda is used to initialize a
    25.8 +         * static field and that lambda has type annotations, these annotations will
    25.9 +         * also be stored at these fake clinit methods.
   25.10 +         *
   25.11 +         * LambdaToMethod also use fake clinit methods so they can be reused.
   25.12 +         * Also as LTM is a phase subsequent to attribution, the methods from
   25.13 +         * clinits can be safely removed by LTM to save memory.
   25.14 +         */
   25.15 +        private Map<ClassSymbol, MethodSymbol> clinits = new HashMap<>();
   25.16 +
   25.17 +        public MethodSymbol removeClinit(ClassSymbol sym) {
   25.18 +            return clinits.remove(sym);
   25.19 +        }
   25.20 +
   25.21 +        /* This method returns an environment to be used to attribute a lambda
   25.22 +         * expression.
   25.23 +         *
   25.24 +         * The owner of this environment is a method symbol. If the current owner
   25.25 +         * is not a method, for example if the lambda is used to initialize
   25.26 +         * a field, then if the field is:
   25.27 +         *
   25.28 +         * - an instance field, we use the first constructor.
   25.29 +         * - a static field, we create a fake clinit method.
   25.30 +         */
   25.31          private Env<AttrContext> lambdaEnv(JCLambda that, Env<AttrContext> env) {
   25.32              Env<AttrContext> lambdaEnv;
   25.33              Symbol owner = env.info.scope.owner;
   25.34              if (owner.kind == VAR && owner.owner.kind == TYP) {
   25.35                  //field initializer
   25.36                  lambdaEnv = env.dup(that, env.info.dup(env.info.scope.dupUnshared()));
   25.37 -                lambdaEnv.info.scope.owner =
   25.38 -                    new MethodSymbol((owner.flags() & STATIC) | BLOCK, names.empty, null,
   25.39 -                                     env.info.scope.owner);
   25.40 +                ClassSymbol enclClass = owner.enclClass();
   25.41 +                /* if the field isn't static, then we can get the first constructor
   25.42 +                 * and use it as the owner of the environment. This is what
   25.43 +                 * LTM code is doing to look for type annotations so we are fine.
   25.44 +                 */
   25.45 +                if ((owner.flags() & STATIC) == 0) {
   25.46 +                    for (Symbol s : enclClass.members_field.getElementsByName(names.init)) {
   25.47 +                        lambdaEnv.info.scope.owner = s;
   25.48 +                        break;
   25.49 +                    }
   25.50 +                } else {
   25.51 +                    /* if the field is static then we need to create a fake clinit
   25.52 +                     * method, this method can later be reused by LTM.
   25.53 +                     */
   25.54 +                    MethodSymbol clinit = clinits.get(enclClass);
   25.55 +                    if (clinit == null) {
   25.56 +                        Type clinitType = new MethodType(List.<Type>nil(),
   25.57 +                                syms.voidType, List.<Type>nil(), syms.methodClass);
   25.58 +                        clinit = new MethodSymbol(STATIC | SYNTHETIC | PRIVATE,
   25.59 +                                names.clinit, clinitType, enclClass);
   25.60 +                        clinit.params = List.<VarSymbol>nil();
   25.61 +                        clinits.put(enclClass, clinit);
   25.62 +                    }
   25.63 +                    lambdaEnv.info.scope.owner = clinit;
   25.64 +                }
   25.65              } else {
   25.66                  lambdaEnv = env.dup(that, env.info.dup(env.info.scope.dup()));
   25.67              }

    26.1 --- a/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java	Tue Dec 24 14:14:23 2013 -0800
    26.2 +++ b/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java	Mon Jan 06 13:39:07 2014 -0800
    26.3 @@ -1474,12 +1474,27 @@
    26.4          private Symbol initSym(ClassSymbol csym, long flags) {
    26.5              boolean isStatic = (flags & STATIC) != 0;
    26.6              if (isStatic) {
    26.7 -                //static clinits are generated in Gen - so we need to fake them
    26.8 -                Symbol clinit = clinits.get(csym);
    26.9 +                /* static clinits are generated in Gen, so we need to use a fake
   26.10 +                 * one. Attr creates a fake clinit method while attributing
   26.11 +                 * lambda expressions used as initializers of static fields, so
   26.12 +                 * let's use that one.
   26.13 +                 */
   26.14 +                MethodSymbol clinit = attr.removeClinit(csym);
   26.15 +                if (clinit != null) {
   26.16 +                    clinits.put(csym, clinit);
   26.17 +                    return clinit;
   26.18 +                }
   26.19 +
   26.20 +                /* if no clinit is found at Attr, then let's try at clinits.
   26.21 +                 */
   26.22 +                clinit = (MethodSymbol)clinits.get(csym);
   26.23                  if (clinit == null) {
   26.24 +                    /* no luck, let's create a new one
   26.25 +                     */
   26.26                      clinit = makePrivateSyntheticMethod(STATIC,
   26.27                              names.clinit,
   26.28 -                            new MethodType(List.<Type>nil(), syms.voidType, List.<Type>nil(), syms.methodClass),
   26.29 +                            new MethodType(List.<Type>nil(), syms.voidType,
   26.30 +                                List.<Type>nil(), syms.methodClass),
   26.31                              csym);
   26.32                      clinits.put(csym, clinit);
   26.33                  }

    27.1 --- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Tue Dec 24 14:14:23 2013 -0800
    27.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Mon Jan 06 13:39:07 2014 -0800
    27.3 @@ -1503,7 +1503,7 @@
    27.4              return ambiguityError(m1, m2);
    27.5          case AMBIGUOUS:
    27.6              //check if m1 is more specific than all ambiguous methods in m2
    27.7 -            AmbiguityError e = (AmbiguityError)m2;
    27.8 +            AmbiguityError e = (AmbiguityError)m2.baseSymbol();
    27.9              for (Symbol s : e.ambiguousSyms) {
   27.10                  if (mostSpecific(argtypes, m1, s, env, site, allowBoxing, useVarargs) != m1) {
   27.11                      return e.addAmbiguousSymbol(m1);
   27.12 @@ -3055,7 +3055,7 @@
   27.13          final Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) {
   27.14              Symbol sym = doLookup(env, phase);
   27.15              if (sym.kind == AMBIGUOUS) {
   27.16 -                AmbiguityError a_err = (AmbiguityError)sym;
   27.17 +                AmbiguityError a_err = (AmbiguityError)sym.baseSymbol();
   27.18                  sym = a_err.mergeAbstracts(site);
   27.19              }
   27.20              return sym;
   27.21 @@ -3125,7 +3125,7 @@
   27.22  
   27.23          Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym) {
   27.24              if (sym.kind == AMBIGUOUS) {
   27.25 -                AmbiguityError a_err = (AmbiguityError)sym;
   27.26 +                AmbiguityError a_err = (AmbiguityError)sym.baseSymbol();
   27.27                  sym = a_err.mergeAbstracts(site);
   27.28              }
   27.29              //skip error reporting
   27.30 @@ -3992,7 +3992,7 @@
   27.31  
   27.32          private List<Symbol> flatten(Symbol sym) {
   27.33              if (sym.kind == AMBIGUOUS) {
   27.34 -                return ((AmbiguityError)sym).ambiguousSyms;
   27.35 +                return ((AmbiguityError)sym.baseSymbol()).ambiguousSyms;
   27.36              } else {
   27.37                  return List.of(sym);
   27.38              }

    28.1 --- a/src/share/classes/com/sun/tools/javac/comp/TransTypes.java	Tue Dec 24 14:14:23 2013 -0800
    28.2 +++ b/src/share/classes/com/sun/tools/javac/comp/TransTypes.java	Mon Jan 06 13:39:07 2014 -0800
    28.3 @@ -586,7 +586,7 @@
    28.4          try {
    28.5              currentMethod = null;
    28.6              tree.params = translate(tree.params);
    28.7 -            tree.body = translate(tree.body, null);
    28.8 +            tree.body = translate(tree.body, tree.body.type==null? null : erasure(tree.body.type));
    28.9              tree.type = erasure(tree.type);
   28.10              result = tree;
   28.11          }

    29.1 --- a/src/share/classes/com/sun/tools/javac/file/RegularFileObject.java	Tue Dec 24 14:14:23 2013 -0800
    29.2 +++ b/src/share/classes/com/sun/tools/javac/file/RegularFileObject.java	Mon Jan 06 13:39:07 2014 -0800
    29.3 @@ -1,5 +1,5 @@
    29.4  /*
    29.5 - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
    29.6 + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
    29.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    29.8   *
    29.9   * This code is free software; you can redistribute it and/or modify it

    30.1 --- a/src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java	Tue Dec 24 14:14:23 2013 -0800
    30.2 +++ b/src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java	Mon Jan 06 13:39:07 2014 -0800
    30.3 @@ -1,5 +1,5 @@
    30.4  /*
    30.5 - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
    30.6 + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
    30.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    30.8   *
    30.9   * This code is free software; you can redistribute it and/or modify it

    31.1 --- a/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties	Tue Dec 24 14:14:23 2013 -0800
    31.2 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties	Mon Jan 06 13:39:07 2014 -0800
    31.3 @@ -72,21 +72,21 @@
    31.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
    31.5  
    31.6  # 0: string
    31.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
    31.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
    31.9  
   31.10  # 0: string
   31.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
   31.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
   31.13  
   31.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
   31.15  
   31.16  # 0: type, 1: list of name
   31.17 -compiler.err.annotation.missing.default.value=\u6CE8\u91C8{0}\u306B\u306F\u5C5E\u6027{1}\u306E\u5024\u304C\u3042\u308A\u307E\u305B\u3093
   31.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
   31.19  
   31.20  # 0: type, 1: list of name
   31.21 -compiler.err.annotation.missing.default.value.1=\u6CE8\u91C8{0}\u306B\u306F\u5C5E\u6027{1}\u306E\u5024\u304C\u3042\u308A\u307E\u305B\u3093
   31.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
   31.23  
   31.24  # 0: type
   31.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
   31.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
   31.27  
   31.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
   31.29  
   31.30 @@ -112,7 +112,7 @@
   31.31  # 0: type
   31.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
   31.33  
   31.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
   31.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
   31.36  
   31.37  # 0: statement type
   31.38  compiler.err.bad.initializer={0}\u306E\u4E0D\u6B63\u306A\u521D\u671F\u5316\u5B50
   31.39 @@ -223,62 +223,61 @@
   31.40  # 0: symbol
   31.41  compiler.err.cyclic.inheritance={0}\u3092\u542B\u3080\u7D99\u627F\u304C\u30EB\u30FC\u30D7\u3057\u3066\u3044\u307E\u3059
   31.42  
   31.43 -compiler.err.cyclic.annotation.element=\u6CE8\u91C8\u306E\u8981\u7D20\u30BF\u30A4\u30D7\u304C\u30EB\u30FC\u30D7\u3057\u3066\u3044\u307E\u3059
   31.44 +# 0: symbol
   31.45 +compiler.err.cyclic.annotation.element=\u8981\u7D20{0}\u306E\u578B\u304C\u30EB\u30FC\u30D7\u3057\u3066\u3044\u307E\u3059
   31.46  
   31.47  # 0: unused
   31.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
   31.49  
   31.50  # 0: type
   31.51 -compiler.err.no.superclass={0}\u306B\u306F\u30B9\u30FC\u30D1\u30FC\u30AF\u30E9\u30B9\u304C\u3042\u308A\u307E\u305B\u3093
   31.52 +compiler.err.no.superclass={0}\u306B\u306F\u30B9\u30FC\u30D1\u30FC\u30AF\u30E9\u30B9\u304C\u3042\u308A\u307E\u305B\u3093\u3002
   31.53  
   31.54  # 0: symbol, 1: type, 2: symbol, 3: type, 4: unused
   31.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
   31.56  
   31.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
   31.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
   31.59  
   31.60  # 0: symbol
   31.61  compiler.err.doesnt.exist=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
   31.62  
   31.63 -compiler.err.duplicate.annotation=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059
   31.64 -
   31.65  # 0: type
   31.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
   31.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
   31.68  
   31.69  # 0: name, 1: type
   31.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
   31.71 -
   31.72 -# 0: type, 1: type
   31.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
   31.74 +compiler.err.duplicate.annotation.member.value=\u6CE8\u91C8@{1}\u306B\u91CD\u8907\u3057\u305F\u8981\u7D20''{0}''\u304C\u3042\u308A\u307E\u3059\u3002
   31.75 +
   31.76 +# 0: name, 1: unused
   31.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
   31.78 +
   31.79 +# 0: type, 1: unused
   31.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
   31.81 +
   31.82 +# 0: symbol or type
   31.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
   31.84 +
   31.85 +# 0: type, 1: number
   31.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
   31.87  
   31.88  # 0: type
   31.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
   31.90 -
   31.91 -# 0: symbol or type
   31.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
   31.93 -
   31.94 -# 0: type, 1: number
   31.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
   31.96 -
   31.97 -# 0: type
   31.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
   31.99 -
  31.100 -# 0: symbol type, 1: type, 2: type
  31.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
  31.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
  31.103 +
  31.104 +# 0: symbol type, 1: unused, 2: type
  31.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
  31.106  
  31.107  # 0: symbol or type, 1: symbol
  31.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
  31.109 -
  31.110 -# 0: symbol, 1: type, 2: symbol, 3: type
  31.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
  31.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
  31.113 +
  31.114 +# 0: symbol, 1: unused, 2: symbol, 3: unused
  31.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
  31.116  
  31.117  # 0: symbol, 1: symbol
  31.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
  31.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
  31.120  
  31.121  # 0: symbol, 1: symbol
  31.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
  31.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
  31.124  
  31.125  # 0: symbol, 1: symbol
  31.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
  31.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
  31.128  
  31.129  # 0: symbol
  31.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
  31.131 @@ -408,20 +407,24 @@
  31.132  # 0: number
  31.133  compiler.err.int.number.too.large=\u6574\u6570{0}\u304C\u5927\u304D\u3059\u304E\u307E\u3059
  31.134  
  31.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
  31.136 -
  31.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
  31.138 -
  31.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
  31.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
  31.141 +
  31.142 +# 0: symbol
  31.143 +compiler.err.intf.annotation.cant.have.type.params=\u6CE8\u91C8\u578B{0}\u306F\u6C4E\u7528\u306B\u3067\u304D\u307E\u305B\u3093
  31.144 +
  31.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
  31.146  
  31.147  # 0: symbol, 1: type
  31.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
  31.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
  31.150  
  31.151  compiler.err.intf.expected.here=\u3053\u3053\u306B\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304C\u5FC5\u8981\u3067\u3059
  31.152  
  31.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
  31.154 +
  31.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
  31.156  
  31.157 -compiler.err.invalid.annotation.member.type=\u6CE8\u91C8\u30E1\u30F3\u30D0\u30FC\u306E\u578B\u304C\u4E0D\u6B63\u3067\u3059
  31.158 +# 0: symbol
  31.159 +compiler.err.invalid.annotation.member.type=\u6CE8\u91C8\u578B\u306E\u8981\u7D20{0}\u306E\u578B\u304C\u7121\u52B9\u3067\u3059
  31.160  
  31.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
  31.162  
  31.163 @@ -531,9 +534,6 @@
  31.164  
  31.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
  31.166  
  31.167 -# 0: list of type, 1: message segment
  31.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}
  31.169 -
  31.170  compiler.err.new.not.allowed.in.annotation=''new''\u306F\u6CE8\u91C8\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
  31.171  
  31.172  compiler.err.no.annotation.member={1}\u306E\u6CE8\u91C8\u30E1\u30F3\u30D0\u30FC{0}\u304C\u3042\u308A\u307E\u305B\u3093
  31.173 @@ -998,6 +998,9 @@
  31.174  # 0: symbol
  31.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
  31.176  
  31.177 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol
  31.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
  31.179 +
  31.180  # 0: message segment
  31.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
  31.182  
  31.183 @@ -1215,6 +1218,7 @@
  31.184  # 0: symbol, 1: message segment
  31.185  compiler.err.cant.access={0}\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n{1}
  31.186  
  31.187 +# 0: file name, 1: message segment
  31.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
  31.189  
  31.190  # 0: file name, 1: message segment
  31.191 @@ -1244,6 +1248,12 @@
  31.192  
  31.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
  31.194  
  31.195 +# 0: classfile major version, 1: classfile minor version
  31.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
  31.197 +
  31.198 +# 0: classfile major version, 1: classfile minor version
  31.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
  31.200 +
  31.201  # 0: name
  31.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
  31.203  
  31.204 @@ -1362,9 +1372,6 @@
  31.205  # 0: type, 1: list of type
  31.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}
  31.207  
  31.208 -# 0: list of type
  31.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
  31.210 -
  31.211  # 0: symbol
  31.212  compiler.misc.diamond={0}<>
  31.213  
  31.214 @@ -1374,6 +1381,9 @@
  31.215  # 0: unused
  31.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
  31.217  
  31.218 +# 0: unused
  31.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
  31.220 +
  31.221  # 0: type, 1: list of type
  31.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
  31.223  
  31.224 @@ -1574,6 +1584,8 @@
  31.225  
  31.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)
  31.227  
  31.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)
  31.229 +
  31.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)
  31.231  
  31.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)
  31.233 @@ -1585,11 +1597,12 @@
  31.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
  31.235  
  31.236  # TODO 308: make a better error message
  31.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
  31.238 +# 0: symbol
  31.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}
  31.240  
  31.241  # TODO 308: make a better error message
  31.242 -# 0: unused
  31.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
  31.244 +# 0: list of symbol
  31.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}
  31.246  
  31.247  # 0: type, 1: type
  31.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}
  31.249 @@ -1618,7 +1631,10 @@
  31.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)
  31.251  
  31.252  # 0: string
  31.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)
  31.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)
  31.255 +
  31.256 +# 0: string
  31.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)
  31.258  
  31.259  # 0: string
  31.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)

    32.1 --- a/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties	Tue Dec 24 14:14:23 2013 -0800
    32.2 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties	Mon Jan 06 13:39:07 2014 -0800
    32.3 @@ -72,21 +72,21 @@
    32.4  compiler.err.already.defined.in.clinit=\u5DF2\u5728{3} {4}\u7684{2}\u4E2D\u5B9A\u4E49\u4E86{0} {1}
    32.5  
    32.6  # 0: string
    32.7 -compiler.err.already.defined.single.import=\u5DF2\u5728 single-type \u5BFC\u5165\u4E2D\u5B9A\u4E49{0}
    32.8 +compiler.err.already.defined.single.import={0}\u7684 single-type-import \u5DF2\u5B9A\u4E49\u5177\u6709\u76F8\u540C\u7B80\u540D\u7684\u7C7B\u578B
    32.9  
   32.10  # 0: string
   32.11 -compiler.err.already.defined.static.single.import=\u5DF2\u5728\u9759\u6001 single-type \u5BFC\u5165\u4E2D\u5B9A\u4E49{0}
   32.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
   32.13  
   32.14  compiler.err.already.defined.this.unit=\u5DF2\u5728\u8BE5\u7F16\u8BD1\u5355\u5143\u4E2D\u5B9A\u4E49{0}
   32.15  
   32.16  # 0: type, 1: list of name
   32.17 -compiler.err.annotation.missing.default.value=\u5BF9\u4E8E\u5C5E\u6027{1}, \u6CE8\u91CA{0}\u7F3A\u5C11\u503C
   32.18 +compiler.err.annotation.missing.default.value=\u5BF9\u4E8E\u5143\u7D20 ''{1}'', \u6CE8\u91CA @{0} \u7F3A\u5C11\u9ED8\u8BA4\u503C
   32.19  
   32.20  # 0: type, 1: list of name
   32.21 -compiler.err.annotation.missing.default.value.1=\u5BF9\u4E8E\u5C5E\u6027{1}, \u6CE8\u91CA{0}\u7F3A\u5C11\u503C
   32.22 +compiler.err.annotation.missing.default.value.1=\u5BF9\u4E8E\u5143\u7D20{1}, \u6CE8\u91CA @{0} \u7F3A\u5C11\u9ED8\u8BA4\u503C
   32.23  
   32.24  # 0: type
   32.25 -compiler.err.annotation.not.valid.for.type=\u5BF9\u4E8E\u7C7B\u578B\u4E3A{0}\u7684\u503C, \u6CE8\u91CA\u65E0\u6548
   32.26 +compiler.err.annotation.not.valid.for.type=\u6CE8\u91CA\u5BF9\u4E8E\u7C7B\u578B{0}\u7684\u5143\u7D20\u65E0\u6548
   32.27  
   32.28  compiler.err.annotation.type.not.applicable=\u6CE8\u91CA\u7C7B\u578B\u4E0D\u9002\u7528\u4E8E\u8BE5\u7C7B\u578B\u7684\u58F0\u660E
   32.29  
   32.30 @@ -112,7 +112,7 @@
   32.31  # 0: type
   32.32  compiler.err.array.req.but.found=\u9700\u8981\u6570\u7EC4, \u4F46\u627E\u5230{0}
   32.33  
   32.34 -compiler.err.attribute.value.must.be.constant=\u5C5E\u6027\u503C\u5FC5\u987B\u4E3A\u5E38\u91CF
   32.35 +compiler.err.attribute.value.must.be.constant=\u5143\u7D20\u503C\u5FC5\u987B\u4E3A\u5E38\u91CF\u8868\u8FBE\u5F0F
   32.36  
   32.37  # 0: statement type
   32.38  compiler.err.bad.initializer={0}\u7684\u521D\u59CB\u5316\u7A0B\u5E8F\u9519\u8BEF
   32.39 @@ -223,62 +223,61 @@
   32.40  # 0: symbol
   32.41  compiler.err.cyclic.inheritance=\u6D89\u53CA{0}\u7684\u5FAA\u73AF\u7EE7\u627F
   32.42  
   32.43 -compiler.err.cyclic.annotation.element=\u5FAA\u73AF\u6CE8\u91CA\u5143\u7D20\u7C7B\u578B
   32.44 +# 0: symbol
   32.45 +compiler.err.cyclic.annotation.element=\u5143\u7D20 {0} \u7684\u7C7B\u578B\u4E3A\u5FAA\u73AF
   32.46  
   32.47  # 0: unused
   32.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
   32.49  
   32.50  # 0: type
   32.51 -compiler.err.no.superclass={0}\u4E0D\u5177\u6709\u8D85\u7C7B
   32.52 +compiler.err.no.superclass={0}\u4E0D\u5177\u6709\u8D85\u7C7B\u3002
   32.53  
   32.54  # 0: symbol, 1: type, 2: symbol, 3: type, 4: unused
   32.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
   32.56  
   32.57 -compiler.err.default.allowed.in.intf.annotation.member=\u4EC5\u5728 @interface \u6210\u5458\u4E2D\u5141\u8BB8\u4F7F\u7528\u9ED8\u8BA4\u503C
   32.58 +compiler.err.default.allowed.in.intf.annotation.member=\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E\u4E2D\u4EC5\u5141\u8BB8\u9ED8\u8BA4\u503C
   32.59  
   32.60  # 0: symbol
   32.61  compiler.err.doesnt.exist=\u7A0B\u5E8F\u5305{0}\u4E0D\u5B58\u5728
   32.62  
   32.63 -compiler.err.duplicate.annotation=\u6CE8\u91CA\u91CD\u590D
   32.64 -
   32.65  # 0: type
   32.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
   32.67 +compiler.err.duplicate.annotation.invalid.repeated=\u6CE8\u91CA{0}\u4E0D\u662F\u6709\u6548\u7684\u53EF\u91CD\u590D\u6CE8\u91CA
   32.68  
   32.69  # 0: name, 1: type
   32.70 -compiler.err.duplicate.annotation.member.value={1}\u4E2D\u7684\u6CE8\u91CA\u6210\u5458\u503C{0}\u91CD\u590D
   32.71 -
   32.72 -# 0: type, 1: type
   32.73 -compiler.err.duplicate.annotation.missing.container=\u6CE8\u91CA\u91CD\u590D: {0}\u7684\u58F0\u660E\u6CA1\u6709\u6709\u6548\u7684{1}\u6CE8\u91CA
   32.74 +compiler.err.duplicate.annotation.member.value=\u6CE8\u91CA@{1}\u4E2D\u7684\u5143\u7D20 ''{0}'' \u91CD\u590D\u3002
   32.75 +
   32.76 +# 0: name, 1: unused
   32.77 +compiler.err.duplicate.annotation.missing.container={0} \u4E0D\u662F\u53EF\u91CD\u590D\u7684\u6CE8\u91CA\u7C7B\u578B
   32.78 +
   32.79 +# 0: type, 1: unused
   32.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
   32.81 +
   32.82 +# 0: symbol or type
   32.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
   32.84 +
   32.85 +# 0: type, 1: number
   32.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
   32.87  
   32.88  # 0: type
   32.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
   32.90 -
   32.91 -# 0: symbol or type
   32.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
   32.93 -
   32.94 -# 0: type, 1: number
   32.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
   32.96 -
   32.97 -# 0: type
   32.98 -compiler.err.invalid.repeatable.annotation.invalid.value=\u6CE8\u91CA\u91CD\u590D: {0}\u4E0D\u662F\u6709\u6548\u7684 Repeatable: \u503C\u5143\u7D20\u65E0\u6548
   32.99 -
  32.100 -# 0: symbol type, 1: type, 2: type
  32.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}
  32.102 +compiler.err.invalid.repeatable.annotation.invalid.value={0}\u4E0D\u662F\u6709\u6548\u7684 @Repeatable: \u503C\u5143\u7D20\u65E0\u6548
  32.103 +
  32.104 +# 0: symbol type, 1: unused, 2: type
  32.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
  32.106  
  32.107  # 0: symbol or type, 1: symbol
  32.108 -compiler.err.invalid.repeatable.annotation.elem.nondefault=\u5305\u542B\u6CE8\u91CA{0}\u6CA1\u6709\u5143\u7D20 {1} \u7684\u9ED8\u8BA4\u503C
  32.109 -
  32.110 -# 0: symbol, 1: type, 2: symbol, 3: type
  32.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})
  32.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
  32.113 +
  32.114 +# 0: symbol, 1: unused, 2: symbol, 3: unused
  32.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
  32.116  
  32.117  # 0: symbol, 1: symbol
  32.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
  32.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
  32.120  
  32.121  # 0: symbol, 1: symbol
  32.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
  32.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
  32.124  
  32.125  # 0: symbol, 1: symbol
  32.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
  32.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})
  32.128  
  32.129  # 0: symbol
  32.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
  32.131 @@ -408,20 +407,24 @@
  32.132  # 0: number
  32.133  compiler.err.int.number.too.large=\u8FC7\u5927\u7684\u6574\u6570: {0}
  32.134  
  32.135 -compiler.err.intf.annotation.members.cant.have.params=@interface \u6210\u5458\u4E0D\u80FD\u5E26\u6709\u53C2\u6570
  32.136 -
  32.137 -compiler.err.intf.annotation.cant.have.type.params=@interface \u4E0D\u80FD\u5E26\u6709\u7C7B\u578B\u53C2\u6570
  32.138 -
  32.139 -compiler.err.intf.annotation.members.cant.have.type.params=@interface \u6210\u5458\u4E0D\u80FD\u5E26\u6709\u7C7B\u578B\u53C2\u6570
  32.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
  32.141 +
  32.142 +# 0: symbol
  32.143 +compiler.err.intf.annotation.cant.have.type.params=\u6CE8\u91CA\u7C7B\u578B {0} \u4E0D\u80FD\u4E3A\u6CDB\u578B
  32.144 +
  32.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
  32.146  
  32.147  # 0: symbol, 1: type
  32.148 -compiler.err.intf.annotation.member.clash=@interface \u6210\u5458\u4E0E{1}\u4E2D\u7684\u65B9\u6CD5 ''{0}'' \u51B2\u7A81
  32.149 +compiler.err.intf.annotation.member.clash=\u6CE8\u91CA\u7C7B\u578B{1}\u58F0\u660E\u4E0E\u65B9\u6CD5 {0} \u540C\u540D\u7684\u5143\u7D20
  32.150  
  32.151  compiler.err.intf.expected.here=\u6B64\u5904\u9700\u8981\u63A5\u53E3
  32.152  
  32.153 +compiler.err.intf.or.array.expected.here=\u6B64\u5904\u9884\u671F\u4E3A\u63A5\u53E3\u6216\u6570\u7EC4\u7C7B\u578B
  32.154 +
  32.155  compiler.err.intf.meth.cant.have.body=\u63A5\u53E3\u62BD\u8C61\u65B9\u6CD5\u4E0D\u80FD\u5E26\u6709\u4E3B\u4F53
  32.156  
  32.157 -compiler.err.invalid.annotation.member.type=\u6CE8\u91CA\u6210\u5458\u7684\u7C7B\u578B\u65E0\u6548
  32.158 +# 0: symbol
  32.159 +compiler.err.invalid.annotation.member.type=\u6CE8\u91CA\u7C7B\u578B\u5143\u7D20 {0} \u7684\u7C7B\u578B\u65E0\u6548
  32.160  
  32.161  compiler.err.invalid.binary.number=\u4E8C\u8FDB\u5236\u6570\u5B57\u4E2D\u5FC5\u987B\u5305\u542B\u81F3\u5C11\u4E00\u4E2A\u4E8C\u8FDB\u5236\u6570
  32.162  
  32.163 @@ -531,9 +534,6 @@
  32.164  
  32.165  compiler.misc.incompatible.arg.types.in.mref=\u65B9\u6CD5\u5F15\u7528\u4E2D\u7684\u53C2\u6570\u7C7B\u578B\u4E0D\u517C\u5BB9
  32.166  
  32.167 -# 0: list of type, 1: message segment
  32.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}
  32.169 -
  32.170  compiler.err.new.not.allowed.in.annotation=\u6CE8\u91CA\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528 ''new''
  32.171  
  32.172  compiler.err.no.annotation.member={1}\u4E2D\u6CA1\u6709\u6CE8\u91CA\u6210\u5458{0}
  32.173 @@ -998,6 +998,9 @@
  32.174  # 0: symbol
  32.175  compiler.warn.missing.SVUID=\u53EF\u5E8F\u5217\u5316\u7C7B{0}\u6CA1\u6709 serialVersionUID \u7684\u5B9A\u4E49
  32.176  
  32.177 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol
  32.178 +compiler.warn.potentially.ambiguous.overload={1} \u4E2D\u7684 {0} \u53EF\u80FD\u4E0E {3} \u4E2D\u7684 {2} \u6DF7\u6DC6
  32.179 +
  32.180  # 0: message segment
  32.181  compiler.warn.override.varargs.missing={0}; \u88AB\u8986\u76D6\u7684\u65B9\u6CD5\u6CA1\u6709 ''...''
  32.182  
  32.183 @@ -1215,6 +1218,7 @@
  32.184  # 0: symbol, 1: message segment
  32.185  compiler.err.cant.access=\u65E0\u6CD5\u8BBF\u95EE{0}\n{1}
  32.186  
  32.187 +# 0: file name, 1: message segment
  32.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
  32.189  
  32.190  # 0: file name, 1: message segment
  32.191 @@ -1244,6 +1248,12 @@
  32.192  
  32.193  compiler.misc.class.file.not.found=\u627E\u4E0D\u5230{0}\u7684\u7C7B\u6587\u4EF6
  32.194  
  32.195 +# 0: classfile major version, 1: classfile minor version
  32.196 +compiler.misc.invalid.default.interface=\u5728 {0}.{1} \u7248\u7C7B\u6587\u4EF6\u4E2D\u627E\u5230\u9ED8\u8BA4\u65B9\u6CD5
  32.197 +
  32.198 +# 0: classfile major version, 1: classfile minor version
  32.199 +compiler.misc.invalid.static.interface=\u5728 {0}.{1} \u7248\u7C7B\u6587\u4EF6\u4E2D\u627E\u5230\u9759\u6001\u65B9\u6CD5
  32.200 +
  32.201  # 0: name
  32.202  compiler.misc.file.doesnt.contain.class=\u6587\u4EF6\u4E0D\u5305\u542B\u7C7B{0}
  32.203  
  32.204 @@ -1362,9 +1372,6 @@
  32.205  # 0: type, 1: list of type
  32.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}
  32.207  
  32.208 -# 0: list of type
  32.209 -compiler.misc.cyclic.inference=\u7531\u4E8E\u63A8\u8BBA\u5FAA\u73AF, \u65E0\u6CD5\u5B9E\u4F8B\u5316\u63A8\u8BBA\u53D8\u91CF{0}
  32.210 -
  32.211  # 0: symbol
  32.212  compiler.misc.diamond={0}<>
  32.213  
  32.214 @@ -1374,6 +1381,9 @@
  32.215  # 0: unused
  32.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
  32.217  
  32.218 +# 0: unused
  32.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
  32.220 +
  32.221  # 0: type, 1: list of type
  32.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}
  32.223  
  32.224 @@ -1574,6 +1584,8 @@
  32.225  
  32.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)
  32.227  
  32.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)
  32.229 +
  32.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)
  32.231  
  32.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)
  32.233 @@ -1585,11 +1597,12 @@
  32.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
  32.235  
  32.236  # TODO 308: make a better error message
  32.237 -compiler.err.cant.annotate.static.class=\u65E0\u6CD5\u5BF9\u5C01\u95ED\u9759\u6001\u5D4C\u5957\u7C7B\u8FDB\u884C\u6CE8\u91CA
  32.238 +# 0: symbol
  32.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
  32.240  
  32.241  # TODO 308: make a better error message
  32.242 -# 0: unused
  32.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
  32.244 +# 0: list of symbol
  32.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
  32.246  
  32.247  # 0: type, 1: type
  32.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}
  32.249 @@ -1618,7 +1631,10 @@
  32.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)
  32.251  
  32.252  # 0: string
  32.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)
  32.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)
  32.255 +
  32.256 +# 0: string
  32.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)
  32.258  
  32.259  # 0: string
  32.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)

    33.1 --- a/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java	Tue Dec 24 14:14:23 2013 -0800
    33.2 +++ b/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java	Mon Jan 06 13:39:07 2014 -0800
    33.3 @@ -1,5 +1,5 @@
    33.4  /*
    33.5 - * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
    33.6 + * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
    33.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    33.8   *
    33.9   * This code is free software; you can redistribute it and/or modify it

    34.1 --- a/src/share/classes/com/sun/tools/javac/util/Names.java	Tue Dec 24 14:14:23 2013 -0800
    34.2 +++ b/src/share/classes/com/sun/tools/javac/util/Names.java	Mon Jan 06 13:39:07 2014 -0800
    34.3 @@ -1,5 +1,5 @@
    34.4  /*
    34.5 - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
    34.6 + * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
    34.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    34.8   *
    34.9   * This code is free software; you can redistribute it and/or modify it

    35.1 --- a/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java	Tue Dec 24 14:14:23 2013 -0800
    35.2 +++ b/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java	Mon Jan 06 13:39:07 2014 -0800
    35.3 @@ -1,5 +1,5 @@
    35.4  /*
    35.5 - * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
    35.6 + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
    35.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    35.8   *
    35.9   * This code is free software; you can redistribute it and/or modify it

    36.1 --- a/src/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java	Tue Dec 24 14:14:23 2013 -0800
    36.2 +++ b/src/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java	Mon Jan 06 13:39:07 2014 -0800
    36.3 @@ -1,5 +1,5 @@
    36.4  /*
    36.5 - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    36.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
    36.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    36.8   *
    36.9   * This code is free software; you can redistribute it and/or modify it

    37.1 --- a/src/share/classes/com/sun/tools/javadoc/ConstructorDocImpl.java	Tue Dec 24 14:14:23 2013 -0800
    37.2 +++ b/src/share/classes/com/sun/tools/javadoc/ConstructorDocImpl.java	Mon Jan 06 13:39:07 2014 -0800
    37.3 @@ -1,5 +1,5 @@
    37.4  /*
    37.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    37.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    37.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    37.8   *
    37.9   * This code is free software; you can redistribute it and/or modify it

    38.1 --- a/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties	Tue Dec 24 14:14:23 2013 -0800
    38.2 +++ b/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties	Mon Jan 06 13:39:07 2014 -0800
    38.3 @@ -55,8 +55,8 @@
    38.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)
    38.5  main.opt.d=\  -d <dir>                 \u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
    38.6  main.opt.v=\  -v  -verbose             \u8A73\u7D30\u306A\u51FA\u529B\u3092\u884C\u3046
    38.7 -main.opt.h=\  -h  --help  -?           \u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3059\u308B
    38.8 -main.opt.version=\  -version                 \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u8868\u793A\u3059\u308B
    38.9 +main.opt.h=\  -h  --help  -?           \u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3059\u308B
   38.10 +main.opt.version=\  -version                 \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3059\u308B
   38.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)
   38.12  main.opt.force=\  -force                   \u5E38\u306B\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u3092\u66F8\u304D\u8FBC\u3080
   38.13  main.opt.classpath=\  -classpath <path>        \u30AF\u30E9\u30B9\u3092\u30ED\u30FC\u30C9\u3059\u308B\u30D1\u30B9

    39.1 --- a/src/share/classes/com/sun/tools/jdeps/Archive.java	Tue Dec 24 14:14:23 2013 -0800
    39.2 +++ b/src/share/classes/com/sun/tools/jdeps/Archive.java	Mon Jan 06 13:39:07 2014 -0800
    39.3 @@ -1,5 +1,5 @@
    39.4  /*
    39.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    39.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    39.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    39.8   *
    39.9   * This code is free software; you can redistribute it and/or modify it

    40.1 --- a/src/share/classes/com/sun/tools/jdeps/ClassFileReader.java	Tue Dec 24 14:14:23 2013 -0800
    40.2 +++ b/src/share/classes/com/sun/tools/jdeps/ClassFileReader.java	Mon Jan 06 13:39:07 2014 -0800
    40.3 @@ -1,5 +1,5 @@
    40.4  /*
    40.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    40.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    40.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    40.8   *
    40.9   * This code is free software; you can redistribute it and/or modify it

    41.1 --- a/src/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties	Tue Dec 24 14:14:23 2013 -0800
    41.2 +++ b/src/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties	Mon Jan 06 13:39:07 2014 -0800
    41.3 @@ -1,31 +1,35 @@
    41.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
    41.5  
    41.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:
    41.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:
    41.8  
    41.9  error.prefix=\u30A8\u30E9\u30FC:
   41.10  warn.prefix=\u8B66\u544A:
   41.11  
   41.12 -main.opt.h=\  -h -?      --help                    \u3053\u306E\u4F7F\u7528\u65B9\u6CD5\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3059\u308B
   41.13 +main.opt.h=\  -h -?        -help                 \u3053\u306E\u4F7F\u7528\u65B9\u6CD5\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3057\u307E\u3059
   41.14  
   41.15 -main.opt.version=\             --version                 \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831
   41.16 +main.opt.version=\  -version                           \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831
   41.17  
   41.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"
   41.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)
   41.20  
   41.21 -main.opt.v=\  -v         --verbose                 \u8FFD\u52A0\u60C5\u5831\u3092\u51FA\u529B\u3059\u308B
   41.22 +main.opt.s=\  -s           -summary              \u4F9D\u5B58\u6027\u306E\u8981\u7D04\u306E\u307F\u51FA\u529B\u3057\u307E\u3059
   41.23  
   41.24 -main.opt.s=\  -s         --summary                 \u4F9D\u5B58\u6027\u306E\u8981\u7D04\u306E\u307F\u51FA\u529B\u3059\u308B
   41.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)
   41.26  
   41.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)
   41.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)
   41.29  
   41.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)
   41.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
   41.32  
   41.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
   41.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
   41.35  
   41.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
   41.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
   41.38  
   41.39 -main.opt.R=\  -R         --recursive               \u3059\u3079\u3066\u306E\u4F9D\u5B58\u6027\u3092\u53CD\u5FA9\u7684\u306B\u8D70\u67FB\u3059\u308B
   41.40 +main.opt.R=\  -R           -recursive            \u3059\u3079\u3066\u306E\u4F9D\u5B58\u6027\u3092\u53CD\u5FA9\u7684\u306B\u8D70\u67FB\u3057\u307E\u3059
   41.41  
   41.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
   41.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
   41.44 +
   41.45 +main.opt.dotoutput=\  -dotoutput <dir>                   DOT\u30D5\u30A1\u30A4\u30EB\u51FA\u529B\u306E\u5B9B\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
   41.46 +
   41.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
   41.48  
   41.49  err.unknown.option=\u4E0D\u660E\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
   41.50  err.missing.arg={0}\u306B\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
   41.51 @@ -34,6 +38,7 @@
   41.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}
   41.53  err.option.unsupported={0}\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {1}
   41.54  err.profiles.msg=\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB\u60C5\u5831\u304C\u3042\u308A\u307E\u305B\u3093
   41.55 +err.dot.output.path=\u7121\u52B9\u306A\u30D1\u30B9: {0}
   41.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}
   41.57  warn.split.package=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306F{1} {2}\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059
   41.58

    42.1 --- a/src/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties	Tue Dec 24 14:14:23 2013 -0800
    42.2 +++ b/src/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties	Mon Jan 06 13:39:07 2014 -0800
    42.3 @@ -1,31 +1,35 @@
    42.4  main.usage.summary=\u7528\u6CD5: {0} <options> <classes...>\n\u4F7F\u7528 -h, -? \u6216 --help \u5217\u51FA\u53EF\u80FD\u7684\u9009\u9879
    42.5  
    42.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:
    42.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:
    42.8  
    42.9  error.prefix=\u9519\u8BEF:
   42.10  warn.prefix=\u8B66\u544A:
   42.11  
   42.12 -main.opt.h=\  -h -?      --help                    \u8F93\u51FA\u6B64\u7528\u6CD5\u6D88\u606F
   42.13 +main.opt.h=\  -h -?        -help                 \u8F93\u51FA\u6B64\u7528\u6CD5\u6D88\u606F
   42.14  
   42.15 -main.opt.version=\             --version                 \u7248\u672C\u4FE1\u606F
   42.16 +main.opt.version=\  -version                           \u7248\u672C\u4FE1\u606F
   42.17  
   42.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"
   42.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
   42.20  
   42.21 -main.opt.v=\  -v         --verbose                 \u8F93\u51FA\u9644\u52A0\u4FE1\u606F
   42.22 +main.opt.s=\  -s           -summary              \u4EC5\u8F93\u51FA\u88AB\u4F9D\u8D56\u5BF9\u8C61\u6982\u8981
   42.23  
   42.24 -main.opt.s=\  -s         --summary                 \u4EC5\u8F93\u51FA\u88AB\u4F9D\u8D56\u5BF9\u8C61\u6982\u8981
   42.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)
   42.26  
   42.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)
   42.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)
   42.29  
   42.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)
   42.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
   42.32  
   42.33 -main.opt.P=\  -P         --profile                 \u663E\u793A\u914D\u7F6E\u6587\u4EF6\u6216\u5305\u542B\u7A0B\u5E8F\u5305\u7684\u6587\u4EF6
   42.34 +main.opt.P=\  -P           -profile              \u663E\u793A\u914D\u7F6E\u6587\u4EF6\u6216\u5305\u542B\u7A0B\u5E8F\u5305\u7684\u6587\u4EF6
   42.35  
   42.36 -main.opt.c=\  -c <path>  --classpath=<path>        \u6307\u5B9A\u67E5\u627E\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E
   42.37 +main.opt.cp=\  -cp <path>   -classpath <path>     \u6307\u5B9A\u67E5\u627E\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E
   42.38  
   42.39 -main.opt.R=\  -R         --recursive               \u9012\u5F52\u904D\u5386\u6240\u6709\u88AB\u4F9D\u8D56\u5BF9\u8C61
   42.40 +main.opt.R=\  -R           -recursive            \u9012\u5F52\u904D\u5386\u6240\u6709\u88AB\u4F9D\u8D56\u5BF9\u8C61
   42.41  
   42.42 -main.opt.d=\  -d <depth> --depth=<depth>           \u6307\u5B9A\u8FC7\u6E21\u88AB\u4F9D\u8D56\u5BF9\u8C61\u5206\u6790\u7684\u6DF1\u5EA6
   42.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
   42.44 +
   42.45 +main.opt.dotoutput=\  -dotoutput <dir>                   DOT \u6587\u4EF6\u8F93\u51FA\u7684\u76EE\u6807\u76EE\u5F55
   42.46 +
   42.47 +main.opt.depth=\  -depth=<depth>                     \u6307\u5B9A\u8FC7\u6E21\u88AB\u4F9D\u8D56\u5BF9\u8C61\u5206\u6790\n                                     \u7684\u6DF1\u5EA6
   42.48  
   42.49  err.unknown.option=\u672A\u77E5\u9009\u9879: {0}
   42.50  err.missing.arg=\u6CA1\u6709\u4E3A{0}\u6307\u5B9A\u503C
   42.51 @@ -34,6 +38,7 @@
   42.52  err.option.after.class=\u5FC5\u987B\u5728\u7C7B\u4E4B\u524D\u6307\u5B9A\u9009\u9879: {0}
   42.53  err.option.unsupported=\u4E0D\u652F\u6301{0}: {1}
   42.54  err.profiles.msg=\u6CA1\u6709\u914D\u7F6E\u6587\u4EF6\u4FE1\u606F
   42.55 +err.dot.output.path=\u65E0\u6548\u8DEF\u5F84: {0}
   42.56  warn.invalid.arg=\u7C7B\u540D\u65E0\u6548\u6216\u8DEF\u5F84\u540D\u4E0D\u5B58\u5728: {0}
   42.57  warn.split.package=\u5DF2\u5728{1} {2}\u4E2D\u5B9A\u4E49\u7A0B\u5E8F\u5305{0}
   42.58

    43.1 --- a/src/share/classes/com/sun/tools/sjavac/CleanProperties.java	Tue Dec 24 14:14:23 2013 -0800
    43.2 +++ b/src/share/classes/com/sun/tools/sjavac/CleanProperties.java	Mon Jan 06 13:39:07 2014 -0800
    43.3 @@ -1,5 +1,5 @@
    43.4  /*
    43.5 - * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
    43.6 + * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
    43.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    43.8   *
    43.9   * This code is free software; you can redistribute it and/or modify it

    44.1 --- a/src/share/classes/com/sun/tools/sjavac/CompileChunk.java	Tue Dec 24 14:14:23 2013 -0800
    44.2 +++ b/src/share/classes/com/sun/tools/sjavac/CompileChunk.java	Mon Jan 06 13:39:07 2014 -0800
    44.3 @@ -1,5 +1,5 @@
    44.4  /*
    44.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    44.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    44.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44.8   *
    44.9   * This code is free software; you can redistribute it and/or modify it

    45.1 --- a/src/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java	Tue Dec 24 14:14:23 2013 -0800
    45.2 +++ b/src/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java	Mon Jan 06 13:39:07 2014 -0800
    45.3 @@ -1,5 +1,5 @@
    45.4  /*
    45.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    45.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    45.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    45.8   *
    45.9   * This code is free software; you can redistribute it and/or modify it

    46.1 --- a/src/share/classes/com/sun/tools/sjavac/CompileProperties.java	Tue Dec 24 14:14:23 2013 -0800
    46.2 +++ b/src/share/classes/com/sun/tools/sjavac/CompileProperties.java	Mon Jan 06 13:39:07 2014 -0800
    46.3 @@ -1,5 +1,5 @@
    46.4  /*
    46.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    46.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    46.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    46.8   *
    46.9   * This code is free software; you can redistribute it and/or modify it

    47.1 --- a/src/share/classes/com/sun/tools/sjavac/CopyFile.java	Tue Dec 24 14:14:23 2013 -0800
    47.2 +++ b/src/share/classes/com/sun/tools/sjavac/CopyFile.java	Mon Jan 06 13:39:07 2014 -0800
    47.3 @@ -1,5 +1,5 @@
    47.4  /*
    47.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    47.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    47.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    47.8   *
    47.9   * This code is free software; you can redistribute it and/or modify it

    48.1 --- a/src/share/classes/com/sun/tools/sjavac/JavacState.java	Tue Dec 24 14:14:23 2013 -0800
    48.2 +++ b/src/share/classes/com/sun/tools/sjavac/JavacState.java	Mon Jan 06 13:39:07 2014 -0800
    48.3 @@ -1,5 +1,5 @@
    48.4  /*
    48.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    48.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    48.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    48.8   *
    48.9   * This code is free software; you can redistribute it and/or modify it

    49.1 --- a/src/share/classes/com/sun/tools/sjavac/Log.java	Tue Dec 24 14:14:23 2013 -0800
    49.2 +++ b/src/share/classes/com/sun/tools/sjavac/Log.java	Mon Jan 06 13:39:07 2014 -0800
    49.3 @@ -1,5 +1,5 @@
    49.4  /*
    49.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    49.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    49.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    49.8   *
    49.9   * This code is free software; you can redistribute it and/or modify it

    50.1 --- a/src/share/classes/com/sun/tools/sjavac/Module.java	Tue Dec 24 14:14:23 2013 -0800
    50.2 +++ b/src/share/classes/com/sun/tools/sjavac/Module.java	Mon Jan 06 13:39:07 2014 -0800
    50.3 @@ -1,5 +1,5 @@
    50.4  /*
    50.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    50.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    50.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    50.8   *
    50.9   * This code is free software; you can redistribute it and/or modify it

    51.1 --- a/src/share/classes/com/sun/tools/sjavac/Package.java	Tue Dec 24 14:14:23 2013 -0800
    51.2 +++ b/src/share/classes/com/sun/tools/sjavac/Package.java	Mon Jan 06 13:39:07 2014 -0800
    51.3 @@ -1,5 +1,5 @@
    51.4  /*
    51.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    51.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    51.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    51.8   *
    51.9   * This code is free software; you can redistribute it and/or modify it

    52.1 --- a/src/share/classes/com/sun/tools/sjavac/ProblemException.java	Tue Dec 24 14:14:23 2013 -0800
    52.2 +++ b/src/share/classes/com/sun/tools/sjavac/ProblemException.java	Mon Jan 06 13:39:07 2014 -0800
    52.3 @@ -1,5 +1,5 @@
    52.4  /*
    52.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    52.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    52.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    52.8   *
    52.9   * This code is free software; you can redistribute it and/or modify it

    53.1 --- a/src/share/classes/com/sun/tools/sjavac/Source.java	Tue Dec 24 14:14:23 2013 -0800
    53.2 +++ b/src/share/classes/com/sun/tools/sjavac/Source.java	Mon Jan 06 13:39:07 2014 -0800
    53.3 @@ -1,5 +1,5 @@
    53.4  /*
    53.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    53.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    53.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    53.8   *
    53.9   * This code is free software; you can redistribute it and/or modify it

    54.1 --- a/src/share/classes/com/sun/tools/sjavac/Transformer.java	Tue Dec 24 14:14:23 2013 -0800
    54.2 +++ b/src/share/classes/com/sun/tools/sjavac/Transformer.java	Mon Jan 06 13:39:07 2014 -0800
    54.3 @@ -1,5 +1,5 @@
    54.4  /*
    54.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    54.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    54.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    54.8   *
    54.9   * This code is free software; you can redistribute it and/or modify it

    55.1 --- a/src/share/classes/com/sun/tools/sjavac/Util.java	Tue Dec 24 14:14:23 2013 -0800
    55.2 +++ b/src/share/classes/com/sun/tools/sjavac/Util.java	Mon Jan 06 13:39:07 2014 -0800
    55.3 @@ -1,5 +1,5 @@
    55.4  /*
    55.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    55.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    55.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55.8   *
    55.9   * This code is free software; you can redistribute it and/or modify it

    56.1 --- a/src/share/classes/com/sun/tools/sjavac/comp/JavaCompilerWithDeps.java	Tue Dec 24 14:14:23 2013 -0800
    56.2 +++ b/src/share/classes/com/sun/tools/sjavac/comp/JavaCompilerWithDeps.java	Mon Jan 06 13:39:07 2014 -0800
    56.3 @@ -1,5 +1,5 @@
    56.4  /*
    56.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    56.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    56.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    56.8   *
    56.9   * This code is free software; you can redistribute it and/or modify it

    57.1 --- a/src/share/classes/com/sun/tools/sjavac/comp/PubapiVisitor.java	Tue Dec 24 14:14:23 2013 -0800
    57.2 +++ b/src/share/classes/com/sun/tools/sjavac/comp/PubapiVisitor.java	Mon Jan 06 13:39:07 2014 -0800
    57.3 @@ -1,5 +1,5 @@
    57.4  /*
    57.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
    57.6 + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
    57.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    57.8   *
    57.9   * This code is free software; you can redistribute it and/or modify it

    58.1 --- a/src/share/classes/com/sun/tools/sjavac/comp/ResolveWithDeps.java	Tue Dec 24 14:14:23 2013 -0800
    58.2 +++ b/src/share/classes/com/sun/tools/sjavac/comp/ResolveWithDeps.java	Mon Jan 06 13:39:07 2014 -0800
    58.3 @@ -1,5 +1,5 @@
    58.4  /*
    58.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    58.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    58.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    58.8   *
    58.9   * This code is free software; you can redistribute it and/or modify it

    59.1 --- a/src/share/classes/com/sun/tools/sjavac/comp/SmartFileManager.java	Tue Dec 24 14:14:23 2013 -0800
    59.2 +++ b/src/share/classes/com/sun/tools/sjavac/comp/SmartFileManager.java	Mon Jan 06 13:39:07 2014 -0800
    59.3 @@ -1,5 +1,5 @@
    59.4  /*
    59.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    59.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    59.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    59.8   *
    59.9   * This code is free software; you can redistribute it and/or modify it

    60.1 --- a/src/share/classes/com/sun/tools/sjavac/comp/SmartFileObject.java	Tue Dec 24 14:14:23 2013 -0800
    60.2 +++ b/src/share/classes/com/sun/tools/sjavac/comp/SmartFileObject.java	Mon Jan 06 13:39:07 2014 -0800
    60.3 @@ -1,5 +1,5 @@
    60.4  /*
    60.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    60.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    60.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    60.8   *
    60.9   * This code is free software; you can redistribute it and/or modify it

    61.1 --- a/src/share/classes/com/sun/tools/sjavac/comp/SmartWriter.java	Tue Dec 24 14:14:23 2013 -0800
    61.2 +++ b/src/share/classes/com/sun/tools/sjavac/comp/SmartWriter.java	Mon Jan 06 13:39:07 2014 -0800
    61.3 @@ -1,5 +1,5 @@
    61.4  /*
    61.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    61.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    61.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    61.8   *
    61.9   * This code is free software; you can redistribute it and/or modify it

    62.1 --- a/src/share/classes/com/sun/tools/sjavac/server/CompilerPool.java	Tue Dec 24 14:14:23 2013 -0800
    62.2 +++ b/src/share/classes/com/sun/tools/sjavac/server/CompilerPool.java	Mon Jan 06 13:39:07 2014 -0800
    62.3 @@ -1,5 +1,5 @@
    62.4  /*
    62.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    62.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    62.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    62.8   *
    62.9   * This code is free software; you can redistribute it and/or modify it

    63.1 --- a/src/share/classes/com/sun/tools/sjavac/server/PortFile.java	Tue Dec 24 14:14:23 2013 -0800
    63.2 +++ b/src/share/classes/com/sun/tools/sjavac/server/PortFile.java	Mon Jan 06 13:39:07 2014 -0800
    63.3 @@ -1,5 +1,5 @@
    63.4  /*
    63.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    63.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    63.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    63.8   *
    63.9   * This code is free software; you can redistribute it and/or modify it

    64.1 --- a/src/share/classes/com/sun/tools/sjavac/server/SysInfo.java	Tue Dec 24 14:14:23 2013 -0800
    64.2 +++ b/src/share/classes/com/sun/tools/sjavac/server/SysInfo.java	Mon Jan 06 13:39:07 2014 -0800
    64.3 @@ -1,5 +1,5 @@
    64.4  /*
    64.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    64.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    64.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    64.8   *
    64.9   * This code is free software; you can redistribute it and/or modify it

    65.1 --- a/src/share/classes/javax/lang/model/element/TypeElement.java	Tue Dec 24 14:14:23 2013 -0800
    65.2 +++ b/src/share/classes/javax/lang/model/element/TypeElement.java	Mon Jan 06 13:39:07 2014 -0800
    65.3 @@ -1,5 +1,5 @@
    65.4  /*
    65.5 - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
    65.6 + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
    65.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    65.8   *
    65.9   * This code is free software; you can redistribute it and/or modify it

    66.1 --- a/src/share/classes/javax/lang/model/element/VariableElement.java	Tue Dec 24 14:14:23 2013 -0800
    66.2 +++ b/src/share/classes/javax/lang/model/element/VariableElement.java	Mon Jan 06 13:39:07 2014 -0800
    66.3 @@ -1,5 +1,5 @@
    66.4  /*
    66.5 - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
    66.6 + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
    66.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    66.8   *
    66.9   * This code is free software; you can redistribute it and/or modify it

    67.1 --- a/src/share/classes/javax/lang/model/element/package-info.java	Tue Dec 24 14:14:23 2013 -0800
    67.2 +++ b/src/share/classes/javax/lang/model/element/package-info.java	Mon Jan 06 13:39:07 2014 -0800
    67.3 @@ -1,5 +1,5 @@
    67.4  /*
    67.5 - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
    67.6 + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
    67.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    67.8   *
    67.9   * This code is free software; you can redistribute it and/or modify it

    68.1 --- a/src/share/classes/javax/lang/model/type/IntersectionType.java	Tue Dec 24 14:14:23 2013 -0800
    68.2 +++ b/src/share/classes/javax/lang/model/type/IntersectionType.java	Mon Jan 06 13:39:07 2014 -0800
    68.3 @@ -35,10 +35,12 @@
    68.4   * {@code <T extends Number & Runnable>} is an (implicit) intersection
    68.5   * type.  As of {@link javax.lang.model.SourceVersion#RELEASE_8
    68.6   * RELEASE_8}, this is represented by an {@code IntersectionType} with
    68.7 - * {@code Number} and {@code Runnable} as its bounds.  Also as of the
    68.8 - * {@link javax.lang.model.SourceVersion#RELEASE_8 RELEASE_8},
    68.9 - * intersection types can explicitly appear as the target type of a
   68.10 - * cast expression.
   68.11 + * {@code Number} and {@code Runnable} as its bounds.
   68.12 + *
   68.13 + * @implNote Also as of {@link
   68.14 + * javax.lang.model.SourceVersion#RELEASE_8 RELEASE_8}, in the
   68.15 + * reference implementation an {@code IntersectionType} is used to
   68.16 + * model the explicit target type of a cast expression.
   68.17   *
   68.18   * @since 1.8
   68.19   */

    69.1 --- a/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java	Tue Dec 24 14:14:23 2013 -0800
    69.2 +++ b/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java	Mon Jan 06 13:39:07 2014 -0800
    69.3 @@ -1,5 +1,5 @@
    69.4  /*
    69.5 - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
    69.6 + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
    69.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    69.8   *
    69.9   * This code is free software; you can redistribute it and/or modify it

    70.1 --- a/src/share/classes/javax/lang/model/util/Types.java	Tue Dec 24 14:14:23 2013 -0800
    70.2 +++ b/src/share/classes/javax/lang/model/util/Types.java	Mon Jan 06 13:39:07 2014 -0800
    70.3 @@ -60,13 +60,6 @@
    70.4      /**
    70.5       * Tests whether two {@code TypeMirror} objects represent the same type.
    70.6       *
    70.7 -     * <p>Since annotations are only meta-data associated with a type,
    70.8 -     * the set of annotations on either argument is <em>not</em> taken
    70.9 -     * into account when computing whether or not two {@code
   70.10 -     * TypeMirror} objects are the same type. In particular, two
   70.11 -     * {@code TypeMirror} objects can have different annotations and
   70.12 -     * still be considered the same.
   70.13 -     *
   70.14       * <p>Caveat: if either of the arguments to this method represents a
   70.15       * wildcard, this method will return false.  As a consequence, a wildcard
   70.16       * is not the same type as itself.  This might be surprising at first,
   70.17 @@ -77,6 +70,13 @@
   70.18       *   {@code list.add(list.get(0));}
   70.19       * </pre>
   70.20       *
   70.21 +     * <p>Since annotations are only meta-data associated with a type,
   70.22 +     * the set of annotations on either argument is <em>not</em> taken
   70.23 +     * into account when computing whether or not two {@code
   70.24 +     * TypeMirror} objects are the same type. In particular, two
   70.25 +     * {@code TypeMirror} objects can have different annotations and
   70.26 +     * still be considered the same.
   70.27 +     *
   70.28       * @param t1  the first type
   70.29       * @param t2  the second type
   70.30       * @return {@code true} if and only if the two types are the same

    71.1 --- a/test/com/sun/javadoc/AccessH1/AccessH1.java	Tue Dec 24 14:14:23 2013 -0800
    71.2 +++ b/test/com/sun/javadoc/AccessH1/AccessH1.java	Mon Jan 06 13:39:07 2014 -0800
    71.3 @@ -1,5 +1,5 @@
    71.4  /*
    71.5 - * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
    71.6 + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
    71.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    71.8   *
    71.9   * This code is free software; you can redistribute it and/or modify it
   71.10 @@ -23,7 +23,7 @@
   71.11  
   71.12  /*
   71.13   * @test
   71.14 - * @bug 4636667 7052425
   71.15 + * @bug 4636667 7052425 8016549
   71.16   * @summary  Use <H1, <H2>, and <H3> in proper sequence for accessibility
   71.17   * @author dkramer
   71.18   * @run main AccessH1
   71.19 @@ -85,7 +85,7 @@
   71.20      private static final String[][] testArray = {
   71.21          // Test the style sheet
   71.22          {
   71.23 -            "h1 {" + LS + "    font-size:1.8em;" + LS +
   71.24 +            "h1 {" + LS + "    font-size:20px;" + LS +
   71.25              "}",
   71.26              TMPDEST_DIR1 + "stylesheet.css"
   71.27          },

    72.1 --- a/test/com/sun/javadoc/testAbstractMethod/TestAbstractMethod.java	Tue Dec 24 14:14:23 2013 -0800
    72.2 +++ b/test/com/sun/javadoc/testAbstractMethod/TestAbstractMethod.java	Mon Jan 06 13:39:07 2014 -0800
    72.3 @@ -1,5 +1,5 @@
    72.4  /*
    72.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    72.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    72.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    72.8   *
    72.9   * This code is free software; you can redistribute it and/or modify it

    73.1 --- a/test/com/sun/javadoc/testAbstractMethod/pkg/A.java	Tue Dec 24 14:14:23 2013 -0800
    73.2 +++ b/test/com/sun/javadoc/testAbstractMethod/pkg/A.java	Mon Jan 06 13:39:07 2014 -0800
    73.3 @@ -1,5 +1,5 @@
    73.4  /*
    73.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    73.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    73.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    73.8   *
    73.9   * This code is free software; you can redistribute it and/or modify it

    74.1 --- a/test/com/sun/javadoc/testAbstractMethod/pkg/B.java	Tue Dec 24 14:14:23 2013 -0800
    74.2 +++ b/test/com/sun/javadoc/testAbstractMethod/pkg/B.java	Mon Jan 06 13:39:07 2014 -0800
    74.3 @@ -1,5 +1,5 @@
    74.4  /*
    74.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    74.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    74.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    74.8   *
    74.9   * This code is free software; you can redistribute it and/or modify it

    75.1 --- a/test/com/sun/javadoc/testAbstractMethod/pkg/C.java	Tue Dec 24 14:14:23 2013 -0800
    75.2 +++ b/test/com/sun/javadoc/testAbstractMethod/pkg/C.java	Mon Jan 06 13:39:07 2014 -0800
    75.3 @@ -1,5 +1,5 @@
    75.4  /*
    75.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    75.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    75.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    75.8   *
    75.9   * This code is free software; you can redistribute it and/or modify it

    76.1 --- a/test/com/sun/javadoc/testAnnotationOptional/pkg/AnnotationOptional.java	Tue Dec 24 14:14:23 2013 -0800
    76.2 +++ b/test/com/sun/javadoc/testAnnotationOptional/pkg/AnnotationOptional.java	Mon Jan 06 13:39:07 2014 -0800
    76.3 @@ -1,5 +1,5 @@
    76.4  /*
    76.5 - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
    76.6 + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
    76.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    76.8   *
    76.9   * This code is free software; you can redistribute it and/or modify it

    77.1 --- a/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java	Tue Dec 24 14:14:23 2013 -0800
    77.2 +++ b/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java	Mon Jan 06 13:39:07 2014 -0800
    77.3 @@ -23,7 +23,7 @@
    77.4  
    77.5  /*
    77.6   * @test
    77.7 - * @bug 6553182 8025416
    77.8 + * @bug 6553182 8025416 8029504
    77.9   * @summary This test verifies the -Xdocrootparent option.
   77.10   * @author Bhavesh Patel
   77.11   * @library ../lib/

    78.1 --- a/test/com/sun/javadoc/testDocRootLink/pkg1/C1.java	Tue Dec 24 14:14:23 2013 -0800
    78.2 +++ b/test/com/sun/javadoc/testDocRootLink/pkg1/C1.java	Mon Jan 06 13:39:07 2014 -0800
    78.3 @@ -1,5 +1,5 @@
    78.4  /*
    78.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
    78.6 + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
    78.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    78.8   *
    78.9   * This code is free software; you can redistribute it and/or modify it

    79.1 --- a/test/com/sun/javadoc/testDocRootLink/pkg2/C2.java	Tue Dec 24 14:14:23 2013 -0800
    79.2 +++ b/test/com/sun/javadoc/testDocRootLink/pkg2/C2.java	Mon Jan 06 13:39:07 2014 -0800
    79.3 @@ -1,5 +1,5 @@
    79.4  /*
    79.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
    79.6 + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
    79.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    79.8   *
    79.9   * This code is free software; you can redistribute it and/or modify it

    80.1 --- a/test/com/sun/javadoc/testLegacyTaglet/C.java	Tue Dec 24 14:14:23 2013 -0800
    80.2 +++ b/test/com/sun/javadoc/testLegacyTaglet/C.java	Mon Jan 06 13:39:07 2014 -0800
    80.3 @@ -1,5 +1,5 @@
    80.4  /*
    80.5 - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
    80.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
    80.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    80.8   *
    80.9   * This code is free software; you can redistribute it and/or modify it

    81.1 --- a/test/com/sun/javadoc/testNavigation/pkg/A.java	Tue Dec 24 14:14:23 2013 -0800
    81.2 +++ b/test/com/sun/javadoc/testNavigation/pkg/A.java	Mon Jan 06 13:39:07 2014 -0800
    81.3 @@ -1,5 +1,5 @@
    81.4  /*
    81.5 - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
    81.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
    81.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    81.8   *
    81.9   * This code is free software; you can redistribute it and/or modify it

    82.1 --- a/test/com/sun/javadoc/testNavigation/pkg/C.java	Tue Dec 24 14:14:23 2013 -0800
    82.2 +++ b/test/com/sun/javadoc/testNavigation/pkg/C.java	Mon Jan 06 13:39:07 2014 -0800
    82.3 @@ -1,5 +1,5 @@
    82.4  /*
    82.5 - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
    82.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
    82.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    82.8   *
    82.9   * This code is free software; you can redistribute it and/or modify it

    83.1 --- a/test/com/sun/javadoc/testNavigation/pkg/E.java	Tue Dec 24 14:14:23 2013 -0800
    83.2 +++ b/test/com/sun/javadoc/testNavigation/pkg/E.java	Mon Jan 06 13:39:07 2014 -0800
    83.3 @@ -1,5 +1,5 @@
    83.4  /*
    83.5 - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
    83.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
    83.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    83.8   *
    83.9   * This code is free software; you can redistribute it and/or modify it

    84.1 --- a/test/com/sun/javadoc/testNavigation/pkg/I.java	Tue Dec 24 14:14:23 2013 -0800
    84.2 +++ b/test/com/sun/javadoc/testNavigation/pkg/I.java	Mon Jan 06 13:39:07 2014 -0800
    84.3 @@ -1,5 +1,5 @@
    84.4  /*
    84.5 - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
    84.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
    84.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    84.8   *
    84.9   * This code is free software; you can redistribute it and/or modify it

    85.1 --- a/test/com/sun/javadoc/testRepeatedAnnotations/pkg/C.java	Tue Dec 24 14:14:23 2013 -0800
    85.2 +++ b/test/com/sun/javadoc/testRepeatedAnnotations/pkg/C.java	Mon Jan 06 13:39:07 2014 -0800
    85.3 @@ -1,5 +1,5 @@
    85.4  /*
    85.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    85.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    85.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    85.8   *
    85.9   * This code is free software; you can redistribute it and/or modify it

    86.1 --- a/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContaineeRegDoc.java	Tue Dec 24 14:14:23 2013 -0800
    86.2 +++ b/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContaineeRegDoc.java	Mon Jan 06 13:39:07 2014 -0800
    86.3 @@ -1,5 +1,5 @@
    86.4  /*
    86.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    86.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    86.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    86.8   *
    86.9   * This code is free software; you can redistribute it and/or modify it

    87.1 --- a/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContainerRegDoc.java	Tue Dec 24 14:14:23 2013 -0800
    87.2 +++ b/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContainerRegDoc.java	Mon Jan 06 13:39:07 2014 -0800
    87.3 @@ -1,5 +1,5 @@
    87.4  /*
    87.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    87.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    87.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    87.8   *
    87.9   * This code is free software; you can redistribute it and/or modify it

    88.1 --- a/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContainerRegNotDoc.java	Tue Dec 24 14:14:23 2013 -0800
    88.2 +++ b/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContainerRegNotDoc.java	Mon Jan 06 13:39:07 2014 -0800
    88.3 @@ -1,5 +1,5 @@
    88.4  /*
    88.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    88.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    88.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    88.8   *
    88.9   * This code is free software; you can redistribute it and/or modify it

    89.1 --- a/test/com/sun/javadoc/testRepeatedAnnotations/pkg/D.java	Tue Dec 24 14:14:23 2013 -0800
    89.2 +++ b/test/com/sun/javadoc/testRepeatedAnnotations/pkg/D.java	Mon Jan 06 13:39:07 2014 -0800
    89.3 @@ -1,5 +1,5 @@
    89.4  /*
    89.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    89.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    89.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    89.8   *
    89.9   * This code is free software; you can redistribute it and/or modify it

    90.1 --- a/test/com/sun/javadoc/testRepeatedAnnotations/pkg/NonSynthDocContainer.java	Tue Dec 24 14:14:23 2013 -0800
    90.2 +++ b/test/com/sun/javadoc/testRepeatedAnnotations/pkg/NonSynthDocContainer.java	Mon Jan 06 13:39:07 2014 -0800
    90.3 @@ -1,5 +1,5 @@
    90.4  /*
    90.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    90.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    90.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    90.8   *
    90.9   * This code is free software; you can redistribute it and/or modify it

    91.1 --- a/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegArryDoc.java	Tue Dec 24 14:14:23 2013 -0800
    91.2 +++ b/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegArryDoc.java	Mon Jan 06 13:39:07 2014 -0800
    91.3 @@ -1,5 +1,5 @@
    91.4  /*
    91.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    91.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    91.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    91.8   *
    91.9   * This code is free software; you can redistribute it and/or modify it

    92.1 --- a/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContaineeDoc.java	Tue Dec 24 14:14:23 2013 -0800
    92.2 +++ b/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContaineeDoc.java	Mon Jan 06 13:39:07 2014 -0800
    92.3 @@ -1,5 +1,5 @@
    92.4  /*
    92.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    92.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    92.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    92.8   *
    92.9   * This code is free software; you can redistribute it and/or modify it

    93.1 --- a/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContaineeNotDoc.java	Tue Dec 24 14:14:23 2013 -0800
    93.2 +++ b/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContaineeNotDoc.java	Mon Jan 06 13:39:07 2014 -0800
    93.3 @@ -1,5 +1,5 @@
    93.4  /*
    93.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    93.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    93.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    93.8   *
    93.9   * This code is free software; you can redistribute it and/or modify it

    94.1 --- a/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContainerDoc.java	Tue Dec 24 14:14:23 2013 -0800
    94.2 +++ b/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContainerDoc.java	Mon Jan 06 13:39:07 2014 -0800
    94.3 @@ -1,5 +1,5 @@
    94.4  /*
    94.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    94.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    94.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    94.8   *
    94.9   * This code is free software; you can redistribute it and/or modify it

    95.1 --- a/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContainerNotDoc.java	Tue Dec 24 14:14:23 2013 -0800
    95.2 +++ b/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContainerNotDoc.java	Mon Jan 06 13:39:07 2014 -0800
    95.3 @@ -1,5 +1,5 @@
    95.4  /*
    95.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    95.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    95.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    95.8   *
    95.9   * This code is free software; you can redistribute it and/or modify it

    96.1 --- a/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegDoc.java	Tue Dec 24 14:14:23 2013 -0800
    96.2 +++ b/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegDoc.java	Mon Jan 06 13:39:07 2014 -0800
    96.3 @@ -1,5 +1,5 @@
    96.4  /*
    96.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    96.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    96.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    96.8   *
    96.9   * This code is free software; you can redistribute it and/or modify it

    97.1 --- a/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/C.java	Tue Dec 24 14:14:23 2013 -0800
    97.2 +++ b/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/C.java	Mon Jan 06 13:39:07 2014 -0800
    97.3 @@ -1,5 +1,5 @@
    97.4  /*
    97.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    97.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    97.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    97.8   *
    97.9   * This code is free software; you can redistribute it and/or modify it

    98.1 --- a/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContaineeNotDoc.java	Tue Dec 24 14:14:23 2013 -0800
    98.2 +++ b/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContaineeNotDoc.java	Mon Jan 06 13:39:07 2014 -0800
    98.3 @@ -1,5 +1,5 @@
    98.4  /*
    98.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    98.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    98.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    98.8   *
    98.9   * This code is free software; you can redistribute it and/or modify it

    99.1 --- a/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContainerValDoc.java	Tue Dec 24 14:14:23 2013 -0800
    99.2 +++ b/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContainerValDoc.java	Mon Jan 06 13:39:07 2014 -0800
    99.3 @@ -1,5 +1,5 @@
    99.4  /*
    99.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    99.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    99.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    99.8   *
    99.9   * This code is free software; you can redistribute it and/or modify it

   100.1 --- a/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContainerValNotDoc.java	Tue Dec 24 14:14:23 2013 -0800
   100.2 +++ b/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContainerValNotDoc.java	Mon Jan 06 13:39:07 2014 -0800
   100.3 @@ -1,5 +1,5 @@
   100.4  /*
   100.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   100.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   100.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   100.8   *
   100.9   * This code is free software; you can redistribute it and/or modify it

   101.1 --- a/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContaineeDoc.java	Tue Dec 24 14:14:23 2013 -0800
   101.2 +++ b/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContaineeDoc.java	Mon Jan 06 13:39:07 2014 -0800
   101.3 @@ -1,5 +1,5 @@
   101.4  /*
   101.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   101.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   101.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   101.8   *
   101.9   * This code is free software; you can redistribute it and/or modify it

   102.1 --- a/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContaineeNotDoc.java	Tue Dec 24 14:14:23 2013 -0800
   102.2 +++ b/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContaineeNotDoc.java	Mon Jan 06 13:39:07 2014 -0800
   102.3 @@ -1,5 +1,5 @@
   102.4  /*
   102.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   102.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   102.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   102.8   *
   102.9   * This code is free software; you can redistribute it and/or modify it

   103.1 --- a/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContainerValDoc.java	Tue Dec 24 14:14:23 2013 -0800
   103.2 +++ b/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContainerValDoc.java	Mon Jan 06 13:39:07 2014 -0800
   103.3 @@ -1,5 +1,5 @@
   103.4  /*
   103.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   103.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   103.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   103.8   *
   103.9   * This code is free software; you can redistribute it and/or modify it

   104.1 --- a/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContainerValNotDoc.java	Tue Dec 24 14:14:23 2013 -0800
   104.2 +++ b/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContainerValNotDoc.java	Mon Jan 06 13:39:07 2014 -0800
   104.3 @@ -1,5 +1,5 @@
   104.4  /*
   104.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   104.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   104.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   104.8   *
   104.9   * This code is free software; you can redistribute it and/or modify it

   105.1 --- a/test/com/sun/javadoc/testStylesheet/TestStylesheet.java	Tue Dec 24 14:14:23 2013 -0800
   105.2 +++ b/test/com/sun/javadoc/testStylesheet/TestStylesheet.java	Mon Jan 06 13:39:07 2014 -0800
   105.3 @@ -23,7 +23,7 @@
   105.4  
   105.5  /*
   105.6   * @test
   105.7 - * @bug      4494033 7028815 7052425 8007338 8023608 8008164
   105.8 + * @bug      4494033 7028815 7052425 8007338 8023608 8008164 8016549
   105.9   * @summary  Run tests on doclet stylesheet.
  105.10   * @author   jamieh
  105.11   * @library  ../lib/
  105.12 @@ -54,8 +54,8 @@
  105.13          {BUG_ID + FS + "stylesheet.css",
  105.14              "body {" + NL + "    background-color:#ffffff;" + NL +
  105.15              "    color:#353833;" + NL +
  105.16 -            "    font-family:Arial, Helvetica, sans-serif;" + NL +
  105.17 -            "    font-size:76%;" + NL + "    margin:0;" + NL + "}"},
  105.18 +            "    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;" + NL +
  105.19 +            "    font-size:14px;" + NL + "    margin:0;" + NL + "}"},
  105.20          {BUG_ID + FS + "stylesheet.css",
  105.21              "ul {" + NL + "    list-style-type:disc;" + NL + "}"},
  105.22          {BUG_ID + FS + "stylesheet.css",
  105.23 @@ -64,49 +64,65 @@
  105.24              "    position:relative;" + NL +
  105.25              "    text-align:left;" + NL +
  105.26              "    background-repeat:no-repeat;" + NL +
  105.27 -            "    color:#FFFFFF;" + NL +
  105.28 +            "    color:#253441;" + NL +
  105.29              "    font-weight:bold;" + NL +
  105.30              "    clear:none;" + NL +
  105.31              "    overflow:hidden;" + NL +
  105.32              "    padding:0px;" + NL +
  105.33 +            "    padding-top:10px;" + NL +
  105.34 +            "    padding-left:1px;" + NL +
  105.35              "    margin:0px;" + NL +
  105.36 +            "    white-space:pre;" + NL +
  105.37              "}"},
  105.38          {BUG_ID + FS + "stylesheet.css",
  105.39              ".overviewSummary caption span, .memberSummary caption span, .typeSummary caption span," + NL +
  105.40              ".useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {" + NL +
  105.41              "    white-space:nowrap;" + NL +
  105.42 -            "    padding-top:8px;" + NL +
  105.43 -            "    padding-left:8px;" + NL +
  105.44 +            "    padding-top:5px;" + NL +
  105.45 +            "    padding-left:12px;" + NL +
  105.46 +            "    padding-right:12px;" + NL +
  105.47 +            "    padding-bottom:7px;" + NL +
  105.48              "    display:inline-block;" + NL +
  105.49              "    float:left;" + NL +
  105.50 -            "    background-image:url(resources/titlebar.gif);" + NL +
  105.51 +            "    background-color:#F8981D;" + NL +
  105.52 +            "    border: none;" + NL +
  105.53 +            "    height:16px;" + NL +
  105.54              "}"},
  105.55          {BUG_ID + FS + "stylesheet.css",
  105.56              ".memberSummary caption span.activeTableTab span {" + NL +
  105.57              "    white-space:nowrap;" + NL +
  105.58 -            "    padding-top:8px;" + NL +
  105.59 -            "    padding-left:8px;" + NL +
  105.60 +            "    padding-top:5px;" + NL +
  105.61 +            "    padding-left:12px;" + NL +
  105.62 +            "    padding-right:12px;" + NL +
  105.63 +            "    margin-right:3px;" + NL +
  105.64              "    display:inline-block;" + NL +
  105.65              "    float:left;" + NL +
  105.66 -            "    background-image:url(resources/activetitlebar.gif);" + NL +
  105.67 +            "    background-color:#F8981D;" + NL +
  105.68 +            "    height:16px;" + NL +
  105.69              "}"},
  105.70          {BUG_ID + FS + "stylesheet.css",
  105.71              ".memberSummary caption span.tableTab span {" + NL +
  105.72              "    white-space:nowrap;" + NL +
  105.73 -            "    padding-top:8px;" + NL +
  105.74 -            "    padding-left:8px;" + NL +
  105.75 +            "    padding-top:5px;" + NL +
  105.76 +            "    padding-left:12px;" + NL +
  105.77 +            "    padding-right:12px;" + NL +
  105.78 +            "    margin-right:3px;" + NL +
  105.79              "    display:inline-block;" + NL +
  105.80              "    float:left;" + NL +
  105.81 -            "    background-image:url(resources/titlebar.gif);" + NL +
  105.82 +            "    background-color:#4D7A97;" + NL +
  105.83 +            "    height:16px;" + NL +
  105.84              "}"},
  105.85          {BUG_ID + FS + "stylesheet.css",
  105.86              ".memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {" + NL +
  105.87              "    padding-top:0px;" + NL +
  105.88              "    padding-left:0px;" + NL +
  105.89 +            "    padding-right:0px;" + NL +
  105.90              "    background-image:none;" + NL +
  105.91              "    float:none;" + NL +
  105.92 -            "    display:inline-block;" + NL +
  105.93 +            "    display:inline;" + NL +
  105.94              "}"},
  105.95 +        {BUG_ID + FS + "stylesheet.css",
  105.96 +            "@import url('resources/fonts/dejavu.css');"},
  105.97          // Test whether a link to the stylesheet file is inserted properly
  105.98          // in the class documentation.
  105.99          {BUG_ID + FS + "pkg" + FS + "A.html",

   106.1 --- a/test/tools/javac/T6725036.java	Tue Dec 24 14:14:23 2013 -0800
   106.2 +++ b/test/tools/javac/T6725036.java	Mon Jan 06 13:39:07 2014 -0800
   106.3 @@ -1,5 +1,5 @@
   106.4  /*
   106.5 - * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
   106.6 + * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
   106.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   106.8   *
   106.9   * This code is free software; you can redistribute it and/or modify it

   107.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   107.2 +++ b/test/tools/javac/T8029569/VarargsAmbiguityCrashTest.java	Mon Jan 06 13:39:07 2014 -0800
   107.3 @@ -0,0 +1,41 @@
   107.4 +/*
   107.5 + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
   107.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   107.7 + *
   107.8 + * This code is free software; you can redistribute it and/or modify it
   107.9 + * under the terms of the GNU General Public License version 2 only, as
  107.10 + * published by the Free Software Foundation.
  107.11 + *
  107.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
  107.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  107.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  107.15 + * version 2 for more details (a copy is included in the LICENSE file that
  107.16 + * accompanied this code).
  107.17 + *
  107.18 + * You should have received a copy of the GNU General Public License version
  107.19 + * 2 along with this work; if not, write to the Free Software Foundation,
  107.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  107.21 + *
  107.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  107.23 + * or visit www.oracle.com if you need additional information or have any
  107.24 + * questions.
  107.25 + */
  107.26 +
  107.27 +/*
  107.28 + * @test
  107.29 + * @bug 8029569
  107.30 + * @summary internal javac cast exception when resolving varargs ambiguity
  107.31 + * @compile/fail/ref=VarargsAmbiguityCrashTest.out -XDrawDiagnostics VarargsAmbiguityCrashTest.java
  107.32 + */
  107.33 +
  107.34 +public class VarargsAmbiguityCrashTest {
  107.35 +    void m1() {
  107.36 +        m2(null, new Exception());
  107.37 +    }
  107.38 +
  107.39 +    void m2(Long l) {}
  107.40 +
  107.41 +    void m2(Exception... exception) {}
  107.42 +
  107.43 +    void m2(Long l, Exception... exception) {}
  107.44 +}

   108.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   108.2 +++ b/test/tools/javac/T8029569/VarargsAmbiguityCrashTest.out	Mon Jan 06 13:39:07 2014 -0800
   108.3 @@ -0,0 +1,2 @@
   108.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
   108.5 +1 error

   109.1 --- a/test/tools/javac/annotations/repeatingAnnotations/combo/expectedFiles/ExpectedBase.java	Tue Dec 24 14:14:23 2013 -0800
   109.2 +++ b/test/tools/javac/annotations/repeatingAnnotations/combo/expectedFiles/ExpectedBase.java	Mon Jan 06 13:39:07 2014 -0800
   109.3 @@ -1,5 +1,5 @@
   109.4  /*
   109.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   109.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   109.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   109.8   *
   109.9   * This code is free software; you can redistribute it and/or modify it

   110.1 --- a/test/tools/javac/annotations/repeatingAnnotations/combo/expectedFiles/ExpectedContainer.java	Tue Dec 24 14:14:23 2013 -0800
   110.2 +++ b/test/tools/javac/annotations/repeatingAnnotations/combo/expectedFiles/ExpectedContainer.java	Mon Jan 06 13:39:07 2014 -0800
   110.3 @@ -1,5 +1,5 @@
   110.4  /*
   110.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   110.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   110.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   110.8   *
   110.9   * This code is free software; you can redistribute it and/or modify it

   111.1 --- a/test/tools/javac/annotations/typeAnnotations/TargetTypes.java	Tue Dec 24 14:14:23 2013 -0800
   111.2 +++ b/test/tools/javac/annotations/typeAnnotations/TargetTypes.java	Mon Jan 06 13:39:07 2014 -0800
   111.3 @@ -1,5 +1,5 @@
   111.4  /*
   111.5 - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
   111.6 + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
   111.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   111.8   *
   111.9   * This code is free software; you can redistribute it and/or modify it

   112.1 --- a/test/tools/javac/annotations/typeAnnotations/api/AnnotatedArrayOrder.java	Tue Dec 24 14:14:23 2013 -0800
   112.2 +++ b/test/tools/javac/annotations/typeAnnotations/api/AnnotatedArrayOrder.java	Mon Jan 06 13:39:07 2014 -0800
   112.3 @@ -1,5 +1,5 @@
   112.4  /*
   112.5 - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
   112.6 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
   112.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   112.8   *
   112.9   * This code is free software; you can redistribute it and/or modify it

   113.1 --- a/test/tools/javac/annotations/typeAnnotations/api/ArrayCreationTree.java	Tue Dec 24 14:14:23 2013 -0800
   113.2 +++ b/test/tools/javac/annotations/typeAnnotations/api/ArrayCreationTree.java	Mon Jan 06 13:39:07 2014 -0800
   113.3 @@ -1,5 +1,5 @@
   113.4  /*
   113.5 - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
   113.6 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
   113.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   113.8   *
   113.9   * This code is free software; you can redistribute it and/or modify it

   114.1 --- a/test/tools/javac/annotations/typeAnnotations/api/ArrayPositionConsistency.java	Tue Dec 24 14:14:23 2013 -0800
   114.2 +++ b/test/tools/javac/annotations/typeAnnotations/api/ArrayPositionConsistency.java	Mon Jan 06 13:39:07 2014 -0800
   114.3 @@ -1,5 +1,5 @@
   114.4  /*
   114.5 - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
   114.6 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
   114.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   114.8   *
   114.9   * This code is free software; you can redistribute it and/or modify it

   115.1 --- a/test/tools/javac/annotations/typeAnnotations/classfile/NoTargetAnnotations.java	Tue Dec 24 14:14:23 2013 -0800
   115.2 +++ b/test/tools/javac/annotations/typeAnnotations/classfile/NoTargetAnnotations.java	Mon Jan 06 13:39:07 2014 -0800
   115.3 @@ -1,5 +1,5 @@
   115.4  /*
   115.5 - * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
   115.6 + * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
   115.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   115.8   *
   115.9   * This code is free software; you can redistribute it and/or modify it

   116.1 --- a/test/tools/javac/annotations/typeAnnotations/failures/target/DotClass.java	Tue Dec 24 14:14:23 2013 -0800
   116.2 +++ b/test/tools/javac/annotations/typeAnnotations/failures/target/DotClass.java	Mon Jan 06 13:39:07 2014 -0800
   116.3 @@ -1,5 +1,5 @@
   116.4  /*
   116.5 - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
   116.6 + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
   116.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   116.8   *
   116.9   * This code is free software; you can redistribute it and/or modify it

   117.1 --- a/test/tools/javac/annotations/typeAnnotations/newlocations/Lambda.java	Tue Dec 24 14:14:23 2013 -0800
   117.2 +++ b/test/tools/javac/annotations/typeAnnotations/newlocations/Lambda.java	Mon Jan 06 13:39:07 2014 -0800
   117.3 @@ -23,8 +23,9 @@
   117.4  
   117.5  /*
   117.6   * @test
   117.7 - * @bug 8008077
   117.8 + * @bug 8008077 8029721
   117.9   * @summary new type annotation location: lambda expressions
  117.10 + * javac crash for annotated parameter type of lambda in a field
  117.11   * @compile Lambda.java
  117.12   * @author Werner Dietl
  117.13   */
  117.14 @@ -57,6 +58,14 @@
  117.15      LambdaInt2 getLambda() {
  117.16          return (@TA Object x, @TB Object y) -> { @TA Object l = null; System.out.println("We have: " + (@TB Object) x); };
  117.17      }
  117.18 +
  117.19 +    java.util.function.IntUnaryOperator x = (@TA int y) -> 1;
  117.20 +
  117.21 +    static java.util.function.IntUnaryOperator xx = (@TA int y) -> 1;
  117.22 +
  117.23 +    java.util.function.IntUnaryOperator foo() {
  117.24 +        return (@TA int y) -> 2;
  117.25 +    }
  117.26  }
  117.27  
  117.28  @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})

   118.1 --- a/test/tools/javac/annotations/typeAnnotations/newlocations/Varargs.java	Tue Dec 24 14:14:23 2013 -0800
   118.2 +++ b/test/tools/javac/annotations/typeAnnotations/newlocations/Varargs.java	Mon Jan 06 13:39:07 2014 -0800
   118.3 @@ -1,5 +1,5 @@
   118.4  /*
   118.5 - * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
   118.6 + * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
   118.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   118.8   *
   118.9   * This code is free software; you can redistribute it and/or modify it

   119.1 --- a/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/Anno.java	Tue Dec 24 14:14:23 2013 -0800
   119.2 +++ b/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/Anno.java	Mon Jan 06 13:39:07 2014 -0800
   119.3 @@ -1,5 +1,5 @@
   119.4  /*
   119.5 - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
   119.6 + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
   119.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   119.8   *
   119.9   * This code is free software; you can redistribute it and/or modify it

   120.1 --- a/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/MyClass.java	Tue Dec 24 14:14:23 2013 -0800
   120.2 +++ b/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/MyClass.java	Mon Jan 06 13:39:07 2014 -0800
   120.3 @@ -1,5 +1,5 @@
   120.4  /*
   120.5 - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
   120.6 + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
   120.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   120.8   *
   120.9   * This code is free software; you can redistribute it and/or modify it

   121.1 --- a/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/package-info.java	Tue Dec 24 14:14:23 2013 -0800
   121.2 +++ b/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/package-info.java	Mon Jan 06 13:39:07 2014 -0800
   121.3 @@ -1,5 +1,5 @@
   121.4  /*
   121.5 - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
   121.6 + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
   121.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   121.8   *
   121.9   * This code is free software; you can redistribute it and/or modify it

   122.1 --- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassExtends.java	Tue Dec 24 14:14:23 2013 -0800
   122.2 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassExtends.java	Mon Jan 06 13:39:07 2014 -0800
   122.3 @@ -1,5 +1,5 @@
   122.4  /*
   122.5 - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
   122.6 + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
   122.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   122.8   *
   122.9   * This code is free software; you can redistribute it and/or modify it

   123.1 --- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassTypeParam.java	Tue Dec 24 14:14:23 2013 -0800
   123.2 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassTypeParam.java	Mon Jan 06 13:39:07 2014 -0800
   123.3 @@ -1,5 +1,5 @@
   123.4  /*
   123.5 - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
   123.6 + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
   123.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   123.8   *
   123.9   * This code is free software; you can redistribute it and/or modify it

   124.1 --- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/Fields.java	Tue Dec 24 14:14:23 2013 -0800
   124.2 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/Fields.java	Mon Jan 06 13:39:07 2014 -0800
   124.3 @@ -1,5 +1,5 @@
   124.4  /*
   124.5 - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
   124.6 + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
   124.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   124.8   *
   124.9   * This code is free software; you can redistribute it and/or modify it

   125.1 --- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java	Tue Dec 24 14:14:23 2013 -0800
   125.2 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java	Mon Jan 06 13:39:07 2014 -0800
   125.3 @@ -1,5 +1,5 @@
   125.4  /*
   125.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   125.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   125.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   125.8   *
   125.9   * This code is free software; you can redistribute it and/or modify it

   126.1 --- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java	Tue Dec 24 14:14:23 2013 -0800
   126.2 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java	Mon Jan 06 13:39:07 2014 -0800
   126.3 @@ -23,8 +23,9 @@
   126.4  
   126.5  /*
   126.6   * @test
   126.7 - * @bug 8008077
   126.8 + * @bug 8008077 8029721
   126.9   * @summary Test population of reference info for lambda expressions
  126.10 + * javac crash for annotated parameter type of lambda in a field
  126.11   * @compile -g Driver.java ReferenceInfoUtil.java Lambda.java
  126.12   * @run main Driver Lambda
  126.13   * @author Werner Dietl
  126.14 @@ -285,4 +286,24 @@
  126.15                  "  }" +
  126.16                  "}";
  126.17      }
  126.18 +
  126.19 +    @TADescriptions({
  126.20 +        @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
  126.21 +            paramIndex = 0)})
  126.22 +    public String lambdaField1() {
  126.23 +        return
  126.24 +            "class Test {" +
  126.25 +                " java.util.function.IntUnaryOperator field = (@TA int y) -> 1;" +
  126.26 +            "}";
  126.27 +    }
  126.28 +
  126.29 +    @TADescriptions({
  126.30 +        @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
  126.31 +            paramIndex = 0)})
  126.32 +    public String lambdaField2() {
  126.33 +        return
  126.34 +            "class Test {" +
  126.35 +                " static java.util.function.IntUnaryOperator field = (@TA int y) -> 1;" +
  126.36 +            "}";
  126.37 +    }
  126.38  }

   127.1 --- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java	Tue Dec 24 14:14:23 2013 -0800
   127.2 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java	Mon Jan 06 13:39:07 2014 -0800
   127.3 @@ -1,5 +1,5 @@
   127.4  /*
   127.5 - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
   127.6 + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
   127.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   127.8   *
   127.9   * This code is free software; you can redistribute it and/or modify it

   128.1 --- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReceivers.java	Tue Dec 24 14:14:23 2013 -0800
   128.2 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReceivers.java	Mon Jan 06 13:39:07 2014 -0800
   128.3 @@ -1,5 +1,5 @@
   128.4  /*
   128.5 - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
   128.6 + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
   128.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   128.8   *
   128.9   * This code is free software; you can redistribute it and/or modify it

   129.1 --- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReturns.java	Tue Dec 24 14:14:23 2013 -0800
   129.2 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReturns.java	Mon Jan 06 13:39:07 2014 -0800
   129.3 @@ -1,5 +1,5 @@
   129.4  /*
   129.5 - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
   129.6 + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
   129.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   129.8   *
   129.9   * This code is free software; you can redistribute it and/or modify it

   130.1 --- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodTypeParam.java	Tue Dec 24 14:14:23 2013 -0800
   130.2 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodTypeParam.java	Mon Jan 06 13:39:07 2014 -0800
   130.3 @@ -1,5 +1,5 @@
   130.4  /*
   130.5 - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
   130.6 + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
   130.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   130.8   *
   130.9   * This code is free software; you can redistribute it and/or modify it

   131.1 --- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/RepeatingTypeAnnotations.java	Tue Dec 24 14:14:23 2013 -0800
   131.2 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/RepeatingTypeAnnotations.java	Mon Jan 06 13:39:07 2014 -0800
   131.3 @@ -1,5 +1,5 @@
   131.4  /*
   131.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   131.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   131.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   131.8   *
   131.9   * This code is free software; you can redistribute it and/or modify it

   132.1 --- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeCasts.java	Tue Dec 24 14:14:23 2013 -0800
   132.2 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeCasts.java	Mon Jan 06 13:39:07 2014 -0800
   132.3 @@ -1,5 +1,5 @@
   132.4  /*
   132.5 - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
   132.6 + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
   132.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   132.8   *
   132.9   * This code is free software; you can redistribute it and/or modify it

   133.1 --- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeTests.java	Tue Dec 24 14:14:23 2013 -0800
   133.2 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeTests.java	Mon Jan 06 13:39:07 2014 -0800
   133.3 @@ -1,5 +1,5 @@
   133.4  /*
   133.5 - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
   133.6 + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
   133.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   133.8   *
   133.9   * This code is free software; you can redistribute it and/or modify it

   134.1 --- a/test/tools/javac/cast/intersection/IntersectionTypeParserTest.java	Tue Dec 24 14:14:23 2013 -0800
   134.2 +++ b/test/tools/javac/cast/intersection/IntersectionTypeParserTest.java	Mon Jan 06 13:39:07 2014 -0800
   134.3 @@ -1,5 +1,5 @@
   134.4  /*
   134.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   134.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   134.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   134.8   *
   134.9   * This code is free software; you can redistribute it and/or modify it

   135.1 --- a/test/tools/javac/cast/intersection/model/Model01.java	Tue Dec 24 14:14:23 2013 -0800
   135.2 +++ b/test/tools/javac/cast/intersection/model/Model01.java	Mon Jan 06 13:39:07 2014 -0800
   135.3 @@ -1,5 +1,5 @@
   135.4  /*
   135.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   135.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   135.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   135.8   *
   135.9   * This code is free software; you can redistribute it and/or modify it

   136.1 --- a/test/tools/javac/cast/intersection/model/ModelChecker.java	Tue Dec 24 14:14:23 2013 -0800
   136.2 +++ b/test/tools/javac/cast/intersection/model/ModelChecker.java	Mon Jan 06 13:39:07 2014 -0800
   136.3 @@ -1,5 +1,5 @@
   136.4  /*
   136.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   136.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   136.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   136.8   *
   136.9   * This code is free software; you can redistribute it and/or modify it

   137.1 --- a/test/tools/javac/defaultMethods/static/Static01.java	Tue Dec 24 14:14:23 2013 -0800
   137.2 +++ b/test/tools/javac/defaultMethods/static/Static01.java	Mon Jan 06 13:39:07 2014 -0800
   137.3 @@ -1,5 +1,5 @@
   137.4  /*
   137.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   137.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   137.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   137.8   *
   137.9   * This code is free software; you can redistribute it and/or modify it

   138.1 --- a/test/tools/javac/defaultMethods/static/Static02.java	Tue Dec 24 14:14:23 2013 -0800
   138.2 +++ b/test/tools/javac/defaultMethods/static/Static02.java	Mon Jan 06 13:39:07 2014 -0800
   138.3 @@ -1,5 +1,5 @@
   138.4  /*
   138.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   138.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   138.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   138.8   *
   138.9   * This code is free software; you can redistribute it and/or modify it

   139.1 --- a/test/tools/javac/defaultMethods/static/hiding/InterfaceMethodHidingTest.java	Tue Dec 24 14:14:23 2013 -0800
   139.2 +++ b/test/tools/javac/defaultMethods/static/hiding/InterfaceMethodHidingTest.java	Mon Jan 06 13:39:07 2014 -0800
   139.3 @@ -1,5 +1,5 @@
   139.4  /*
   139.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   139.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   139.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   139.8   *
   139.9   * This code is free software; you can redistribute it and/or modify it

   140.1 --- a/test/tools/javac/defaultMethods/static/import/StaticImport1.java	Tue Dec 24 14:14:23 2013 -0800
   140.2 +++ b/test/tools/javac/defaultMethods/static/import/StaticImport1.java	Mon Jan 06 13:39:07 2014 -0800
   140.3 @@ -1,5 +1,5 @@
   140.4  /*
   140.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   140.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   140.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   140.8   *
   140.9   * This code is free software; you can redistribute it and/or modify it

   141.1 --- a/test/tools/javac/defaultMethods/static/import/StaticImport2.java	Tue Dec 24 14:14:23 2013 -0800
   141.2 +++ b/test/tools/javac/defaultMethods/static/import/StaticImport2.java	Mon Jan 06 13:39:07 2014 -0800
   141.3 @@ -1,5 +1,5 @@
   141.4  /*
   141.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   141.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   141.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   141.8   *
   141.9   * This code is free software; you can redistribute it and/or modify it

   142.1 --- a/test/tools/javac/defaultMethods/static/import/StaticImport3.java	Tue Dec 24 14:14:23 2013 -0800
   142.2 +++ b/test/tools/javac/defaultMethods/static/import/StaticImport3.java	Mon Jan 06 13:39:07 2014 -0800
   142.3 @@ -1,5 +1,5 @@
   142.4  /*
   142.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   142.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   142.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   142.8   *
   142.9   * This code is free software; you can redistribute it and/or modify it

   143.1 --- a/test/tools/javac/defaultMethods/static/import/pkg/A.java	Tue Dec 24 14:14:23 2013 -0800
   143.2 +++ b/test/tools/javac/defaultMethods/static/import/pkg/A.java	Mon Jan 06 13:39:07 2014 -0800
   143.3 @@ -1,5 +1,5 @@
   143.4  /*
   143.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   143.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   143.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   143.8   *
   143.9   * This code is free software; you can redistribute it and/or modify it

   144.1 --- a/test/tools/javac/defaultMethods/static/import/pkg/B.java	Tue Dec 24 14:14:23 2013 -0800
   144.2 +++ b/test/tools/javac/defaultMethods/static/import/pkg/B.java	Mon Jan 06 13:39:07 2014 -0800
   144.3 @@ -1,5 +1,5 @@
   144.4  /*
   144.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   144.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   144.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   144.8   *
   144.9   * This code is free software; you can redistribute it and/or modify it

   145.1 --- a/test/tools/javac/defaultMethods/static/import/pkg/C.java	Tue Dec 24 14:14:23 2013 -0800
   145.2 +++ b/test/tools/javac/defaultMethods/static/import/pkg/C.java	Mon Jan 06 13:39:07 2014 -0800
   145.3 @@ -1,5 +1,5 @@
   145.4  /*
   145.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   145.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   145.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   145.8   *
   145.9   * This code is free software; you can redistribute it and/or modify it

   146.1 --- a/test/tools/javac/defaultMethods/syntax/TestDefaultMethodsSyntax.java	Tue Dec 24 14:14:23 2013 -0800
   146.2 +++ b/test/tools/javac/defaultMethods/syntax/TestDefaultMethodsSyntax.java	Mon Jan 06 13:39:07 2014 -0800
   146.3 @@ -1,5 +1,5 @@
   146.4  /*
   146.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   146.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   146.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   146.8   *
   146.9   * This code is free software; you can redistribute it and/or modify it

   147.1 --- a/test/tools/javac/diags/MessageFile.java	Tue Dec 24 14:14:23 2013 -0800
   147.2 +++ b/test/tools/javac/diags/MessageFile.java	Mon Jan 06 13:39:07 2014 -0800
   147.3 @@ -1,5 +1,5 @@
   147.4  /*
   147.5 - * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
   147.6 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
   147.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   147.8   *
   147.9   * This code is free software; you can redistribute it and/or modify it

   148.1 --- a/test/tools/javac/diags/MessageInfo.java	Tue Dec 24 14:14:23 2013 -0800
   148.2 +++ b/test/tools/javac/diags/MessageInfo.java	Mon Jan 06 13:39:07 2014 -0800
   148.3 @@ -1,5 +1,5 @@
   148.4  /*
   148.5 - * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
   148.6 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
   148.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   148.8   *
   148.9   * This code is free software; you can redistribute it and/or modify it

   149.1 --- a/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/AlreadDefinedStaticImport.java	Tue Dec 24 14:14:23 2013 -0800
   149.2 +++ b/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/AlreadDefinedStaticImport.java	Mon Jan 06 13:39:07 2014 -0800
   149.3 @@ -1,5 +1,5 @@
   149.4  /*
   149.5 - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
   149.6 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
   149.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   149.8   *
   149.9   * This code is free software; you can redistribute it and/or modify it

   150.1 --- a/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/p/E1.java	Tue Dec 24 14:14:23 2013 -0800
   150.2 +++ b/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/p/E1.java	Mon Jan 06 13:39:07 2014 -0800
   150.3 @@ -1,5 +1,5 @@
   150.4  /*
   150.5 - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
   150.6 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
   150.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   150.8   *
   150.9   * This code is free software; you can redistribute it and/or modify it

   151.1 --- a/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/p/E2.java	Tue Dec 24 14:14:23 2013 -0800
   151.2 +++ b/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/p/E2.java	Mon Jan 06 13:39:07 2014 -0800
   151.3 @@ -1,5 +1,5 @@
   151.4  /*
   151.5 - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
   151.6 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
   151.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   151.8   *
   151.9   * This code is free software; you can redistribute it and/or modify it

   152.1 --- a/test/tools/javac/diags/examples/IllegalStaticIntfMethCall.java	Tue Dec 24 14:14:23 2013 -0800
   152.2 +++ b/test/tools/javac/diags/examples/IllegalStaticIntfMethCall.java	Mon Jan 06 13:39:07 2014 -0800
   152.3 @@ -1,5 +1,5 @@
   152.4  /*
   152.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   152.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   152.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   152.8   *
   152.9   * This code is free software; you can redistribute it and/or modify it

   153.1 --- a/test/tools/javac/diags/examples/KindnameConstructor.java	Tue Dec 24 14:14:23 2013 -0800
   153.2 +++ b/test/tools/javac/diags/examples/KindnameConstructor.java	Mon Jan 06 13:39:07 2014 -0800
   153.3 @@ -1,5 +1,5 @@
   153.4  /*
   153.5 - * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
   153.6 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
   153.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   153.8   *
   153.9   * This code is free software; you can redistribute it and/or modify it

   154.1 --- a/test/tools/javac/diags/examples/NonStaticCantBeRefFragment.java	Tue Dec 24 14:14:23 2013 -0800
   154.2 +++ b/test/tools/javac/diags/examples/NonStaticCantBeRefFragment.java	Mon Jan 06 13:39:07 2014 -0800
   154.3 @@ -1,5 +1,5 @@
   154.4  /*
   154.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   154.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   154.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   154.8   *
   154.9   * This code is free software; you can redistribute it and/or modify it

   155.1 --- a/test/tools/javac/diags/examples/NotInProfile.java	Tue Dec 24 14:14:23 2013 -0800
   155.2 +++ b/test/tools/javac/diags/examples/NotInProfile.java	Mon Jan 06 13:39:07 2014 -0800
   155.3 @@ -1,5 +1,5 @@
   155.4  /*
   155.5 - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
   155.6 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
   155.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   155.8   *
   155.9   * This code is free software; you can redistribute it and/or modify it

   156.1 --- a/test/tools/javac/diags/examples/RepeatableAnnotationsNotSupported.java	Tue Dec 24 14:14:23 2013 -0800
   156.2 +++ b/test/tools/javac/diags/examples/RepeatableAnnotationsNotSupported.java	Mon Jan 06 13:39:07 2014 -0800
   156.3 @@ -1,5 +1,5 @@
   156.4  /*
   156.5 - * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
   156.6 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
   156.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   156.8   *
   156.9   * This code is free software; you can redistribute it and/or modify it

   157.1 --- a/test/tools/javac/diags/examples/StaticIntfMethodNotSupported.java	Tue Dec 24 14:14:23 2013 -0800
   157.2 +++ b/test/tools/javac/diags/examples/StaticIntfMethodNotSupported.java	Mon Jan 06 13:39:07 2014 -0800
   157.3 @@ -1,5 +1,5 @@
   157.4  /*
   157.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   157.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   157.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   157.8   *
   157.9   * This code is free software; you can redistribute it and/or modify it

   158.1 --- a/test/tools/javac/diags/examples/WhereIntersection.java	Tue Dec 24 14:14:23 2013 -0800
   158.2 +++ b/test/tools/javac/diags/examples/WhereIntersection.java	Mon Jan 06 13:39:07 2014 -0800
   158.3 @@ -1,5 +1,5 @@
   158.4  /*
   158.5 - * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
   158.6 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
   158.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   158.8   *
   158.9   * This code is free software; you can redistribute it and/or modify it

   159.1 --- a/test/tools/javac/generics/odersky/BadTest4.java	Tue Dec 24 14:14:23 2013 -0800
   159.2 +++ b/test/tools/javac/generics/odersky/BadTest4.java	Mon Jan 06 13:39:07 2014 -0800
   159.3 @@ -1,5 +1,5 @@
   159.4  /*
   159.5 - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
   159.6 + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
   159.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   159.8   *
   159.9   * This code is free software; you can redistribute it and/or modify it

   160.1 --- a/test/tools/javac/lambda/DoubleStaticImport.java	Tue Dec 24 14:14:23 2013 -0800
   160.2 +++ b/test/tools/javac/lambda/DoubleStaticImport.java	Mon Jan 06 13:39:07 2014 -0800
   160.3 @@ -1,5 +1,5 @@
   160.4  /*
   160.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
   160.6 + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
   160.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   160.8   *
   160.9   * This code is free software; you can redistribute it and/or modify it

   161.1 --- a/test/tools/javac/lambda/Intersection01.java	Tue Dec 24 14:14:23 2013 -0800
   161.2 +++ b/test/tools/javac/lambda/Intersection01.java	Mon Jan 06 13:39:07 2014 -0800
   161.3 @@ -1,5 +1,5 @@
   161.4  /*
   161.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   161.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   161.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   161.8   *
   161.9   * This code is free software; you can redistribute it and/or modify it

   162.1 --- a/test/tools/javac/lambda/Intersection02.java	Tue Dec 24 14:14:23 2013 -0800
   162.2 +++ b/test/tools/javac/lambda/Intersection02.java	Mon Jan 06 13:39:07 2014 -0800
   162.3 @@ -1,5 +1,5 @@
   162.4  /*
   162.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   162.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   162.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   162.8   *
   162.9   * This code is free software; you can redistribute it and/or modify it

   163.1 --- a/test/tools/javac/lambda/LambdaCapture06.java	Tue Dec 24 14:14:23 2013 -0800
   163.2 +++ b/test/tools/javac/lambda/LambdaCapture06.java	Mon Jan 06 13:39:07 2014 -0800
   163.3 @@ -1,5 +1,5 @@
   163.4  /*
   163.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   163.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   163.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   163.8   *
   163.9   * This code is free software; you can redistribute it and/or modify it

   164.1 --- a/test/tools/javac/lambda/LambdaConv01.java	Tue Dec 24 14:14:23 2013 -0800
   164.2 +++ b/test/tools/javac/lambda/LambdaConv01.java	Mon Jan 06 13:39:07 2014 -0800
   164.3 @@ -1,5 +1,5 @@
   164.4  /*
   164.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
   164.6 + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
   164.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   164.8   *
   164.9   * This code is free software; you can redistribute it and/or modify it

   165.1 --- a/test/tools/javac/lambda/LambdaExpr15.java	Tue Dec 24 14:14:23 2013 -0800
   165.2 +++ b/test/tools/javac/lambda/LambdaExpr15.java	Mon Jan 06 13:39:07 2014 -0800
   165.3 @@ -1,5 +1,5 @@
   165.4  /*
   165.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   165.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   165.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   165.8   *
   165.9   * This code is free software; you can redistribute it and/or modify it

   166.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   166.2 +++ b/test/tools/javac/lambda/LambdaParenGeneric.java	Mon Jan 06 13:39:07 2014 -0800
   166.3 @@ -0,0 +1,48 @@
   166.4 +/*
   166.5 + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
   166.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   166.7 + *
   166.8 + * This code is free software; you can redistribute it and/or modify it
   166.9 + * under the terms of the GNU General Public License version 2 only, as
  166.10 + * published by the Free Software Foundation.
  166.11 + *
  166.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
  166.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  166.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  166.15 + * version 2 for more details (a copy is included in the LICENSE file that
  166.16 + * accompanied this code).
  166.17 + *
  166.18 + * You should have received a copy of the GNU General Public License version
  166.19 + * 2 along with this work; if not, write to the Free Software Foundation,
  166.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  166.21 + *
  166.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  166.23 + * or visit www.oracle.com if you need additional information or have any
  166.24 + * questions.
  166.25 + */
  166.26 +
  166.27 +/*
  166.28 + * @test
  166.29 + * @bug 8029558
  166.30 + * @summary VerifyError lambda body is parenthesized generic value
  166.31 + * @author  Robert Field
  166.32 + * @run main LambdaParenGeneric
  166.33 + */
  166.34 +
  166.35 +public class LambdaParenGeneric {
  166.36 +
  166.37 +    @FunctionalInterface
  166.38 +    public interface FI {
  166.39 +        Integer apply();
  166.40 +    }
  166.41 +
  166.42 +    public static class Val<A> {
  166.43 +        A value;
  166.44 +        Val(A v) { value = v; }
  166.45 +    }
  166.46 +
  166.47 +    public static void main(String[] args) {
  166.48 +        FI inc = () -> (new Val<Integer>(77).value);
  166.49 +        System.out.println(inc.apply());
  166.50 +    }
  166.51 +}

   167.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   167.2 +++ b/test/tools/javac/lambda/LambdaParenGenericOrig.java	Mon Jan 06 13:39:07 2014 -0800
   167.3 @@ -0,0 +1,49 @@
   167.4 +/*
   167.5 + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
   167.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   167.7 + *
   167.8 + * This code is free software; you can redistribute it and/or modify it
   167.9 + * under the terms of the GNU General Public License version 2 only, as
  167.10 + * published by the Free Software Foundation.
  167.11 + *
  167.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
  167.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  167.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  167.15 + * version 2 for more details (a copy is included in the LICENSE file that
  167.16 + * accompanied this code).
  167.17 + *
  167.18 + * You should have received a copy of the GNU General Public License version
  167.19 + * 2 along with this work; if not, write to the Free Software Foundation,
  167.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  167.21 + *
  167.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  167.23 + * or visit www.oracle.com if you need additional information or have any
  167.24 + * questions.
  167.25 + */
  167.26 +
  167.27 +/*
  167.28 + * @test
  167.29 + * @bug 8029558
  167.30 + * @summary VerifyError lambda body is parenthesized generic value (originally submitted test)
  167.31 + * @author  Dmitrii Afanasyev
  167.32 + * @run main LambdaParenGenericOrig
  167.33 + */
  167.34 +
  167.35 +public class LambdaParenGenericOrig {
  167.36 +
  167.37 +    @FunctionalInterface
  167.38 +    public static interface Function1<R, A> {
  167.39 +        R apply(A input);
  167.40 +    }
  167.41 +
  167.42 +    @FunctionalInterface
  167.43 +    public static interface Function2<R, A1, A2> {
  167.44 +        R apply(A1 input1, A2 input2);
  167.45 +    }
  167.46 +
  167.47 +    public static void main(String[] args) {
  167.48 +        final Function2<Integer, Integer, Integer> add = (x, y) -> x + y;
  167.49 +        final Function1<Integer, Integer> inc = x -> (add.apply(x, 1));
  167.50 +        System.out.println(inc.apply(0));
  167.51 +    }
  167.52 +}

   168.1 --- a/test/tools/javac/lambda/LambdaScope05.out	Tue Dec 24 14:14:23 2013 -0800
   168.2 +++ b/test/tools/javac/lambda/LambdaScope05.out	Mon Jan 06 13:39:07 2014 -0800
   168.3 @@ -1,5 +1,5 @@
   168.4  LambdaScope05.java:13:47: compiler.err.already.defined.in.clinit: kindname.variable, p, kindname.static.init, kindname.class, LambdaScope05
   168.5 -LambdaScope05.java:14:40: compiler.err.already.defined.in.clinit: kindname.variable, p, kindname.instance.init, kindname.class, LambdaScope05
   168.6 +LambdaScope05.java:14:40: compiler.err.already.defined: kindname.variable, p, kindname.constructor, LambdaScope05()
   168.7  LambdaScope05.java:17:43: compiler.err.already.defined.in.clinit: kindname.variable, p, kindname.static.init, kindname.class, LambdaScope05
   168.8  LambdaScope05.java:21:43: compiler.err.already.defined.in.clinit: kindname.variable, p, kindname.instance.init, kindname.class, LambdaScope05
   168.9  LambdaScope05.java:25:43: compiler.err.already.defined: kindname.variable, p, kindname.method, m_static()

   169.1 --- a/test/tools/javac/lambda/MethodReference25.java	Tue Dec 24 14:14:23 2013 -0800
   169.2 +++ b/test/tools/javac/lambda/MethodReference25.java	Mon Jan 06 13:39:07 2014 -0800
   169.3 @@ -1,5 +1,5 @@
   169.4  /*
   169.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
   169.6 + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
   169.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   169.8   *
   169.9   * This code is free software; you can redistribute it and/or modify it

   170.1 --- a/test/tools/javac/lambda/MethodReference26.java	Tue Dec 24 14:14:23 2013 -0800
   170.2 +++ b/test/tools/javac/lambda/MethodReference26.java	Mon Jan 06 13:39:07 2014 -0800
   170.3 @@ -1,5 +1,5 @@
   170.4  /*
   170.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
   170.6 + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
   170.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   170.8   *
   170.9   * This code is free software; you can redistribute it and/or modify it

   171.1 --- a/test/tools/javac/lambda/MethodReference59.java	Tue Dec 24 14:14:23 2013 -0800
   171.2 +++ b/test/tools/javac/lambda/MethodReference59.java	Mon Jan 06 13:39:07 2014 -0800
   171.3 @@ -1,5 +1,5 @@
   171.4  /*
   171.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   171.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   171.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   171.8   *
   171.9   * This code is free software; you can redistribute it and/or modify it

   172.1 --- a/test/tools/javac/lambda/MethodReference60.java	Tue Dec 24 14:14:23 2013 -0800
   172.2 +++ b/test/tools/javac/lambda/MethodReference60.java	Mon Jan 06 13:39:07 2014 -0800
   172.3 @@ -1,5 +1,5 @@
   172.4  /*
   172.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   172.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   172.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   172.8   *
   172.9   * This code is free software; you can redistribute it and/or modify it

   173.1 --- a/test/tools/javac/lambda/TargetType51.java	Tue Dec 24 14:14:23 2013 -0800
   173.2 +++ b/test/tools/javac/lambda/TargetType51.java	Mon Jan 06 13:39:07 2014 -0800
   173.3 @@ -1,5 +1,5 @@
   173.4  /*
   173.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   173.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   173.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   173.8   *
   173.9   * This code is free software; you can redistribute it and/or modify it

   174.1 --- a/test/tools/javac/lambda/lambdaExecution/InInterface.java	Tue Dec 24 14:14:23 2013 -0800
   174.2 +++ b/test/tools/javac/lambda/lambdaExecution/InInterface.java	Mon Jan 06 13:39:07 2014 -0800
   174.3 @@ -1,5 +1,5 @@
   174.4  /*
   174.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   174.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   174.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   174.8   *
   174.9   * This code is free software; you can redistribute it and/or modify it

   175.1 --- a/test/tools/javac/lambda/lambdaExpression/LambdaTest6.java	Tue Dec 24 14:14:23 2013 -0800
   175.2 +++ b/test/tools/javac/lambda/lambdaExpression/LambdaTest6.java	Mon Jan 06 13:39:07 2014 -0800
   175.3 @@ -1,5 +1,5 @@
   175.4  /*
   175.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
   175.6 + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
   175.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   175.8   *
   175.9   * This code is free software; you can redistribute it and/or modify it

   176.1 --- a/test/tools/javac/lambda/lambdaExpression/SamConversionComboTest.java	Tue Dec 24 14:14:23 2013 -0800
   176.2 +++ b/test/tools/javac/lambda/lambdaExpression/SamConversionComboTest.java	Mon Jan 06 13:39:07 2014 -0800
   176.3 @@ -1,5 +1,5 @@
   176.4  /*
   176.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
   176.6 + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
   176.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   176.8   *
   176.9   * This code is free software; you can redistribute it and/or modify it

   177.1 --- a/test/tools/javac/lambda/methodReference/BridgeMethod.java	Tue Dec 24 14:14:23 2013 -0800
   177.2 +++ b/test/tools/javac/lambda/methodReference/BridgeMethod.java	Mon Jan 06 13:39:07 2014 -0800
   177.3 @@ -1,5 +1,5 @@
   177.4  /*
   177.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
   177.6 + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
   177.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   177.8   *
   177.9   * This code is free software; you can redistribute it and/or modify it

   178.1 --- a/test/tools/javac/lambda/methodReference/SamConversion.java	Tue Dec 24 14:14:23 2013 -0800
   178.2 +++ b/test/tools/javac/lambda/methodReference/SamConversion.java	Mon Jan 06 13:39:07 2014 -0800
   178.3 @@ -1,5 +1,5 @@
   178.4  /*
   178.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   178.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   178.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   178.8   *
   178.9   * This code is free software; you can redistribute it and/or modify it

   179.1 --- a/test/tools/javac/lambda/methodReference/SamConversionComboTest.java	Tue Dec 24 14:14:23 2013 -0800
   179.2 +++ b/test/tools/javac/lambda/methodReference/SamConversionComboTest.java	Mon Jan 06 13:39:07 2014 -0800
   179.3 @@ -1,5 +1,5 @@
   179.4  /*
   179.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   179.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   179.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   179.8   *
   179.9   * This code is free software; you can redistribute it and/or modify it

   180.1 --- a/test/tools/javac/lambda/typeInference/InferenceTest2b.java	Tue Dec 24 14:14:23 2013 -0800
   180.2 +++ b/test/tools/javac/lambda/typeInference/InferenceTest2b.java	Mon Jan 06 13:39:07 2014 -0800
   180.3 @@ -1,5 +1,5 @@
   180.4  /*
   180.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
   180.6 + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
   180.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   180.8   *
   180.9   * This code is free software; you can redistribute it and/or modify it

   181.1 --- a/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/Compiler.java	Tue Dec 24 14:14:23 2013 -0800
   181.2 +++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/Compiler.java	Mon Jan 06 13:39:07 2014 -0800
   181.3 @@ -1,5 +1,5 @@
   181.4  /*
   181.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   181.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   181.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   181.8   *
   181.9   * This code is free software; you can redistribute it and/or modify it

   182.1 --- a/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/SourceModel.java	Tue Dec 24 14:14:23 2013 -0800
   182.2 +++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/SourceModel.java	Mon Jan 06 13:39:07 2014 -0800
   182.3 @@ -1,5 +1,5 @@
   182.4  /*
   182.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   182.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   182.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   182.8   *
   182.9   * This code is free software; you can redistribute it and/or modify it

   183.1 --- a/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/TestHarness.java	Tue Dec 24 14:14:23 2013 -0800
   183.2 +++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/TestHarness.java	Mon Jan 06 13:39:07 2014 -0800
   183.3 @@ -1,5 +1,5 @@
   183.4  /*
   183.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   183.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   183.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   183.8   *
   183.9   * This code is free software; you can redistribute it and/or modify it

   184.1 --- a/test/tools/javac/multicatch/Pos05.java	Tue Dec 24 14:14:23 2013 -0800
   184.2 +++ b/test/tools/javac/multicatch/Pos05.java	Mon Jan 06 13:39:07 2014 -0800
   184.3 @@ -1,5 +1,5 @@
   184.4  /*
   184.5 - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
   184.6 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
   184.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   184.8   *
   184.9   * This code is free software; you can redistribute it and/or modify it

   185.1 --- a/test/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java	Tue Dec 24 14:14:23 2013 -0800
   185.2 +++ b/test/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java	Mon Jan 06 13:39:07 2014 -0800
   185.3 @@ -1,5 +1,5 @@
   185.4  /*
   185.5 - * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
   185.6 + * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
   185.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   185.8   *
   185.9   * This code is free software; you can redistribute it and/or modify it

   186.1 --- a/test/tools/javac/resolve/Pos.java	Tue Dec 24 14:14:23 2013 -0800
   186.2 +++ b/test/tools/javac/resolve/Pos.java	Mon Jan 06 13:39:07 2014 -0800
   186.3 @@ -1,5 +1,5 @@
   186.4  /*
   186.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
   186.6 + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
   186.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   186.8   *
   186.9   * This code is free software; you can redistribute it and/or modify it

   187.1 --- a/test/tools/javac/resolve/ResolveHarness.java	Tue Dec 24 14:14:23 2013 -0800
   187.2 +++ b/test/tools/javac/resolve/ResolveHarness.java	Mon Jan 06 13:39:07 2014 -0800
   187.3 @@ -1,5 +1,5 @@
   187.4  /*
   187.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
   187.6 + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
   187.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   187.8   *
   187.9   * This code is free software; you can redistribute it and/or modify it

   188.1 --- a/test/tools/javac/resolve/tests/PrimitiveOverReferenceVarargsAmbiguous.java	Tue Dec 24 14:14:23 2013 -0800
   188.2 +++ b/test/tools/javac/resolve/tests/PrimitiveOverReferenceVarargsAmbiguous.java	Mon Jan 06 13:39:07 2014 -0800
   188.3 @@ -1,5 +1,5 @@
   188.4  /*
   188.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
   188.6 + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
   188.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   188.8   *
   188.9   * This code is free software; you can redistribute it and/or modify it

   189.1 --- a/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAnotherAuxiliary.java	Tue Dec 24 14:14:23 2013 -0800
   189.2 +++ b/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAnotherAuxiliary.java	Mon Jan 06 13:39:07 2014 -0800
   189.3 @@ -1,5 +1,5 @@
   189.4  /*
   189.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   189.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   189.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   189.8   *
   189.9   * This code is free software; you can redistribute it and/or modify it

   190.1 --- a/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary.java	Tue Dec 24 14:14:23 2013 -0800
   190.2 +++ b/test/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary.java	Mon Jan 06 13:39:07 2014 -0800
   190.3 @@ -1,5 +1,5 @@
   190.4  /*
   190.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   190.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   190.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   190.8   *
   190.9   * This code is free software; you can redistribute it and/or modify it

   191.1 --- a/test/tools/javac/warnings/AuxiliaryClass/SelfClassWithAux.java	Tue Dec 24 14:14:23 2013 -0800
   191.2 +++ b/test/tools/javac/warnings/AuxiliaryClass/SelfClassWithAux.java	Mon Jan 06 13:39:07 2014 -0800
   191.3 @@ -1,5 +1,5 @@
   191.4  /*
   191.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   191.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   191.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   191.8   *
   191.9   * This code is free software; you can redistribute it and/or modify it

   192.1 --- a/test/tools/javadoc/api/basic/APITest.java	Tue Dec 24 14:14:23 2013 -0800
   192.2 +++ b/test/tools/javadoc/api/basic/APITest.java	Mon Jan 06 13:39:07 2014 -0800
   192.3 @@ -202,12 +202,6 @@
   192.4          "pkg/package-frame.html",
   192.5          "pkg/package-summary.html",
   192.6          "pkg/package-tree.html",
   192.7 -        "resources/background.gif",
   192.8 -        "resources/tab.gif",
   192.9 -        "resources/activetitlebar_end.gif",
  192.10 -        "resources/activetitlebar.gif",
  192.11 -        "resources/titlebar_end.gif",
  192.12 -        "resources/titlebar.gif",
  192.13          "script.js",
  192.14          "stylesheet.css"
  192.15      ));

   193.1 --- a/test/tools/jdeps/APIDeps.java	Tue Dec 24 14:14:23 2013 -0800
   193.2 +++ b/test/tools/jdeps/APIDeps.java	Mon Jan 06 13:39:07 2014 -0800
   193.3 @@ -1,5 +1,5 @@
   193.4  /*
   193.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   193.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   193.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   193.8   *
   193.9   * This code is free software; you can redistribute it and/or modify it

   194.1 --- a/test/tools/jdeps/p/Foo.java	Tue Dec 24 14:14:23 2013 -0800
   194.2 +++ b/test/tools/jdeps/p/Foo.java	Mon Jan 06 13:39:07 2014 -0800
   194.3 @@ -1,5 +1,5 @@
   194.4  /*
   194.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   194.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   194.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   194.8   *
   194.9   * This code is free software; you can redistribute it and/or modify it

.hgtags		file \| annotate \| diff \| comparison \| revisions
src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/activetitlebar.gif		file \| annotate \| diff \| comparison \| revisions
src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/activetitlebar_end.gif		file \| annotate \| diff \| comparison \| revisions
src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/background.gif		file \| annotate \| diff \| comparison \| revisions
src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/tab.gif		file \| annotate \| diff \| comparison \| revisions
src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/titlebar.gif		file \| annotate \| diff \| comparison \| revisions
src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/titlebar_end.gif		file \| annotate \| diff \| comparison \| revisions

Mercurial > jdk8-mips64-public > langtools / changeset

changeset

Merge jdk8u5-b03