Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/.hgtags	Sat Oct 24 16:18:48 2020 +0800
     1.2 +++ b/.hgtags	Sat Oct 24 16:44:00 2020 +0800
     1.3 @@ -1070,8 +1070,23 @@
     1.4  6df22f7cfdf1154526a79982cb99fbd7684b0bbd jdk8u262-b03
     1.5  094173db293ac68326b38333a3570bdb0d407b43 jdk8u262-b04
     1.6  07fc22e7080d7440c5e8bea06dc36548bcb065b2 jdk8u262-b05
     1.7 +07fc22e7080d7440c5e8bea06dc36548bcb065b2 jdk8u272-b00
     1.8  26690d83c12ed384b919f7c67b70d2000f999bdf jdk8u262-b06
     1.9  774e6c9b92965430835ea842724348c39692c542 jdk8u262-b07
    1.10  ac5fce89162167996468e6466abe5cfcc8185bde jdk8u262-b08
    1.11  747fe2026aa872ee5444e6c24653d054b1aef58c jdk8u262-b09
    1.12 +fd4d3f8b2c2de81cac967f56ec69f82a7c6b0e9d jdk8u262-b10
    1.13 +fd4d3f8b2c2de81cac967f56ec69f82a7c6b0e9d jdk8u262-ga
    1.14  0c0a27687e23c5c2b6e4bb64e2eed33d7e9340a0 mips-jdk8u262-b10
    1.15 +fd4d3f8b2c2de81cac967f56ec69f82a7c6b0e9d jdk8u265-b00
    1.16 +e0342245812afc794e3537380c7025683424d07e jdk8u265-b01
    1.17 +e0342245812afc794e3537380c7025683424d07e jdk8u265-ga
    1.18 +a51cd1abb0c93552857885b1ba53592c786714d2 jdk8u272-b01
    1.19 +54f67143c9566104641b6c69ce33f541d0f5f350 jdk8u272-b02
    1.20 +4e02b68de4582b99db1331852cb731914a47adba jdk8u272-b03
    1.21 +a317abfcbd909b1c094e250afb0cb618e363e938 jdk8u272-b04
    1.22 +f1fa9a70296a0ce38c6e315fb3ee107aa32f6b42 jdk8u272-b05
    1.23 +b974f43a589fa0ca7be9d0a62673929229a2a4e7 jdk8u272-b06
    1.24 +a56fbe019ae89f55aae083d29b24f83290affe5d jdk8u272-b07
    1.25 +462446582ece03a945b8d6b7714ac3c19f07ff25 jdk8u272-b08
    1.26 +acab1eb3dc4c828f87500709d05ea2293baed60c jdk8u272-b09

     2.1 --- a/THIRD_PARTY_README	Sat Oct 24 16:18:48 2020 +0800
     2.2 +++ b/THIRD_PARTY_README	Sat Oct 24 16:44:00 2020 +0800
     2.3 @@ -2240,7 +2240,7 @@
     2.4  
     2.5  -------------------------------------------------------------------------------
     2.6  
     2.7 -%% This notice is provided with respect to PC/SC Lite v1.8.24,
     2.8 +%% This notice is provided with respect to PC/SC Lite v1.8.26,
     2.9  which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris.
    2.10  
    2.11  --- begin of LICENSE ---
    2.12 @@ -3028,8 +3028,7 @@
    2.13    Apache Commons Math 3.2
    2.14    Apache Derby 10.11.1.2
    2.15    Apache Jakarta BCEL 5.1 
    2.16 -  Apache Jakarta Regexp 1.4 
    2.17 -  Apache Santuario XML Security for Java 1.5.4
    2.18 +  Apache Santuario XML Security for Java 2.1.1
    2.19    Apache Xalan-Java 2.7.2
    2.20    Apache Xerces Java 2.10.0 
    2.21    Apache XML Resolver 1.1 
    2.22 @@ -3243,3 +3242,41 @@
    2.23  
    2.24  -------------------------------------------------------------------------------
    2.25  
    2.26 +%% This notice is provided with respect to OASIS PKCS #11 Cryptographic Token
    2.27 +Interface v2.40,  which may be included with JRE 8, JDK 8, and OpenJDK 8.
    2.28 +
    2.29 +--- begin of LICENSE ---
    2.30 +
    2.31 +Copyright (c) OASIS Open 2016. All Rights Reserved.
    2.32 +
    2.33 +All capitalized terms in the following text have the meanings assigned to them
    2.34 +in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
    2.35 +full Policy may be found at the OASIS website:
    2.36 +[http://www.oasis-open.org/policies-guidelines/ipr]
    2.37 +
    2.38 +This document and translations of it may be copied and furnished to others, and
    2.39 +derivative works that comment on or otherwise explain it or assist in its
    2.40 +implementation may be prepared, copied, published, and distributed, in whole or
    2.41 +in part, without restriction of any kind, provided that the above copyright
    2.42 +notice and this section are included on all such copies and derivative works.
    2.43 +However, this document itself may not be modified in any way, including by
    2.44 +removing the copyright notice or references to OASIS, except as needed for the
    2.45 +purpose of developing any document or deliverable produced by an OASIS
    2.46 +Technical Committee (in which case the rules applicable to copyrights, as set
    2.47 +forth in the OASIS IPR Policy, must be followed) or as required to translate it
    2.48 +into languages other than English.
    2.49 +
    2.50 +The limited permissions granted above are perpetual and will not be revoked by
    2.51 +OASIS or its successors or assigns.
    2.52 +
    2.53 +This document and the information contained herein is provided on an "AS IS"
    2.54 +basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
    2.55 +LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
    2.56 +INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
    2.57 +FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS MEMBERS WILL NOT BE LIABLE FOR
    2.58 +ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE
    2.59 +OF THIS DOCUMENT OR ANY PART THEREOF.
    2.60 +
    2.61 +--- end of LICENSE ---
    2.62 +
    2.63 +-------------------------------------------------------------------------------

     3.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Sat Oct 24 16:18:48 2020 +0800
     3.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Sat Oct 24 16:44:00 2020 +0800
     3.3 @@ -1,5 +1,5 @@
     3.4  /*
     3.5 - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
     3.6 + * Copyright (c) 1998, 2014, 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
    3.10 @@ -1441,7 +1441,8 @@
    3.11                  }
    3.12              }
    3.13              if (configuration.currentcd != containing) {
    3.14 -                refMemName = containing.name() + "." + refMemName;
    3.15 +                refMemName = (refMem instanceof ConstructorDoc) ?
    3.16 +                        refMemName : containing.name() + "." + refMemName;
    3.17              }
    3.18              if (refMem instanceof ExecutableMemberDoc) {
    3.19                  if (refMemName.indexOf('(') < 0) {

     4.1 --- a/src/share/classes/com/sun/tools/javac/resources/legacy.properties	Sat Oct 24 16:18:48 2020 +0800
     4.2 +++ b/src/share/classes/com/sun/tools/javac/resources/legacy.properties	Sat Oct 24 16:44:00 2020 +0800
     4.3 @@ -143,6 +143,7 @@
     4.4  com.sun.jndi.ldap.ext = tiger legacy
     4.5  com.sun.jndi.ldap.pool = tiger legacy
     4.6  com.sun.jndi.ldap.sasl = tiger legacy
     4.7 +com.sun.jndi.ldap.spi = tiger legacy
     4.8  com.sun.jndi.rmi.registry = tiger legacy
     4.9  com.sun.jndi.toolkit.corba = tiger legacy
    4.10  com.sun.jndi.toolkit.ctx = tiger legacy

     5.1 --- a/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java	Sat Oct 24 16:18:48 2020 +0800
     5.2 +++ b/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java	Sat Oct 24 16:44:00 2020 +0800
     5.3 @@ -502,6 +502,7 @@
     5.4              "org.w3c.dom.css",
     5.5              "org.w3c.dom.events",
     5.6              "org.w3c.dom.views",
     5.7 +            "com.sun.jndi.ldap.spi",
     5.8              "com.sun.management",
     5.9              "com.sun.security.auth",
    5.10              "com.sun.security.auth.callback",

     6.1 --- a/src/share/classes/com/sun/tools/javadoc/SeeTagImpl.java	Sat Oct 24 16:18:48 2020 +0800
     6.2 +++ b/src/share/classes/com/sun/tools/javadoc/SeeTagImpl.java	Sat Oct 24 16:44:00 2020 +0800
     6.3 @@ -1,5 +1,5 @@
     6.4  /*
     6.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
     6.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
     6.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     6.8   *
     6.9   * This code is free software; you can redistribute it and/or modify it
    6.10 @@ -399,7 +399,8 @@
    6.11  
    6.12      private MemberDoc findExecutableMember(String memName, String[] paramarr,
    6.13                                             ClassDoc referencedClass) {
    6.14 -        if (memName.equals(referencedClass.name())) {
    6.15 +        String className = referencedClass.name();
    6.16 +        if (memName.equals(className.substring(className.lastIndexOf(".") + 1))) {
    6.17              return ((ClassDocImpl)referencedClass).findConstructor(memName,
    6.18                                                                     paramarr);
    6.19          } else {   // it's a method.

     7.1 --- a/test/com/sun/javadoc/testConstructors/TestConstructors.java	Sat Oct 24 16:18:48 2020 +0800
     7.2 +++ b/test/com/sun/javadoc/testConstructors/TestConstructors.java	Sat Oct 24 16:44:00 2020 +0800
     7.3 @@ -1,5 +1,5 @@
     7.4  /*
     7.5 - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
     7.6 + * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
     7.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     7.8   *
     7.9   * This code is free software; you can redistribute it and/or modify it
    7.10 @@ -23,7 +23,7 @@
    7.11  
    7.12  /*
    7.13   * @test
    7.14 - * @bug 8025524
    7.15 + * @bug 8025524 8031625
    7.16   * @summary Test for constructor name which should be a non-qualified name.
    7.17   * @author Bhavesh Patel
    7.18   * @library ../lib/
    7.19 @@ -38,6 +38,21 @@
    7.20      //Input for string search tests.
    7.21      private static final String[][] TEST = {
    7.22          {BUG_ID + FS + "pkg1" + FS + "Outer.html",
    7.23 +            "<dt><span class=\"seeLabel\">See Also:</span></dt>" + NL +
    7.24 +            "<dd><a href=\"../pkg1/Outer.Inner.html#Inner--\"><code>Inner()</code></a>, " + NL +
    7.25 +            "<a href=\"../pkg1/Outer.Inner.html#Inner-int-\"><code>Inner(int)</code></a>, " + NL +
    7.26 +            "<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner--\"><code>NestedInner()</code></a>, " + NL +
    7.27 +            "<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner-int-\"><code>NestedInner(int)</code></a>, " + NL +
    7.28 +            "<a href=\"../pkg1/Outer.html#Outer--\"><code>Outer()</code></a>, " + NL +
    7.29 +            "<a href=\"../pkg1/Outer.html#Outer-int-\"><code>Outer(int)</code></a>"
    7.30 +        },
    7.31 +        {BUG_ID + FS + "pkg1" + FS + "Outer.html",
    7.32 +            "Link: <a href=\"../pkg1/Outer.Inner.html#Inner--\"><code>Inner()</code></a>, " +
    7.33 +            "<a href=\"../pkg1/Outer.html#Outer-int-\"><code>Outer(int)</code></a>, " +
    7.34 +            "<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner-int-\"><code>" +
    7.35 +            "NestedInner(int)</code></a>"
    7.36 +        },
    7.37 +        {BUG_ID + FS + "pkg1" + FS + "Outer.html",
    7.38              "<a href=\"../pkg1/Outer.html#Outer--\">Outer</a></span>()"
    7.39          },
    7.40          {BUG_ID + FS + "pkg1" + FS + "Outer.html",
    7.41 @@ -87,6 +102,18 @@
    7.42          },
    7.43          {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.NestedInner.html",
    7.44              "Outer.Inner.NestedInner-int-"
    7.45 +        },
    7.46 +        {BUG_ID + FS + "pkg1" + FS + "Outer.html",
    7.47 +            "<a href=\"../pkg1/Outer.Inner.html#Outer.Inner--\"><code>Outer.Inner()</code></a>"
    7.48 +        },
    7.49 +        {BUG_ID + FS + "pkg1" + FS + "Outer.html",
    7.50 +            "<a href=\"../pkg1/Outer.Inner.html#Outer.Inner-int-\"><code>Outer.Inner(int)</code></a>"
    7.51 +        },
    7.52 +        {BUG_ID + FS + "pkg1" + FS + "Outer.html",
    7.53 +            "<a href=\"../pkg1/Outer.Inner.NestedInner.html#Outer.Inner.NestedInner--\"><code>Outer.Inner.NestedInner()</code></a>"
    7.54 +        },
    7.55 +        {BUG_ID + FS + "pkg1" + FS + "Outer.html",
    7.56 +            "<a href=\"../pkg1/Outer.Inner.NestedInner.html#Outer.Inner.NestedInner-int-\"><code>Outer.Inner.NestedInner(int)</code></a>"
    7.57          }
    7.58      };
    7.59  

     8.1 --- a/test/com/sun/javadoc/testConstructors/pkg1/Outer.java	Sat Oct 24 16:18:48 2020 +0800
     8.2 +++ b/test/com/sun/javadoc/testConstructors/pkg1/Outer.java	Sat Oct 24 16:44:00 2020 +0800
     8.3 @@ -1,5 +1,5 @@
     8.4  /*
     8.5 - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
     8.6 + * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
     8.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     8.8   *
     8.9   * This code is free software; you can redistribute it and/or modify it
    8.10 @@ -23,6 +23,17 @@
    8.11  
    8.12  package pkg1;
    8.13  
    8.14 +/**
    8.15 + * Test link tag.
    8.16 + * Link: {@link pkg1.Outer.Inner#Inner()}, {@link pkg1.Outer#Outer(int)}, {@link pkg1.Outer.Inner.NestedInner#NestedInner(int)}
    8.17 + *
    8.18 + * @see Outer.Inner#Inner()
    8.19 + * @see Outer.Inner#Inner(int)
    8.20 + * @see Outer.Inner.NestedInner#NestedInner()
    8.21 + * @see Outer.Inner.NestedInner#NestedInner(int)
    8.22 + * @see Outer#Outer()
    8.23 + * @see Outer#Outer(int)
    8.24 + */
    8.25  public class Outer {
    8.26  
    8.27      /**