Mercurial > jdk8-mips64-public > langtools / changeset
changeset
Merge
Fri, 24 Jul 2020 13:37:10 +0100
- author
- andrew
- date
- Fri, 24 Jul 2020 13:37:10 +0100
- changeset 3914
- 6011510e3c4e
- parent 3912
- d32c7447d4c0
- parent 3913
- 242d0ecf82e4
- child 3915
- a51cd1abb0c9
Merge
1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Fri Jul 24 13:16:57 2020 +0100 1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Fri Jul 24 13:37:10 2020 +0100 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -1441,7 +1441,8 @@ 1.11 } 1.12 } 1.13 if (configuration.currentcd != containing) { 1.14 - refMemName = containing.name() + "." + refMemName; 1.15 + refMemName = (refMem instanceof ConstructorDoc) ? 1.16 + refMemName : containing.name() + "." + refMemName; 1.17 } 1.18 if (refMem instanceof ExecutableMemberDoc) { 1.19 if (refMemName.indexOf('(') < 0) {
2.1 --- a/src/share/classes/com/sun/tools/javadoc/SeeTagImpl.java Fri Jul 24 13:16:57 2020 +0100 2.2 +++ b/src/share/classes/com/sun/tools/javadoc/SeeTagImpl.java Fri Jul 24 13:37:10 2020 +0100 2.3 @@ -1,5 +1,5 @@ 2.4 /* 2.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 2.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. 2.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.8 * 2.9 * This code is free software; you can redistribute it and/or modify it 2.10 @@ -399,7 +399,8 @@ 2.11 2.12 private MemberDoc findExecutableMember(String memName, String[] paramarr, 2.13 ClassDoc referencedClass) { 2.14 - if (memName.equals(referencedClass.name())) { 2.15 + String className = referencedClass.name(); 2.16 + if (memName.equals(className.substring(className.lastIndexOf(".") + 1))) { 2.17 return ((ClassDocImpl)referencedClass).findConstructor(memName, 2.18 paramarr); 2.19 } else { // it's a method.
3.1 --- a/test/com/sun/javadoc/testConstructors/TestConstructors.java Fri Jul 24 13:16:57 2020 +0100 3.2 +++ b/test/com/sun/javadoc/testConstructors/TestConstructors.java Fri Jul 24 13:37:10 2020 +0100 3.3 @@ -1,5 +1,5 @@ 3.4 /* 3.5 - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. 3.6 + * Copyright (c) 2013, 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 @@ -23,7 +23,7 @@ 3.11 3.12 /* 3.13 * @test 3.14 - * @bug 8025524 3.15 + * @bug 8025524 8031625 3.16 * @summary Test for constructor name which should be a non-qualified name. 3.17 * @author Bhavesh Patel 3.18 * @library ../lib/ 3.19 @@ -38,6 +38,21 @@ 3.20 //Input for string search tests. 3.21 private static final String[][] TEST = { 3.22 {BUG_ID + FS + "pkg1" + FS + "Outer.html", 3.23 + "<dt><span class=\"seeLabel\">See Also:</span></dt>" + NL + 3.24 + "<dd><a href=\"../pkg1/Outer.Inner.html#Inner--\"><code>Inner()</code></a>, " + NL + 3.25 + "<a href=\"../pkg1/Outer.Inner.html#Inner-int-\"><code>Inner(int)</code></a>, " + NL + 3.26 + "<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner--\"><code>NestedInner()</code></a>, " + NL + 3.27 + "<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner-int-\"><code>NestedInner(int)</code></a>, " + NL + 3.28 + "<a href=\"../pkg1/Outer.html#Outer--\"><code>Outer()</code></a>, " + NL + 3.29 + "<a href=\"../pkg1/Outer.html#Outer-int-\"><code>Outer(int)</code></a>" 3.30 + }, 3.31 + {BUG_ID + FS + "pkg1" + FS + "Outer.html", 3.32 + "Link: <a href=\"../pkg1/Outer.Inner.html#Inner--\"><code>Inner()</code></a>, " + 3.33 + "<a href=\"../pkg1/Outer.html#Outer-int-\"><code>Outer(int)</code></a>, " + 3.34 + "<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner-int-\"><code>" + 3.35 + "NestedInner(int)</code></a>" 3.36 + }, 3.37 + {BUG_ID + FS + "pkg1" + FS + "Outer.html", 3.38 "<a href=\"../pkg1/Outer.html#Outer--\">Outer</a></span>()" 3.39 }, 3.40 {BUG_ID + FS + "pkg1" + FS + "Outer.html", 3.41 @@ -87,6 +102,18 @@ 3.42 }, 3.43 {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.NestedInner.html", 3.44 "Outer.Inner.NestedInner-int-" 3.45 + }, 3.46 + {BUG_ID + FS + "pkg1" + FS + "Outer.html", 3.47 + "<a href=\"../pkg1/Outer.Inner.html#Outer.Inner--\"><code>Outer.Inner()</code></a>" 3.48 + }, 3.49 + {BUG_ID + FS + "pkg1" + FS + "Outer.html", 3.50 + "<a href=\"../pkg1/Outer.Inner.html#Outer.Inner-int-\"><code>Outer.Inner(int)</code></a>" 3.51 + }, 3.52 + {BUG_ID + FS + "pkg1" + FS + "Outer.html", 3.53 + "<a href=\"../pkg1/Outer.Inner.NestedInner.html#Outer.Inner.NestedInner--\"><code>Outer.Inner.NestedInner()</code></a>" 3.54 + }, 3.55 + {BUG_ID + FS + "pkg1" + FS + "Outer.html", 3.56 + "<a href=\"../pkg1/Outer.Inner.NestedInner.html#Outer.Inner.NestedInner-int-\"><code>Outer.Inner.NestedInner(int)</code></a>" 3.57 } 3.58 }; 3.59
4.1 --- a/test/com/sun/javadoc/testConstructors/pkg1/Outer.java Fri Jul 24 13:16:57 2020 +0100 4.2 +++ b/test/com/sun/javadoc/testConstructors/pkg1/Outer.java Fri Jul 24 13:37:10 2020 +0100 4.3 @@ -1,5 +1,5 @@ 4.4 /* 4.5 - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. 4.6 + * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. 4.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4.8 * 4.9 * This code is free software; you can redistribute it and/or modify it 4.10 @@ -23,6 +23,17 @@ 4.11 4.12 package pkg1; 4.13 4.14 +/** 4.15 + * Test link tag. 4.16 + * Link: {@link pkg1.Outer.Inner#Inner()}, {@link pkg1.Outer#Outer(int)}, {@link pkg1.Outer.Inner.NestedInner#NestedInner(int)} 4.17 + * 4.18 + * @see Outer.Inner#Inner() 4.19 + * @see Outer.Inner#Inner(int) 4.20 + * @see Outer.Inner.NestedInner#NestedInner() 4.21 + * @see Outer.Inner.NestedInner#NestedInner(int) 4.22 + * @see Outer#Outer() 4.23 + * @see Outer#Outer(int) 4.24 + */ 4.25 public class Outer { 4.26 4.27 /**
