Mercurial > hg > openjdk > jdk8u > langtools
changeset 3869:6011510e3c4e
Merge
author | andrew |
---|---|
date | Fri, 24 Jul 2020 13:37:10 +0100 |
parents | d32c7447d4c0 (current diff) 242d0ecf82e4 (diff) |
children | a51cd1abb0c9 |
files | |
diffstat | 4 files changed, 47 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Fri Jul 24 13:16:57 2020 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Fri Jul 24 13:37:10 2020 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1441,7 +1441,8 @@ } } if (configuration.currentcd != containing) { - refMemName = containing.name() + "." + refMemName; + refMemName = (refMem instanceof ConstructorDoc) ? + refMemName : containing.name() + "." + refMemName; } if (refMem instanceof ExecutableMemberDoc) { if (refMemName.indexOf('(') < 0) {
--- a/src/share/classes/com/sun/tools/javadoc/SeeTagImpl.java Fri Jul 24 13:16:57 2020 +0100 +++ b/src/share/classes/com/sun/tools/javadoc/SeeTagImpl.java Fri Jul 24 13:37:10 2020 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -399,7 +399,8 @@ private MemberDoc findExecutableMember(String memName, String[] paramarr, ClassDoc referencedClass) { - if (memName.equals(referencedClass.name())) { + String className = referencedClass.name(); + if (memName.equals(className.substring(className.lastIndexOf(".") + 1))) { return ((ClassDocImpl)referencedClass).findConstructor(memName, paramarr); } else { // it's a method.
--- a/test/com/sun/javadoc/testConstructors/TestConstructors.java Fri Jul 24 13:16:57 2020 +0100 +++ b/test/com/sun/javadoc/testConstructors/TestConstructors.java Fri Jul 24 13:37:10 2020 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ /* * @test - * @bug 8025524 + * @bug 8025524 8031625 * @summary Test for constructor name which should be a non-qualified name. * @author Bhavesh Patel * @library ../lib/ @@ -38,6 +38,21 @@ //Input for string search tests. private static final String[][] TEST = { {BUG_ID + FS + "pkg1" + FS + "Outer.html", + "<dt><span class=\"seeLabel\">See Also:</span></dt>" + NL + + "<dd><a href=\"../pkg1/Outer.Inner.html#Inner--\"><code>Inner()</code></a>, " + NL + + "<a href=\"../pkg1/Outer.Inner.html#Inner-int-\"><code>Inner(int)</code></a>, " + NL + + "<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner--\"><code>NestedInner()</code></a>, " + NL + + "<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner-int-\"><code>NestedInner(int)</code></a>, " + NL + + "<a href=\"../pkg1/Outer.html#Outer--\"><code>Outer()</code></a>, " + NL + + "<a href=\"../pkg1/Outer.html#Outer-int-\"><code>Outer(int)</code></a>" + }, + {BUG_ID + FS + "pkg1" + FS + "Outer.html", + "Link: <a href=\"../pkg1/Outer.Inner.html#Inner--\"><code>Inner()</code></a>, " + + "<a href=\"../pkg1/Outer.html#Outer-int-\"><code>Outer(int)</code></a>, " + + "<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner-int-\"><code>" + + "NestedInner(int)</code></a>" + }, + {BUG_ID + FS + "pkg1" + FS + "Outer.html", "<a href=\"../pkg1/Outer.html#Outer--\">Outer</a></span>()" }, {BUG_ID + FS + "pkg1" + FS + "Outer.html", @@ -87,6 +102,18 @@ }, {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.NestedInner.html", "Outer.Inner.NestedInner-int-" + }, + {BUG_ID + FS + "pkg1" + FS + "Outer.html", + "<a href=\"../pkg1/Outer.Inner.html#Outer.Inner--\"><code>Outer.Inner()</code></a>" + }, + {BUG_ID + FS + "pkg1" + FS + "Outer.html", + "<a href=\"../pkg1/Outer.Inner.html#Outer.Inner-int-\"><code>Outer.Inner(int)</code></a>" + }, + {BUG_ID + FS + "pkg1" + FS + "Outer.html", + "<a href=\"../pkg1/Outer.Inner.NestedInner.html#Outer.Inner.NestedInner--\"><code>Outer.Inner.NestedInner()</code></a>" + }, + {BUG_ID + FS + "pkg1" + FS + "Outer.html", + "<a href=\"../pkg1/Outer.Inner.NestedInner.html#Outer.Inner.NestedInner-int-\"><code>Outer.Inner.NestedInner(int)</code></a>" } };
--- a/test/com/sun/javadoc/testConstructors/pkg1/Outer.java Fri Jul 24 13:16:57 2020 +0100 +++ b/test/com/sun/javadoc/testConstructors/pkg1/Outer.java Fri Jul 24 13:37:10 2020 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,6 +23,17 @@ package pkg1; +/** + * Test link tag. + * Link: {@link pkg1.Outer.Inner#Inner()}, {@link pkg1.Outer#Outer(int)}, {@link pkg1.Outer.Inner.NestedInner#NestedInner(int)} + * + * @see Outer.Inner#Inner() + * @see Outer.Inner#Inner(int) + * @see Outer.Inner.NestedInner#NestedInner() + * @see Outer.Inner.NestedInner#NestedInner(int) + * @see Outer#Outer() + * @see Outer#Outer(int) + */ public class Outer { /**