[11u] RFR: 8240169: javadoc fails to link to non-modular api docs

Lindenmaier, Goetz goetz.lindenmaier at sap.com
Tue Jul 7 11:52:01 UTC 2020


Hi

I am downporting this for parity with 11.0.9-oracle.
http://cr.openjdk.java.net/~goetz/wr20/8240169-javadoc-jdk11/01/
I had to do a row of adaptions to this change.


src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Extern.java

The code differs slightly because in 11, configuration.utils is dereferenced
everywhere, but in 15 utils is saved in a field of the object.
Further down, put() is used in 11 where putIfAbsent() is used in 15.
Further, code is formatted differently.

Another chunk uses resources.getText, where in 11 it is configuration.getText.

In checkLinkCompatibility() I added {} so it looks similar to 15.

Besides resolving, I had to add "import javax.tools.Diagnostic.Kind;"


JavadocTester.java

15 prints the faulty html file if the test fails.
This was introduced in "8210031: implementation for JVM Constants API"
which is huge. 
I would like to include this printing in this change, as it helps
a lot to understand the issue if the test fails.
It helped me to find out where I had resolved wrong.


test/langtools/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java

The method is marked public in 15, therefore the patch does not apply.
Further, I had to adapt the templates matched. In 11, 
"?is-external=true" is printed to the urls and "externalLink" is
"external-link" in 15. Also, the "Overrides" heading is formatted differently.


TestLinkOptionWithModule.java

This needed similar adaptions of patterns as TestClassCrossReferences.java.

Please review.
https://bugs.openjdk.java.net/browse/JDK-8240169
https://hg.openjdk.java.net/jdk/jdk/rev/3b557aef43c4

Best regards,
  Goetz.



More information about the jdk-updates-dev mailing list