stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8202626: javadoc generates broken links to <Unnamed>

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Priya Lakshmi Muthuswamy 2019-01-16 11:15:25 +05:30
parent 38cf9d76c8
commit 744d6085b4
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java
View File

@ -183,7 +183,7 @@ public class PackageUseWriter extends SubWriterHolderWriter {
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast); .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);
for (String pkgname: usingPackageToUsedClasses.keySet()) { for (String pkgname: usingPackageToUsedClasses.keySet()) {
PackageElement pkg = utils.elementUtils.getPackageElement(pkgname); PackageElement pkg = utils.elementUtils.getPackageElement(pkgname);
Content packageLink = links.createLink(utils.getPackageName(pkg), Content packageLink = links.createLink(getPackageAnchorName(pkg),
new StringContent(utils.getPackageName(pkg))); new StringContent(utils.getPackageName(pkg)));
Content summary = new ContentBuilder(); Content summary = new ContentBuilder();
if (pkg != null && !pkg.isUnnamed()) { if (pkg != null && !pkg.isUnnamed()) {
@ -209,9 +209,7 @@ public class PackageUseWriter extends SubWriterHolderWriter {
PackageElement usingPackage = utils.elementUtils.getPackageElement(packageName); PackageElement usingPackage = utils.elementUtils.getPackageElement(packageName);
HtmlTree li = new HtmlTree(HtmlTag.LI); HtmlTree li = new HtmlTree(HtmlTag.LI);
li.setStyle(HtmlStyle.blockList); li.setStyle(HtmlStyle.blockList);
if (usingPackage != null) { li.addContent(links.createAnchor(getPackageAnchorName(usingPackage)));
li.addContent(links.createAnchor(utils.getPackageName(usingPackage)));
}
String tableSummary = resources.getText("doclet.Use_Table_Summary", String tableSummary = resources.getText("doclet.Use_Table_Summary",
resources.getText("doclet.classes")); resources.getText("doclet.classes"));
Content caption = contents.getContent( Content caption = contents.getContent(

5
test/langtools/jdk/javadoc/doclet/testPackageDeprecation/TestPackageDeprecation.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -23,7 +23,7 @@
/* /*
* @test * @test
* @bug 6492694 8026567 8048351 8162363 8183511 8169819 8074407 8196202 * @bug 6492694 8026567 8048351 8162363 8183511 8169819 8074407 8196202 8202626
* @summary Test package deprecation. * @summary Test package deprecation.
* @author bpatel * @author bpatel
* @library ../../lib/ * @library ../../lib/
@ -38,7 +38,6 @@ public class TestPackageDeprecation extends JavadocTester {
public static void main(String... args) throws Exception { public static void main(String... args) throws Exception {
TestPackageDeprecation tester = new TestPackageDeprecation(); TestPackageDeprecation tester = new TestPackageDeprecation();
tester.setAutomaticCheckLinks(false); // @ignore JDK-8202626
tester.runTests(); tester.runTests();
} }

9
test/langtools/jdk/javadoc/doclet/testUseOption/TestUseOption.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -24,7 +24,7 @@
/* /*
* @test * @test
* @bug 4496290 4985072 7006178 7068595 8016328 8050031 8048351 8081854 8071982 8162363 8175200 8186332 * @bug 4496290 4985072 7006178 7068595 8016328 8050031 8048351 8081854 8071982 8162363 8175200 8186332
* 8182765 8196202 * 8182765 8196202 8202626
* @summary A simple test to ensure class-use files are correct. * @summary A simple test to ensure class-use files are correct.
* @author jamieh * @author jamieh
* @library ../../lib * @library ../../lib
@ -39,7 +39,6 @@ public class TestUseOption extends JavadocTester {
public static void main(String... args) throws Exception { public static void main(String... args) throws Exception {
TestUseOption tester = new TestUseOption(); TestUseOption tester = new TestUseOption();
tester.setAutomaticCheckLinks(false); // @ignore JDK-8202626
tester.runTests(); tester.runTests();
} }
@ -201,7 +200,7 @@ public class TestUseOption extends JavadocTester {
checkOutput("package-use.html", true, checkOutput("package-use.html", true,
"<th class=\"colFirst\" scope=\"row\">" "<th class=\"colFirst\" scope=\"row\">"
+ "<a href=\"class-use/UsedInC.html#unnamed.package\">UsedInC</a></th>", + "<a href=\"class-use/UsedInC.html#unnamed.package\">UsedInC</a></th>",
"<th class=\"colFirst\" scope=\"row\"><a href=\"#%3CUnnamed%3E\">&lt;Unnamed&gt;</a></th>\n" "<th class=\"colFirst\" scope=\"row\"><a href=\"#unnamed.package\">&lt;Unnamed&gt;</a></th>\n"
+ "<td class=\"colLast\">&nbsp;</td>" + "<td class=\"colLast\">&nbsp;</td>"
); );
} }
@ -219,7 +218,7 @@ public class TestUseOption extends JavadocTester {
"<li class=\"blockList\"><a name=\"unnamed.package\">" "<li class=\"blockList\"><a name=\"unnamed.package\">"
); );
checkOutput("package-use.html", true, checkOutput("package-use.html", true,
"<th class=\"colFirst\" scope=\"row\"><a href=\"#-Unnamed-\">&lt;Unnamed&gt;</a></th>\n" "<th class=\"colFirst\" scope=\"row\"><a href=\"#unnamed.package\">&lt;Unnamed&gt;</a></th>\n"
+ "<td class=\"colLast\">&nbsp;</td>" + "<td class=\"colLast\">&nbsp;</td>"
); );
} }