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

8274781: Use monospace font for enclosing interface

Browse Source 
Reviewed-by: prappo
This commit is contained in:
Hannes Wallnöfer 2021-10-14 12:19:26 +00:00
parent 333c4692d8
commit 8d9004b7f4
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
View File

@ -381,10 +381,7 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite
dl.add(HtmlTree.DT(utils.isInterface(e)
? contents.enclosingInterfaceLabel
: contents.enclosingClassLabel));
Content dd = new HtmlTree(TagName.DD);
dd.add(getLink(new HtmlLinkInfo(configuration,
HtmlLinkInfo.Kind.CLASS, e)));
dl.add(dd);
dl.add(HtmlTree.DD(getClassLinks(HtmlLinkInfo.Kind.CLASS, List.of(e))));
classInfoTree.add(dl);
return null;
}
@ -404,7 +401,7 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite
}
public boolean isFunctionalInterface() {
List<? extends AnnotationMirror> annotationMirrors = ((Element) typeElement).getAnnotationMirrors();
List<? extends AnnotationMirror> annotationMirrors = typeElement.getAnnotationMirrors();
for (AnnotationMirror anno : annotationMirrors) {
if (utils.isFunctionalInterface(anno)) {
return true;

2
test/langtools/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java
View File

@ -143,7 +143,7 @@ public class TestHiddenTag extends JavadocTester {
checkOutput("pkg1/InvisibleParent.VisibleInner.html", true,
"""
<dt>Enclosing class:</dt>
<dd>pkg1.InvisibleParent&lt;T extends pkg1.InvisibleParent&gt;</dd>
<dd><code>pkg1.InvisibleParent&lt;T extends pkg1.InvisibleParent&gt;</code></dd>
</dl>""");
checkOutput("pkg1/package-summary.html", false, "A.InvisibleInner");

5
test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTaglet.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2021, 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,6 +24,7 @@
/*
* @test
* @bug 4732864 6280605 7064544 8014636 8016328 8025633 8071982 8182765
* 8274781
* @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
@ -70,7 +71,7 @@ public class TestLinkTaglet extends JavadocTester {
"""
<dl class="notes">
<dt>Enclosing class:</dt>
<dd><a href="C.html" title="class in pkg">C</a></dd>
<dd><code><a href="C.html" title="class in pkg">C</a></code></dd>
</dl>""");
checkOutput(Output.OUT, false,