diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java index c171e10132a..69cabd5427d 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java @@ -271,7 +271,7 @@ public class LinkTaglet extends BaseTaglet { } if (utils.isExecutableElement(refMem)) { if (refMemName.indexOf('(') < 0) { - refMemName += utils.makeSignature((ExecutableElement) refMem, null, true); + refMemName += utils.makeSignature((ExecutableElement) refMem, null, false, true); } if (overriddenMethod != null) { // The method to actually link. diff --git a/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTaglet.java b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTaglet.java index 54faadcee1e..422b0fcddc8 100644 --- a/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTaglet.java +++ b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTaglet.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2024, 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 @@ -24,7 +24,7 @@ /* * @test * @bug 4732864 6280605 7064544 8014636 8016328 8025633 8071982 8182765 - * 8274781 + * 8274781 8345664 * @summary Make sure that you can link from one member to another using * non-qualified name, furthermore, ensure the right one is linked. * @library ../../lib @@ -50,6 +50,17 @@ public class TestLinkTaglet extends JavadocTester { "pkg", testSrc("checkPkg/B.java")); checkExit(Exit.OK); + checkOutput("pkg/package-summary.html", true, + """ + Qualified Link: C.InnerC.
+ Unqualified Link1: C.InnerC.
+ Unqualified Link2: C.InnerC.
+ Qualified Link: C.method(pkg.\ + C.InnerC, pkg.C.InnerC2).
+ Unqualified Link: C.method(C.InnerC, C.InnerC2).
+ Unqualified Link: C.method(InnerC, InnerC2).
+ Link w/o Signature: C.method(C.InnerC, C.InnerC2).
+ Package Link: pkg.
"""); checkOutput("pkg/C.html", true, """ Qualified Link: C.InnerC.
@@ -59,6 +70,7 @@ public class TestLinkTaglet extends JavadocTester { C.InnerC, pkg.C.InnerC2).
Unqualified Link: method(C.InnerC, C.InnerC2).
Unqualified Link: method(InnerC, InnerC2).
+ Link w/o Signature: method(C.InnerC, C.InnerC2).
Package Link: pkg.
"""); checkOutput("pkg/C.InnerC.html", true, diff --git a/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTagletWithModule.java b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTagletWithModule.java index 3adfe661965..86d678fbaa5 100644 --- a/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTagletWithModule.java +++ b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTagletWithModule.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2024, 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 @@ -76,7 +76,7 @@ public class TestLinkTagletWithModule extends JavadocTester { m1 package link Lib - Lib.method(java.lang.String) + Lib.method(String) Lib.method(String) m2 m2 @@ -110,7 +110,7 @@ public class TestLinkTagletWithModule extends JavadocTester { Lib Lib.method(java.lang.String) + interface in com.m1.lib" class="external-link">Lib.method(String) Lib.method(String) m2 diff --git a/test/langtools/jdk/javadoc/doclet/testLinkTaglet/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/pkg/C.java index 97b3f402235..16e788595ff 100644 --- a/test/langtools/jdk/javadoc/doclet/testLinkTaglet/pkg/C.java +++ b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/pkg/C.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2024, 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 @@ -30,6 +30,7 @@ package pkg; * Qualified Link: {@link #method(pkg.C.InnerC, pkg.C.InnerC2)}.
* Unqualified Link: {@link #method(C.InnerC, C.InnerC2)}.
* Unqualified Link: {@link #method(InnerC, InnerC2)}.
+ * Link w/o Signature: {@link #method}.
* Package Link: {@link pkg}.
* * diff --git a/test/langtools/jdk/javadoc/doclet/testNestedGenerics/TestNestedGenerics.java b/test/langtools/jdk/javadoc/doclet/testNestedGenerics/TestNestedGenerics.java index b34574a592d..ce5ec77a573 100644 --- a/test/langtools/jdk/javadoc/doclet/testNestedGenerics/TestNestedGenerics.java +++ b/test/langtools/jdk/javadoc/doclet/testNestedGenerics/TestNestedGenerics.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2024, 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 6758050 8025633 8182765 + * @bug 6758050 8025633 8182765 8345664 * @summary Test HTML output for nested generic types. * @library ../../lib * @modules jdk.javadoc/jdk.javadoc.internal.tool @@ -49,7 +49,6 @@ public class TestNestedGenerics extends JavadocTester { checkOutput("pkg/NestedGenerics.html", true, """ -
Contains foo(java.util.Ma\ - p<A, java.util.Map<A, A>>)
"""); +
Contains foo(Map)
"""); } } diff --git a/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTagWithModule.java b/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTagWithModule.java index 6864aca1959..810db378394 100644 --- a/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTagWithModule.java +++ b/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTagWithModule.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2024, 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 @@ -79,13 +79,13 @@ public class TestSeeTagWithModule extends JavadocTester {
  • m1
  • com.m1.lib
  • Lib
    • -
  • Lib.method(java.lang.String)
    • +
  • Lib.method(String)
  • Lib.method(String)
  • m2
  • m2
  • com.m2.lib
  • Lib
    • -
  • Lib.method(java.lang.String)
    • +
  • Lib.method(String)
  • Lib.method(String)
    • """); } @@ -115,7 +115,7 @@ public class TestSeeTagWithModule extends JavadocTester {
  • m1/com.m1.lib
  • Lib
  • Lib.method(java.lang.String)
    • + interface in com.m1.lib" class="external-link">Lib.method(String)
  • Lib.method(String)
  • m2
    • @@ -123,7 +123,7 @@ public class TestSeeTagWithModule extends JavadocTester {
  • m2/com.m2.lib
  • Lib
  • Lib.method(java.lang.String)
    • + interface in com.m2.lib" class="external-link">Lib.method(String)
  • Lib.method(String)
    • """);