From 8851cb653ff932758ef6408ff010b67200954eff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Mon, 10 May 2021 20:25:43 +0000
Subject: [PATCH] 8266779: Use <wbr> instead of ZERO_WIDTH_SPACE
Reviewed-by: prappo
---
.../html/AbstractExecutableMemberWriter.java | 7 +-
.../doclets/formats/html/HtmlLinkFactory.java | 4 +-
.../doclets/formats/html/Signatures.java | 2 +-
.../doclets/formats/html/markup/Entity.java | 6 -
.../doclets/formats/html/markup/HtmlTree.java | 5 +-
.../doclets/formats/html/markup/TagName.java | 3 +-
.../testConstructors/TestConstructors.java | 6 +-
.../TestDeprecatedDocs.java | 6 +-
.../TestEnumConstructor.java | 4 +-
.../TestGenericTypeLink.java | 26 +-
.../testHtmlTableTags/TestHtmlTableTags.java | 18 +-
.../testIndentation/TestIndentation.java | 4 +-
.../doclet/testInterface/TestInterface.java | 18 +-
.../javadoc/doclet/testJavaFX/TestJavaFX.java | 24 +-
.../TestMemberInheritance.java | 22 +-
.../testMemberSummary/TestMemberSummary.java | 2 +-
.../doclet/testMethodId/TestMethodId.java | 2 +-
.../TestMethodSignature.java | 55 ++-
.../TestNewLanguageFeatures.java | 74 ++--
.../TestOverrideMethods.java | 33 +-
.../TestPrivateClasses.java | 10 +-
.../testRecordTypes/TestRecordTypes.java | 10 +-
.../TestSerializedFormWithClassFile.java | 6 +-
.../TestTypeAnnotations.java | 386 +++++++++---------
.../testTypeParams/TestTypeParameters.java | 2 +-
25 files changed, 371 insertions(+), 364 deletions(-)
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java
index b7d033557fb..a3174e3e8be 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java
@@ -41,6 +41,7 @@ import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.util.DocletConstants;
@@ -91,7 +92,7 @@ public abstract class AbstractExecutableMemberWriter extends AbstractMemberWrite
}
String signature = utils.flatSignature((ExecutableElement) member, typeElement);
if (signature.length() > 2) {
- content.add(Entity.ZERO_WIDTH_SPACE);
+ content.add(new HtmlTree(TagName.WBR));
}
content.add(signature);
@@ -209,8 +210,8 @@ public abstract class AbstractExecutableMemberWriter extends AbstractMemberWrite
protected void addParameters(ExecutableElement member, Content htmltree) {
Content paramTree = getParameters(member, false);
if (paramTree.charCount() > 2) {
- // only add zero-width-space for non-empty parameters
- htmltree.add(Entity.ZERO_WIDTH_SPACE);
+ // only add <wbr> for non-empty parameters
+ htmltree.add(new HtmlTree(TagName.WBR));
}
htmltree.add(paramTree);
}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkFactory.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkFactory.java
index d7e6b98a5d4..805a7c3d519 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkFactory.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkFactory.java
@@ -37,8 +37,8 @@ import javax.lang.model.type.DeclaredType;
import javax.lang.model.type.TypeMirror;
import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.Resources;
@@ -171,7 +171,7 @@ public class HtmlLinkFactory extends LinkFactory {
for (TypeMirror t : vars) {
if (many) {
links.add(",");
- links.add(Entity.ZERO_WIDTH_SPACE);
+ links.add(new HtmlTree(TagName.WBR));
if (((HtmlLinkInfo) linkInfo).getContext() == HtmlLinkInfo.Kind.MEMBER_TYPE_PARAMS) {
links.add(DocletConstants.NL);
}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java
index 1b509f42ce4..0cd54ecbca1 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java
@@ -457,7 +457,7 @@ public class Signatures {
// empty parameters are added without packing
htmlTree.add(parameters);
} else {
- htmlTree.add(Entity.ZERO_WIDTH_SPACE)
+ htmlTree.add(new HtmlTree(TagName.WBR))
.add(HtmlTree.SPAN(HtmlStyle.parameters, parameters));
}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Entity.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Entity.java
index e493638b96b..07d0536f42e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Entity.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Entity.java
@@ -38,12 +38,6 @@ public class Entity extends Content {
public static final Entity GREATER_THAN = new Entity(">");
public static final Entity AMPERSAND = new Entity("&");
public static final Entity NO_BREAK_SPACE = new Entity(" ");
- public static final Entity ZERO_WIDTH_SPACE = new Entity("​") {
- @Override
- public int charCount() {
- return 0;
- }
- };
public final String text;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java
index 767c168797f..1e5352565ba 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java
@@ -926,6 +926,8 @@ public class HtmlTree extends Content {
(hasAttr(HtmlAttr.TYPE) && hasContent()));
case SPAN:
return (hasAttr(HtmlAttr.ID) || hasContent());
+ case WBR:
+ return (!hasContent());
default :
return hasContent();
}
@@ -942,6 +944,7 @@ public class HtmlTree extends Content {
switch (tagName) {
case A: case BUTTON: case BR: case CODE: case EM: case I: case IMG:
case LABEL: case SMALL: case SPAN: case STRONG: case SUB: case SUP:
+ case WBR:
return true;
default:
return false;
@@ -957,7 +960,7 @@ public class HtmlTree extends Content {
*/
public boolean isVoid() {
switch (tagName) {
- case BR: case HR: case IMG: case INPUT: case LINK: case META:
+ case BR: case HR: case IMG: case INPUT: case LINK: case META: case WBR:
return true;
default:
return false;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TagName.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TagName.java
index 5f7218a4cf5..34655300b30 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TagName.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TagName.java
@@ -91,7 +91,8 @@ public enum TagName {
TH,
TITLE,
TR,
- UL;
+ UL,
+ WBR;
public final String value;
diff --git a/test/langtools/jdk/javadoc/doclet/testConstructors/TestConstructors.java b/test/langtools/jdk/javadoc/doclet/testConstructors/TestConstructors.java
index 6738a2121fc..927b6caa881 100644
--- a/test/langtools/jdk/javadoc/doclet/testConstructors/TestConstructors.java
+++ b/test/langtools/jdk/javadoc/doclet/testConstructors/TestConstructors.java
@@ -69,7 +69,7 @@ public class TestConstructors extends JavadocTester {
"""
<section class="detail" id="<init>()">""",
"""
- <a href="#%3Cinit%3E(int)" class="member-name-link">Outer</a>​(int i)""",
+ <a href="#%3Cinit%3E(int)" class="member-name-link">Outer</a><wbr>(int i)""",
"""
<section class="detail" id="<init>(int)">""");
@@ -79,7 +79,7 @@ public class TestConstructors extends JavadocTester {
"""
<section class="detail" id="<init>()">""",
"""
- <a href="#%3Cinit%3E(int)" class="member-name-link">Inner</a>​(int i)""",
+ <a href="#%3Cinit%3E(int)" class="member-name-link">Inner</a><wbr>(int i)""",
"""
<section class="detail" id="<init>(int)">""");
@@ -89,7 +89,7 @@ public class TestConstructors extends JavadocTester {
"""
<section class="detail" id="<init>()">""",
"""
- <a href="#%3Cinit%3E(int)" class="member-name-link">NestedInner</a>​(int i)""",
+ <a href="#%3Cinit%3E(int)" class="member-name-link">NestedInner</a><wbr>(int i)""",
"""
<section class="detail" id="<init>(int)">""");
diff --git a/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java
index 08c19636357..965a35c7968 100644
--- a/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java
+++ b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java
@@ -355,11 +355,11 @@ public class TestDeprecatedDocs extends JavadocTester {
<div class="col-last odd-row-color">
<div class="deprecation-comment">class_test5 passes. This is the second sentence of deprecated description for a method.</div>
</div>
- <div class="col-summary-item-name even-row-color"><a href="pkg/TestClass.html#overloadedMethod(int)">pkg.TestClass.overloadedMethod​(int)</a></div>
+ <div class="col-summary-item-name even-row-color"><a href="pkg/TestClass.html#overloadedMethod(int)">pkg.TestClass.overloadedMethod<wbr>(int)</a></div>
<div class="col-last even-row-color">
<div class="deprecation-comment">class_test7 passes. Overloaded method 2.</div>
</div>
- <div class="col-summary-item-name odd-row-color"><a href="pkg/TestClass.html#overloadedMethod(java.lang.String)">pkg.TestClass.overloadedMethod​(String)</a></div>
+ <div class="col-summary-item-name odd-row-color"><a href="pkg/TestClass.html#overloadedMethod(java.lang.String)">pkg.TestClass.overloadedMethod<wbr>(String)</a></div>
<div class="col-last odd-row-color">
<div class="deprecation-comment">class_test6 passes. Overloaded method 1.</div>
</div>""",
@@ -375,7 +375,7 @@ public class TestDeprecatedDocs extends JavadocTester {
<div class="col-last odd-row-color">
<div class="deprecation-comment">class_test3 passes. This is the second sentence of deprecated description for a constructor.</div>
</div>
- <div class="col-summary-item-name even-row-color"><a href="pkg/TestClass.html#%3Cinit%3E(java.lang.String)">pkg.TestClass​(String)</a></div>
+ <div class="col-summary-item-name even-row-color"><a href="pkg/TestClass.html#%3Cinit%3E(java.lang.String)">pkg.TestClass<wbr>(String)</a></div>
<div class="col-last even-row-color">
<div class="deprecation-comment">class_test4 passes. Overloaded constructor.</div>
</div>""");
diff --git a/test/langtools/jdk/javadoc/doclet/testEnumConstructor/TestEnumConstructor.java b/test/langtools/jdk/javadoc/doclet/testEnumConstructor/TestEnumConstructor.java
index 4012ee4bbdf..e6dadfcecdd 100644
--- a/test/langtools/jdk/javadoc/doclet/testEnumConstructor/TestEnumConstructor.java
+++ b/test/langtools/jdk/javadoc/doclet/testEnumConstructor/TestEnumConstructor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -68,7 +68,7 @@ public class TestEnumConstructor extends JavadocTester {
"Constructor Summary",
"Modifier", "Constructor",
"private", """
- <a href="#%3Cinit%3E(int)" class="member-name-link">TestEnum</a>​(int val)""");
+ <a href="#%3Cinit%3E(int)" class="member-name-link">TestEnum</a><wbr>(int val)""");
checkOutput("index-all.html", true,
"""
<a href="pkg/TestEnum.html#%3Cinit%3E(int)" class="member-name-link">TestEnum(int)</a>""");
diff --git a/test/langtools/jdk/javadoc/doclet/testGenericTypeLink/TestGenericTypeLink.java b/test/langtools/jdk/javadoc/doclet/testGenericTypeLink/TestGenericTypeLink.java
index 1843be1fed6..cd289202c7a 100644
--- a/test/langtools/jdk/javadoc/doclet/testGenericTypeLink/TestGenericTypeLink.java
+++ b/test/langtools/jdk/javadoc/doclet/testGenericTypeLink/TestGenericTypeLink.java
@@ -74,18 +74,18 @@ public class TestGenericTypeLink extends JavadocTester {
<li><code><a href="http://example.com/docs/api/java.base/java/util/Map.html" title="\
class or interface in java.util" class="external-link">Map</a><<a href="http://ex\
ample.com/docs/api/java.base/java/lang/String.html" title="class or interface in jav\
- a.lang" class="external-link">String</a>,​? extends <a href="http://example.co\
- m/docs/api/java.base/java/lang/CharSequence.html" title="class or interface in java.\
- lang" class="external-link">CharSequence</a>></code></li>
+ a.lang" class="external-link">String</a>,<wbr>? extends <a href="http://example.com/\
+ docs/api/java.base/java/lang/CharSequence.html" title="class or interface in java.la\
+ ng" class="external-link">CharSequence</a>></code></li>
<li><code><a href="http://example.com/docs/api/java.base/java/util/Map.html" title="\
class or interface in java.util" class="external-link">Map</a><<a href="http://ex\
ample.com/docs/api/java.base/java/lang/String.html" title="class or interface in jav\
- a.lang" class="external-link">String</a>,​? super <a href="A.html" title="clas\
- s in pkg1">A</a><<a href="http://example.com/docs/api/java.base/java/lang/String.\
- html" title="class or interface in java.lang" class="external-link">String</a>,̴\
- 3;? extends <a href="http://example.com/docs/api/java.base/java/lang/RuntimeExceptio\
- n.html" title="class or interface in java.lang" class="external-link">RuntimeExcepti\
- on</a>>></code></li>
+ a.lang" class="external-link">String</a>,<wbr>? super <a href="A.html" title="class \
+ in pkg1">A</a><<a href="http://example.com/docs/api/java.base/java/lang/String.ht\
+ ml" title="class or interface in java.lang" class="external-link">String</a>,<wbr>? \
+ extends <a href="http://example.com/docs/api/java.base/java/lang/RuntimeException.ht\
+ ml" title="class or interface in java.lang" class="external-link">RuntimeException</\
+ a>>></code></li>
<li><a href="#someMethod(java.util.List,int)"><code>someMethod(List<Number>, i\
nt)</code></a></li>
<li><a href="#otherMethod(java.util.Map,double)"><code>otherMethod(Map<String, ? \
@@ -97,8 +97,8 @@ public class TestGenericTypeLink extends JavadocTester {
"""
<div class="block"><code><a href="A.html" title="class in pkg1">A</a><<a href="h\
ttp://example.com/docs/api/java.base/java/lang/String.html" title="class or interfa\
- ce in java.lang" class="external-link">String</a>,​<a href="A.SomeException.h\
- tml" title="class in pkg1">A.SomeException</a>></code>
+ ce in java.lang" class="external-link">String</a>,<wbr><a href="A.SomeException.htm\
+ l" title="class in pkg1">A.SomeException</a>></code>
<a href="http://example.com/docs/api/java.base/java/util/Map.html" title="class or\
interface in java.util" class="external-link">link to generic type with label</a>\
</div>""",
@@ -109,8 +109,8 @@ public class TestGenericTypeLink extends JavadocTester {
<ul class="see-list-long">
<li><code><a href="A.html" title="class in pkg1">A</a><<a href="http://example.c\
om/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang\
- " class="external-link">String</a>,​<a href="A.SomeException.html" title="cla\
- ss in pkg1">A.SomeException</a>></code></li>
+ " class="external-link">String</a>,<wbr><a href="A.SomeException.html" title="class\
+ in pkg1">A.SomeException</a>></code></li>
<li><a href="http://example.com/docs/api/java.base/java/util/List.html" title="clas\
s or interface in java.util" class="external-link"><code>Link to generic type with \
label</code></a></li>
diff --git a/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java b/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java
index 981b31efe2a..d8ee249eff3 100644
--- a/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java
@@ -611,7 +611,7 @@ public class TestHtmlTableTags extends JavadocTester {
ab2 method-summary-table-tab4"><code>void</code></div>
<div class="col-second even-row-color method-summary-table method-summary-table-\
tab2 method-summary-table-tab4"><code><a href="#method1(int,int)" class="member-\
- name-link">method1</a>​(int a,
+ name-link">method1</a><wbr>(int a,
int b)</code></div>
<div class="col-last even-row-color method-summary-table method-summary-table-ta\
b2 method-summary-table-tab4">
@@ -631,8 +631,8 @@ public class TestHtmlTableTags extends JavadocTester {
kg1">C1</a></code></div>
<div class="col-second even-row-color method-summary-table method-summary-table-\
tab2 method-summary-table-tab4"><code><a href="#method(pkg1.C1)" class="member-n\
- ame-link">method</a>​(<a href="../pkg1/C1.html" title="class \
- in pkg1">C1</a> param)</code></div>
+ ame-link">method</a><wbr>(<a href="../pkg1/C1.html" title="class in pkg1">C1</a>\
+ param)</code></div>
<div class="col-last even-row-color method-summary-table method-summary-table-ta\
b2 method-summary-table-tab4">
<div class="block">A sample method.</div>
@@ -680,8 +680,8 @@ public class TestHtmlTableTags extends JavadocTester {
<div class="col-first even-row-color"><code><a href="../C2.html" title="class in pkg2">C2</a></code></div>
<div class="col-second even-row-color"><span class="type-name-label">C1.</span><\
code><a href="../../pkg1/C1.html#method(pkg2.C2)" class="member-name-link">metho\
- d</a>​(<a href="../C2.html" title="class in pkg2">C2</a> \
- ;param)</code></div>
+ d</a><wbr>(<a href="../C2.html" title="class in pkg2">C2</a> param)</code><\
+ /div>
<div class="col-last even-row-color">
<div class="block">Method thats does some processing.</div>
</div>""");
@@ -769,7 +769,7 @@ public class TestHtmlTableTags extends JavadocTester {
ab2 method-summary-table-tab4"><code>void</code></div>
<div class="col-second even-row-color method-summary-table method-summary-table-\
tab2 method-summary-table-tab4"><code><a href="#method1(int,int)" class="member-\
- name-link">method1</a>​(int a,
+ name-link">method1</a><wbr>(int a,
int b)</code></div>
<div class="col-last even-row-color method-summary-table method-summary-table-ta\
b2 method-summary-table-tab4"></div>""");
@@ -785,8 +785,8 @@ public class TestHtmlTableTags extends JavadocTester {
kg1">C1</a></code></div>
<div class="col-second even-row-color method-summary-table method-summary-table-\
tab2 method-summary-table-tab4"><code><a href="#method(pkg1.C1)" class="member-n\
- ame-link">method</a>​(<a href="../pkg1/C1.html" title="class in pkg1">C1</\
- a> param)</code></div>
+ ame-link">method</a><wbr>(<a href="../pkg1/C1.html" title="class in pkg1">C1</a>\
+ param)</code></div>
<div class="col-last even-row-color method-summary-table method-summary-table-ta\
b2 method-summary-table-tab4"></div>""");
@@ -827,7 +827,7 @@ public class TestHtmlTableTags extends JavadocTester {
<div class="col-first even-row-color"><code><a href="../C2.html" title="class in pkg2">C2</a></code></div>
<div class="col-second even-row-color"><span class="type-name-label">C1.</span><\
code><a href="../../pkg1/C1.html#method(pkg2.C2)" class="member-name-link">metho\
- d</a>​(<a href="../C2.html" title="class in pkg2">C2</a> param)</code></div>
+ d</a><wbr>(<a href="../C2.html" title="class in pkg2">C2</a> param)</code></div>
<div class="col-last even-row-color"></div>""");
// Package use documentation
diff --git a/test/langtools/jdk/javadoc/doclet/testIndentation/TestIndentation.java b/test/langtools/jdk/javadoc/doclet/testIndentation/TestIndentation.java
index 4c93bc8c4ee..86fac93d7fe 100644
--- a/test/langtools/jdk/javadoc/doclet/testIndentation/TestIndentation.java
+++ b/test/langtools/jdk/javadoc/doclet/testIndentation/TestIndentation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -52,7 +52,7 @@ public class TestIndentation extends JavadocTester {
"""
<div class="member-signature"><span class="modifiers">public</span> <span c\
lass="type-parameters"><T></span> <span class="return-type">void</spa\
- n> <span class="element-name">m</span>​<span class="parameters">(T t1,
+ n> <span class="element-name">m</span><wbr><span class="parameters">(T t1,
T t2)</span>
throws <span class="exceptions">java.lang.Exception</span></div>""");
diff --git a/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java b/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java
index 1f8cd0045be..1fc0dcfca79 100644
--- a/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java
+++ b/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java
@@ -199,14 +199,14 @@ public class TestInterface extends JavadocTester {
ator.OfInt</a><<a href="Spliterator.OfInt.html" title="type parameter in Spli\
terator.OfInt">Integer</a>>, <a href="Spliterator.OfPrimitive.html" title="in\
terface in pkg2">Spliterator.OfPrimitive</a><<a href="Spliterator.OfPrimitive\
- .html" title="type parameter in Spliterator.OfPrimitive">T</a>,​<a href="S\
- pliterator.OfPrimitive.html" title="type parameter in Spliterator.OfPrimitive">T\
- _CONS</a>,​<a href="Spliterator.OfPrimitive.html" title="type parameter in\
- Spliterator.OfPrimitive">T_SPLITR</a> extends <a href="Spliterator.OfPrimitive.\
- html" title="interface in pkg2">Spliterator.OfPrimitive</a><<a href="Splitera\
- tor.OfPrimitive.html" title="type parameter in Spliterator.OfPrimitive">T</a>,&#\
- 8203;<a href="Spliterator.OfPrimitive.html" title="type parameter in Spliterator\
- .OfPrimitive">T_CONS</a>,​<a href="Spliterator.OfPrimitive.html" title="ty\
- pe parameter in Spliterator.OfPrimitive">T_SPLITR</a>>></code>""");
+ .html" title="type parameter in Spliterator.OfPrimitive">T</a>,<wbr><a href="Spl\
+ iterator.OfPrimitive.html" title="type parameter in Spliterator.OfPrimitive">T_C\
+ ONS</a>,<wbr><a href="Spliterator.OfPrimitive.html" title="type parameter in Spl\
+ iterator.OfPrimitive">T_SPLITR</a> extends <a href="Spliterator.OfPrimitive.html\
+ " title="interface in pkg2">Spliterator.OfPrimitive</a><<a href="Spliterator.\
+ OfPrimitive.html" title="type parameter in Spliterator.OfPrimitive">T</a>,<wbr><\
+ a href="Spliterator.OfPrimitive.html" title="type parameter in Spliterator.OfPri\
+ mitive">T_CONS</a>,<wbr><a href="Spliterator.OfPrimitive.html" title="type param\
+ eter in Spliterator.OfPrimitive">T_SPLITR</a>>></code>""");
}
}
diff --git a/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java
index 4a1a2648b58..75804be9d06 100644
--- a/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java
+++ b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java
@@ -69,8 +69,8 @@ public class TestJavaFX extends JavadocTester {
</dd>""",
"""
<div class="member-signature"><span class="modifiers">public final</span> <\
- span class="return-type">void</span> <span class="element-name">setRate</span>̴\
- 3;<span class="parameters">(double value)</span></div>
+ span class="return-type">void</span> <span class="element-name">setRate</span><wbr>\
+ <span class="parameters">(double value)</span></div>
<div class="block">Sets the value of the property rate.</div>
<dl class="notes">
<dt>Property description:</dt>""",
@@ -114,15 +114,15 @@ public class TestJavaFX extends JavadocTester {
<section class="detail" id="isPaused()">
<h3>isPaused</h3>
<div class="member-signature"><span class="modifiers">public final</span> <\
- span class="return-type">double</span> <span class="element-name">isPaused</span>()\
- </div>
+ span class="return-type">double</span> <span class="element-name">isPaused<\
+ /span>()</div>
<div class="block">Gets the value of the property paused.</div>""",
"""
<section class="detail" id="setPaused(boolean)">
<h3>setPaused</h3>
<div class="member-signature"><span class="modifiers">public final</span> <\
- span class="return-type">void</span> <span class="element-name">setPaused</span>\
- 203;<span class="parameters">(boolean value)</span></div>
+ span class="return-type">void</span> <span class="element-name">setPaused</\
+ span><wbr><span class="parameters">(boolean value)</span></div>
<div class="block">Sets the value of the property paused.</div>
<dl class="notes">
<dt>Property description:</dt>
@@ -133,8 +133,8 @@ public class TestJavaFX extends JavadocTester {
<section class="detail" id="isPaused()">
<h3>isPaused</h3>
<div class="member-signature"><span class="modifiers">public final</span> <\
- span class="return-type">double</span> <span class="element-name">isPaused</span>()\
- </div>
+ span class="return-type">double</span> <span class="element-name">isPaused<\
+ /span>()</div>
<div class="block">Gets the value of the property paused.</div>
<dl class="notes">
<dt>Property description:</dt>
@@ -153,8 +153,8 @@ public class TestJavaFX extends JavadocTester {
<section class="detail" id="setRate(double)">
<h3>setRate</h3>
<div class="member-signature"><span class="modifiers">public final</span> <\
- span class="return-type">void</span> <span class="element-name">setRate</span>̴\
- 3;<span class="parameters">(double value)</span></div>
+ span class="return-type">void</span> <span class="element-name">setRate</sp\
+ an><wbr><span class="parameters">(double value)</span></div>
<div class="block">Sets the value of the property rate.</div>
<dl class="notes">
<dt>Property description:</dt>
@@ -327,8 +327,8 @@ public class TestJavaFX extends JavadocTester {
ab2 method-summary-table-tab4"><code><T> java.lang.Object</code></div>
<div class="col-second even-row-color method-summary-table method-summary-table-\
tab2 method-summary-table-tab4"><code><a href="#alphaProperty(java.util.List)" c\
- lass="member-name-link">alphaProperty</a>​(java.util.List<T> fo\
- o)</code></div>
+ lass="member-name-link">alphaProperty</a><wbr>(java.util.List<T> foo)\
+ </code></div>
<div class="col-last even-row-color method-summary-table method-summary-table-ta\
b2 method-summary-table-tab4"> </div>
<div class="col-first odd-row-color method-summary-table method-summary-table-ta\
diff --git a/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java b/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java
index eb49ac0b8b8..a372ab08da7 100644
--- a/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java
+++ b/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java
@@ -106,8 +106,8 @@ public class TestMemberInheritance extends JavadocTester {
ab1 method-summary-table-tab4"><code>static java.time.Period</code></div>
<div class="col-second even-row-color method-summary-table method-summary-table-\
tab1 method-summary-table-tab4"><code><a href="#between(java.time.LocalDate,java\
- .time.LocalDate)" class="member-name-link">between</a>​(java.time.LocalDat\
- e startDateInclusive,
+ .time.LocalDate)" class="member-name-link">between</a><wbr>(java.time.LocalDate&\
+ nbsp;startDateInclusive,
java.time.LocalDate endDateExclusive)</code></div>""");
checkOutput("pkg1/Implementer.html", false,
@@ -132,7 +132,7 @@ public class TestMemberInheritance extends JavadocTester {
ethod-summary-table-tab3"><code>protected abstract java.lang.String</code></div>
<div class="col-second even-row-color method-summary-table method-summary-table-tab2 \
method-summary-table-tab3"><code><a href="#parentMethod(T)" class="member-name-link">\
- parentMethod</a>​(java.lang.String t)</code></div>
+ parentMethod</a><wbr>(java.lang.String t)</code></div>
<div class="col-last even-row-color method-summary-table method-summary-table-tab2 me\
thod-summary-table-tab3">
<div class="block">Returns some value with an inherited search tag.</div>
@@ -143,9 +143,9 @@ public class TestMemberInheritance extends JavadocTester {
<section class="detail" id="parentMethod(T)">
<h3 id="parentMethod(java.lang.Object)">parentMethod</h3>
<div class="member-signature"><span class="modifiers">protected abstract</span>&\
- nbsp;<span class="return-type">java.lang.String</span> <span class="element-name">p\
- arentMethod</span>​<span class="parameters">(java.lang.String \
- t)</span>
+ nbsp;<span class="return-type">java.lang.String</span> <span class="element\
+ -name">parentMethod</span><wbr><span class="parameters">(java.lang.String t\
+ )</span>
throws <span class="exceptions">java.lang.IllegalArgumentException,
java.lang.InterruptedException,
java.lang.IllegalStateException</span></div>
@@ -181,13 +181,13 @@ public class TestMemberInheritance extends JavadocTester {
ab2 method-summary-table-tab4"><code>java.lang.String</code></div>
<div class="col-second even-row-color method-summary-table method-summary-table-\
tab2 method-summary-table-tab4"><code><a href="#method(T)" class="member-name-li\
- nk">method</a>​(java.lang.String t)</code></div>""",
+ nk">method</a><wbr>(java.lang.String t)</code></div>""",
"""
<section class="detail" id="method(T)">
<h3 id="method(java.lang.Object)">method</h3>
<div class="member-signature"><span class="modifiers">public</span> <span c\
lass="return-type">java.lang.String</span> <span class="element-name">metho\
- d</span>​<span class="parameters">(java.lang.String t)</span></div>
+ d</span><wbr><span class="parameters">(java.lang.String t)</span></div>
</section>""");
checkOutput("index-all.html", true,
@@ -232,9 +232,9 @@ public class TestMemberInheritance extends JavadocTester {
<section class="detail" id="parentMethod(T)">
<h3 id="parentMethod(java.lang.Object)">parentMethod</h3>
<div class="member-signature"><span class="modifiers">protected abstract</span>&\
- nbsp;<span class="return-type">java.lang.String</span> <span class="element-name">p\
- arentMethod</span>​<span class="parameters">(java.lang.String \
- t)</span>
+ nbsp;<span class="return-type">java.lang.String</span> <span class="element\
+ -name">parentMethod</span><wbr><span class="parameters">(java.lang.String t\
+ )</span>
throws <span class="exceptions">java.lang.IllegalArgumentException,
java.lang.InterruptedException,
java.lang.IllegalStateException</span></div>
diff --git a/test/langtools/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java b/test/langtools/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java
index da370cc27b5..f8c45abc4ac 100644
--- a/test/langtools/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java
+++ b/test/langtools/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java
@@ -72,7 +72,7 @@ public class TestMemberSummary extends JavadocTester {
"""
<div class="col-first even-row-color"><code>private </code></div>
<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(int)\
- " class="member-name-link">PrivateParent</a>​(int i)</code></div>""");
+ " class="member-name-link">PrivateParent</a><wbr>(int i)</code></div>""");
// Legacy anchor dimensions (6290760)
checkOutput("pkg2/A.html", true,
diff --git a/test/langtools/jdk/javadoc/doclet/testMethodId/TestMethodId.java b/test/langtools/jdk/javadoc/doclet/testMethodId/TestMethodId.java
index 412db781643..20cedc70b01 100644
--- a/test/langtools/jdk/javadoc/doclet/testMethodId/TestMethodId.java
+++ b/test/langtools/jdk/javadoc/doclet/testMethodId/TestMethodId.java
@@ -72,7 +72,7 @@ public class TestMethodId extends JavadocTester {
checkOutput("p/C.html",
true,
"""
- <code><a href="#m(int)" class="member-name-link">m</a>​(int i)</code>""",
+ <code><a href="#m(int)" class="member-name-link">m</a><wbr>(int i)</code>""",
"""
<section class="detail" id="m(int)">
<h3>m</h3>""");
diff --git a/test/langtools/jdk/javadoc/doclet/testMethodSignature/TestMethodSignature.java b/test/langtools/jdk/javadoc/doclet/testMethodSignature/TestMethodSignature.java
index 4bd0a81f4bd..77acf2b168a 100644
--- a/test/langtools/jdk/javadoc/doclet/testMethodSignature/TestMethodSignature.java
+++ b/test/langtools/jdk/javadoc/doclet/testMethodSignature/TestMethodSignature.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 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
@@ -55,8 +55,8 @@ public class TestMethodSignature extends JavadocTester {
"""
<div class="member-signature"><span class="modifiers">public static</span> \
- <span class="return-type">void</span> <span class="element-name">simpleMetho\
- d</span>​<span class="parameters">(int i,
+ <span class="return-type">void</span> <span class="element-name">simpleMeth\
+ od</span><wbr><span class="parameters">(int i,
java.lang.String s,
boolean b)</span></div>""",
@@ -65,27 +65,26 @@ public class TestMethodSignature extends JavadocTester {
date="a date",
comments="some comment about the method below")
</span><span class="modifiers">public static</span> <span class="return-typ\
- e">void</span> <span class="element-name">annotatedMethod</span>​<span class=\
- "parameters">(int i,
+ e">void</span> <span class="element-name">annotatedMethod</span><wbr><span \
+ class="parameters">(int i,
java.lang.String s,
boolean b)</span></div>""",
"""
<div class="member-signature"><span class="modifiers">public static</span> \
- <span class="type-parameters-long"><T1 extends java.lang.AutoCloseable,​\
- ;
- T2 extends java.lang.AutoCloseable,​
- T3 extends java.lang.AutoCloseable,​
- T4 extends java.lang.AutoCloseable,​
- T5 extends java.lang.AutoCloseable,​
- T6 extends java.lang.AutoCloseable,​
- T7 extends java.lang.AutoCloseable,​
+ <span class="type-parameters-long"><T1 extends java.lang.AutoCloseable,<wbr>
+ T2 extends java.lang.AutoCloseable,<wbr>
+ T3 extends java.lang.AutoCloseable,<wbr>
+ T4 extends java.lang.AutoCloseable,<wbr>
+ T5 extends java.lang.AutoCloseable,<wbr>
+ T6 extends java.lang.AutoCloseable,<wbr>
+ T7 extends java.lang.AutoCloseable,<wbr>
T8 extends java.lang.AutoCloseable></span>
<span class="return-type"><a href="C.With8Types.html" title="class in pkg">C.Wit\
- h8Types</a><T1,​T2,​T3,​T4,​T5,​T6,​T7,&#\
- 8203;T8></span> <span class="element-name">bigGenericMethod</span>​<span c\
- lass="parameters">(<a href="C.F0.html" title="interface in pkg">C.F0</a><? ex\
- tends T1> t1,
+ h8Types</a><T1,<wbr>T2,<wbr>T3,<wbr>T4,<wbr>T5,<wbr>T6,<wbr>T7,<wbr>T8></s\
+ pan> <span class="element-name">bigGenericMethod</span><wbr><span class="pa\
+ rameters">(<a href="C.F0.html" title="interface in pkg">C.F0</a><? extends T1\
+ > t1,
<a href="C.F0.html" title="interface in pkg">C.F0</a><? extends T2> t2,
<a href="C.F0.html" title="interface in pkg">C.F0</a><? extends T3> t3,
<a href="C.F0.html" title="interface in pkg">C.F0</a><? extends T4> t4,
@@ -101,19 +100,19 @@ public class TestMethodSignature extends JavadocTester {
date="a date",
comments="some comment about the method below")
</span><span class="modifiers">public static</span> <span class="type-param\
- eters-long"><T1 extends java.lang.AutoCloseable,​
- T2 extends java.lang.AutoCloseable,​
- T3 extends java.lang.AutoCloseable,​
- T4 extends java.lang.AutoCloseable,​
- T5 extends java.lang.AutoCloseable,​
- T6 extends java.lang.AutoCloseable,​
- T7 extends java.lang.AutoCloseable,​
+ eters-long"><T1 extends java.lang.AutoCloseable,<wbr>
+ T2 extends java.lang.AutoCloseable,<wbr>
+ T3 extends java.lang.AutoCloseable,<wbr>
+ T4 extends java.lang.AutoCloseable,<wbr>
+ T5 extends java.lang.AutoCloseable,<wbr>
+ T6 extends java.lang.AutoCloseable,<wbr>
+ T7 extends java.lang.AutoCloseable,<wbr>
T8 extends java.lang.AutoCloseable></span>
<span class="return-type"><a href="C.With8Types.html" title="class in pkg">C.Wit\
- h8Types</a><T1,​T2,​T3,​T4,​T5,​T6,​T7,&#\
- 8203;T8></span> <span class="element-name">bigGenericAnnotatedMethod</span>̴\
- 3;<span class="parameters">(<a href="C.F0.html" title="interface in pkg">C.F0</a\
- ><? extends T1> t1,
+ h8Types</a><T1,<wbr>T2,<wbr>T3,<wbr>T4,<wbr>T5,<wbr>T6,<wbr>T7,<wbr>T8></s\
+ pan> <span class="element-name">bigGenericAnnotatedMethod</span><wbr><span \
+ class="parameters">(<a href="C.F0.html" title="interface in pkg">C.F0</a><? e\
+ xtends T1> t1,
<a href="C.F0.html" title="interface in pkg">C.F0</a><? extends T2> t2,
<a href="C.F0.html" title="interface in pkg">C.F0</a><? extends T3> t3,
<a href="C.F0.html" title="interface in pkg">C.F0</a><? extends T4> t4,
diff --git a/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java
index a412886c165..ffa38fd9582 100644
--- a/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java
+++ b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java
@@ -85,9 +85,9 @@ public class TestNewLanguageFeatures extends JavadocTester {
"Overloaded values method has correct documentation.",
"""
<div class="member-signature"><span class="modifiers">public static</span> \
- <span class="return-type"><a href="Coin.html" title="enum class in pkg">Coin</a></span\
- > <span class="element-name">valueOf</span>​<span class="parameters">(java.la\
- ng.String name)</span></div>
+ <span class="return-type"><a href="Coin.html" title="enum class in pkg">Coin</a>\
+ </span> <span class="element-name">valueOf</span><wbr><span class="paramete\
+ rs">(java.lang.String name)</span></div>
<div class="block">Returns the enum constant of this class with the specified name.
The string must match <i>exactly</i> an identifier used to declare an
enum constant in this class. (Extraneous whitespace characters are\s
@@ -139,10 +139,10 @@ public class TestNewLanguageFeatures extends JavadocTester {
// Signature of method with type parameters
"""
<div class="member-signature"><span class="modifiers">public</span> <span c\
- lass="type-parameters"><T extends java.util.List,​
+ lass="type-parameters"><T extends java.util.List,<wbr>
V></span>
<span class="return-type">java.lang.String[]</span> <span class="element-name">meth\
- odThatHasTypeParameters</span>​<span class="parameters">(T param1,
+ odThatHasTypeParameters</span><wbr><span class="parameters">(T param1,
V param2)</span></div>""",
// Method that returns TypeParameters
"""
@@ -151,14 +151,15 @@ public class TestNewLanguageFeatures extends JavadocTester {
arameter in TypeParameters">E</a>[]</code></div>
<div class="col-second even-row-color method-summary-table method-summary-table-\
tab2 method-summary-table-tab4"><code><a href="#methodThatReturnsTypeParameterA(\
- E%5B%5D)" class="member-name-link">methodThatReturnsTypeParameterA</a>​(<a\
- href="TypeParameters.html" title="type parameter in TypeParameters">E</a>[] e)</code>""",
+ E%5B%5D)" class="member-name-link">methodThatReturnsTypeParameterA</a><wbr>(<a h\
+ ref="TypeParameters.html" title="type parameter in TypeParameters">E</a>[] \
+ e)</code>""",
"""
<div class="member-signature"><span class="modifiers">public</span> <span c\
lass="return-type"><a href="TypeParameters.html" title="type parameter in TypePa\
- rameters">E</a>[]</span> <span class="element-name">methodThatReturnsTypeParameterA\
- </span>​<span class="parameters">(<a href="TypeParameters.html" tit\
- le="type parameter in TypeParameters">E</a>[] e)</span></div>
+ rameters">E</a>[]</span> <span class="element-name">methodThatReturnsTypePa\
+ rameterA</span><wbr><span class="parameters">(<a href="TypeParameters.html" titl\
+ e="type parameter in TypeParameters">E</a>[] e)</span></div>
""",
"""
<div class="col-first even-row-color method-summary-table method-summary-table-t\
@@ -167,19 +168,20 @@ public class TestNewLanguageFeatures extends JavadocTester {
<div class="col-second even-row-color method-summary-table method-summary-table-\
tab2 method-summary-table-tab4"><code><a href="#methodtThatReturnsTypeParameters\
B(java.util.Collection)" class="member-name-link">methodtThatReturnsTypeParamete\
- rsB</a>​(java.util.Collection<? extends T> coll)</code>""",
+ rsB</a><wbr>(java.util.Collection<? extends T> coll)</code>""",
"""
<div class="block">Returns TypeParameters</div>
""",
// Method takes a TypeVariable
"""
<div class="col-first odd-row-color method-summary-table method-summary-table-ta\
- b2 method-summary-table-tab4"><code><X extends java.lang.Throwable><br><a href\
- ="TypeParameters.html" title="type parameter in TypeParameters">E</a></code></div>
- <div class="col-second odd-row-color method-summary-table method-summary-table-t\
- ab2 method-summary-table-tab4"><code><a href="#orElseThrow(java.util.function.Su\
- pplier)" class="member-name-link">orElseThrow</a>​(java.util.function.Supp\
- lier<? extends X> exceptionSupplier)</code>"""
+ b2 method-summary-table-tab4"><code><X extends java.lang.Throwable><br><a \
+ href="TypeParameters.html" title="type parameter in TypeParameters">E</a></code>\
+ </div>
+ <div class="col-second odd-row-color method-summary-table method-summary-t\
+ able-tab2 method-summary-table-tab4"><code><a href="#orElseThrow(java.util.funct\
+ ion.Supplier)" class="member-name-link">orElseThrow</a><wbr>(java.util.function.\
+ Supplier<? extends X> exceptionSupplier)</code>"""
);
checkOutput("pkg/Wildcards.html", true,
@@ -239,8 +241,8 @@ public class TestNewLanguageFeatures extends JavadocTester {
<div class="member-signature"><span class="modifiers">public</span> <span c\
lass="type-parameters"><T extends java.lang.Number & java.lang.Runnable&g\
t;</span>
- <span class="return-type">T</span> <span class="element-name">foo</span>​<spa\
- n class="parameters">(T t)</span></div>""");
+ <span class="return-type">T</span> <span class="element-name">foo</span><wb\
+ r><span class="parameters">(T t)</span></div>""");
//==============================================================
// Test Class-Use Documentation for Type Parameters.
@@ -263,7 +265,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"""
<div class="col-second even-row-color"><span class="type-name-label">ClassUseTes\
t1.</span><code><a href="../ClassUseTest1.html#method(T)" class="member-name-lin\
- k">method</a>​(T t)</code></div>""",
+ k">method</a><wbr>(T t)</code></div>""",
"""
<div class="caption"><span>Fields in <a href="../package-summary.html">pkg2</a>\
with type parameters of type <a href="../Foo.html" title="class in pkg2">Foo</a\
@@ -302,7 +304,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"""
<div class="col-second even-row-color"><span class="type-name-label">ClassUseTes\
t1.</span><code><a href="../ClassUseTest1.html#method(T)" class="member-name-lin\
- k">method</a>​(T t)</code></div>"""
+ k">method</a><wbr>(T t)</code></div>"""
);
// ClassUseTest2: <T extends ParamTest<Foo3>>
@@ -323,7 +325,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"""
<div class="col-second even-row-color"><span class="type-name-label">ClassUseTes\
t2.</span><code><a href="../ClassUseTest2.html#method(T)" class="member-name-lin\
- k">method</a>​(T t)</code></div>""",
+ k">method</a><wbr>(T t)</code></div>""",
"""
<div class="caption"><span>Fields in <a href="../package-summary.html">pkg2</a>\
declared as <a href="../ParamTest.html" title="class in pkg2">ParamTest</a></s\
@@ -361,7 +363,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"""
<div class="col-second even-row-color"><span class="type-name-label">ClassUseTes\
t2.</span><code><a href="../ClassUseTest2.html#method(T)" class="member-name-lin\
- k">method</a>​(T t)</code></div>""",
+ k">method</a><wbr>(T t)</code></div>""",
"""
<div class="caption"><span>Methods in <a href="../package-summary.html">pkg2</a\
> that return types with arguments of type <a href="../Foo3.html" title="class\
@@ -393,7 +395,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"""
<div class="col-second even-row-color"><span class="type-name-label">ClassUseTes\
t3.</span><code><a href="../ClassUseTest3.html#method(T)" class="member-name-lin\
- k">method</a>​(T t)</code></div>""",
+ k">method</a><wbr>(T t)</code></div>""",
"""
<div class="col-first even-row-color"><code><T extends <a href="../ParamTest2.htm\
l" title="class in pkg2">ParamTest2</a><java.util.List<? extends <a href=\
@@ -420,7 +422,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"""
<div class="col-second even-row-color"><span class="type-name-label">ClassUseTes\
t3.</span><code><a href="../ClassUseTest3.html#method(T)" class="member-name-lin\
- k">method</a>​(T t)</code></div>""",
+ k">method</a><wbr>(T t)</code></div>""",
"""
<div class="caption"><span>Methods in <a href="../package-summary.html">pkg2</a\
> that return types with arguments of type <a href="../Foo4.html" title="class\
@@ -446,8 +448,8 @@ public class TestNewLanguageFeatures extends JavadocTester {
<div class="col-first even-row-color"><code>void</code></div>
<div class="col-second even-row-color"><span class="type-name-label">ClassUseTes\
t3.</span><code><a href="../ClassUseTest3.html#method(java.util.Set)" class="mem\
- ber-name-link">method</a>​(java.util.Set<<a href="../Foo4.html" title="\
- class in pkg2">Foo4</a>> p)</code></div>
+ ber-name-link">method</a><wbr>(java.util.Set<<a href="../Foo4.html" title="cl\
+ ass in pkg2">Foo4</a>> p)</code></div>
<div class="col-last even-row-color"> </div>""",
"""
<div class="caption"><span>Constructor parameters in <a href="../package-summary.html">pkg2<\
@@ -567,20 +569,20 @@ public class TestNewLanguageFeatures extends JavadocTester {
// METHOD PARAMS
"""
<div class="member-signature"><span class="modifiers">public</span> <span c\
- lass="return-type">void</span> <span class="element-name">methodWithParams</span>&#\
- 8203;<span class="parameters">(<a href="AnnotationType.html" title="annotation i\
- nterface in pkg">@AnnotationType</a>(<a href="AnnotationType.html#optional()">op\
- tional</a>="Parameter Annotation",<a href="AnnotationType.html#required()">requi\
- red</a>=1994)
+ lass="return-type">void</span> <span class="element-name">methodWithParams<\
+ /span><wbr><span class="parameters">(<a href="AnnotationType.html" title="annota\
+ tion interface in pkg">@AnnotationType</a>(<a href="AnnotationType.html#optional\
+ ()">optional</a>="Parameter Annotation",<a href="AnnotationType.html#required()"\
+ >required</a>=1994)
int documented,
int undocmented)</span></div>""",
// CONSTRUCTOR PARAMS
"""
<div class="member-signature"><span class="modifiers">public</span> <span c\
- lass="element-name">AnnotationTypeUsage</span>​<span class="parameters">(<\
- a href="AnnotationType.html" title="annotation interface in pkg">@AnnotationType\
- </a>(<a href="AnnotationType.html#optional()">optional</a>="Constructor Param An\
- notation",<a href="AnnotationType.html#required()">required</a>=1994)
+ lass="element-name">AnnotationTypeUsage</span><wbr><span class="parameters">(<a \
+ href="AnnotationType.html" title="annotation interface in pkg">@AnnotationType</\
+ a>(<a href="AnnotationType.html#optional()">optional</a>="Constructor Param Anno\
+ tation",<a href="AnnotationType.html#required()">required</a>=1994)
int documented,
int undocmented)</span></div>""");
diff --git a/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverrideMethods.java b/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverrideMethods.java
index d0be8b1c547..aec85bdbc3f 100644
--- a/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverrideMethods.java
+++ b/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverrideMethods.java
@@ -409,8 +409,8 @@ public class TestOverrideMethods extends JavadocTester {
annotation interface in pkg7">@A</a>
</span><span class="return-type"><a href="A.html" title="annotation interface in\
pkg7">@A</a> java.lang.Iterable<java.lang.String></span> <span class\
- ="element-name">m1</span>​<span class="parameters">(java.lang.Class<? e\
- xtends java.lang.CharSequence> p1,
+ ="element-name">m1</span><wbr><span class="parameters">(java.lang.Class<? ext\
+ ends java.lang.CharSequence> p1,
int[] p2)</span></div>
<div class="block"><span class="descfrm-type-label">Description copied from inte\
rface: <code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">Ann\
@@ -434,8 +434,8 @@ public class TestOverrideMethods extends JavadocTester {
annotation interface in pkg7">@A</a>
</span><span class="return-type"><a href="A.html" title="annotation interface in\
pkg7">@A</a> java.lang.Iterable<java.lang.String></span> <span class\
- ="element-name">m1</span>​<span class="parameters">(java.lang.Class<? e\
- xtends java.lang.CharSequence> p1,
+ ="element-name">m1</span><wbr><span class="parameters">(java.lang.Class<? ext\
+ ends java.lang.CharSequence> p1,
int[] p2)</span></div>
<div class="block"><span class="descfrm-type-label">Description copied from inte\
rface: <code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">Ann\
@@ -457,8 +457,8 @@ public class TestOverrideMethods extends JavadocTester {
"""
<div class="member-signature"><span class="return-type">java.lang.Iterable<<a\
href="A.html" title="annotation interface in pkg7">@A</a> java.lang.String><\
- /span> <span class="element-name">m1</span>​<span class="parameters">\
- (java.lang.Class<? extends java.lang.CharSequence> p1,
+ /span> <span class="element-name">m1</span><wbr><span class="parameters">(j\
+ ava.lang.Class<? extends java.lang.CharSequence> p1,
int[] p2)</span></div>
<div class="block"><span class="descfrm-type-label">Description copied from inte\
rface: <code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">Ann\
@@ -479,8 +479,8 @@ public class TestOverrideMethods extends JavadocTester {
checkOutput("pkg7/AnnotatedSub5.html", true,
"""
<div class="member-signature"><span class="return-type">java.lang.Iterable<ja\
- va.lang.String></span> <span class="element-name">m1</span>​<span \
- class="parameters">(<a href="A.html" title="annotation interface in pkg7">@A</a>
+ va.lang.String></span> <span class="element-name">m1</span><wbr><span cl\
+ ass="parameters">(<a href="A.html" title="annotation interface in pkg7">@A</a>
<a href="A.html" title="annotation interface in pkg7">@A</a> java.lang.Class<\
;? extends java.lang.CharSequence> p1,
int[] p2)</span></div>
@@ -503,9 +503,9 @@ public class TestOverrideMethods extends JavadocTester {
checkOutput("pkg7/AnnotatedSub6.html", true,
"""
<div class="member-signature"><span class="return-type">java.lang.Iterable<ja\
- va.lang.String></span> <span class="element-name">m1</span>​<span \
- class="parameters">(java.lang.Class<<a href="A.html" title="annotation interf\
- ace in pkg7">@A</a> ? extends java.lang.CharSequence> p1,
+ va.lang.String></span> <span class="element-name">m1</span><wbr><span cl\
+ ass="parameters">(java.lang.Class<<a href="A.html" title="annotation interfac\
+ e in pkg7">@A</a> ? extends java.lang.CharSequence> p1,
int[] p2)</span></div>
<div class="block"><span class="descfrm-type-label">Description copied from inte\
rface: <code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">Ann\
@@ -526,9 +526,9 @@ public class TestOverrideMethods extends JavadocTester {
checkOutput("pkg7/AnnotatedSub7.html", true,
"""
<div class="member-signature"><span class="return-type">java.lang.Iterable<ja\
- va.lang.String></span> <span class="element-name">m1</span>​<span \
- class="parameters">(java.lang.Class<? extends <a href="A.html" title="annotat\
- ion interface in pkg7">@A</a> java.lang.CharSequence> p1,
+ va.lang.String></span> <span class="element-name">m1</span><wbr><span cl\
+ ass="parameters">(java.lang.Class<? extends <a href="A.html" title="annotatio\
+ n interface in pkg7">@A</a> java.lang.CharSequence> p1,
int[] p2)</span></div>
<div class="block"><span class="descfrm-type-label">Description copied from inte\
rface: <code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">Ann\
@@ -549,9 +549,8 @@ public class TestOverrideMethods extends JavadocTester {
checkOutput("pkg7/AnnotatedSub8.html", true,
"""
<div class="member-signature"><span class="return-type">java.lang.Iterable<ja\
- va.lang.String></span> <span class="element-name">m1</span>​<span \
- class="parameters">(java.lang.Class<? extends java.lang.CharSequence> \
- ;p1,
+ va.lang.String></span> <span class="element-name">m1</span><wbr><span cl\
+ ass="parameters">(java.lang.Class<? extends java.lang.CharSequence> p1,
int <a href="A.html" title="annotation interface in pkg7">@A</a> [] p2)</s\
pan></div>
<div class="block"><span class="descfrm-type-label">Description copied from inte\
diff --git a/test/langtools/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java b/test/langtools/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java
index 44ca031335b..135890d22ee 100644
--- a/test/langtools/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java
+++ b/test/langtools/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -73,8 +73,8 @@ public class TestPrivateClasses extends JavadocTester {
// Method is documented as though it is declared in the inheriting method.
"""
<div class="member-signature"><span class="modifiers">public</span> <span c\
- lass="return-type">void</span> <span class="element-name">methodInheritedFromParent\
- </span>​<span class="parameters">(int p1)</span>
+ lass="return-type">void</span> <span class="element-name">methodInheritedFr\
+ omParent</span><wbr><span class="parameters">(int p1)</span>
throws <span class="exceptions">java.lang.Exception</span></div>""",
"""
<dl class="notes">
@@ -99,13 +99,13 @@ public class TestPrivateClasses extends JavadocTester {
// Should not document comments from private inherited interfaces
"""
<td class="col-last"><code><span class="member-name-link"><a href="#methodInterf\
- ace(int)">methodInterface</a></span>​(int p1)</code>
+ ace(int)">methodInterface</a></span><wbr>(int p1)</code>
<div class="block">Comment from interface.</div>
</td>""",
// and similarly one more
"""
<td class="col-last"><code><span class="member-name-link"><a href="#methodInterf\
- ace2(int)">methodInterface2</a></span>​(int p1)</code>
+ ace2(int)">methodInterface2</a></span><wbr>(int p1)</code>
<div class="block">Comment from interface.</div>
</td>"""
);
diff --git a/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java b/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java
index be98bceac80..8c59010c207 100644
--- a/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java
+++ b/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java
@@ -77,7 +77,7 @@ public class TestRecordTypes extends JavadocTester {
"""
<span class="modifiers">public record </span><span class="element-name type-name-label">R</span>""",
"""
- <code><a href="#%3Cinit%3E(int)" class="member-name-link">R</a>​(int r1)</code>""");
+ <code><a href="#%3Cinit%3E(int)" class="member-name-link">R</a><wbr>(int r1)</code>""");
}
@Test
@@ -98,7 +98,7 @@ public class TestRecordTypes extends JavadocTester {
"""
<span class="modifiers">public record </span><span class="element-name type-name-label">R</span>""",
"""
- <code><a href="#%3Cinit%3E(int)" class="member-name-link">R</a>​(int r1)</code>""");
+ <code><a href="#%3Cinit%3E(int)" class="member-name-link">R</a><wbr>(int r1)</code>""");
}
@Test
@@ -149,7 +149,7 @@ public class TestRecordTypes extends JavadocTester {
<dd><code><span id="param-r1">r1</span></code> - This is a component.</dd>
</dl>""",
"""
- <code><a href="#%3Cinit%3E(int)" class="member-name-link">R</a>​(int r1)</code>""");
+ <code><a href="#%3Cinit%3E(int)" class="member-name-link">R</a><wbr>(int r1)</code>""");
}
@Test
@@ -182,7 +182,7 @@ public class TestRecordTypes extends JavadocTester {
<dd><code><span id="param-r1">r1</span></code> - This is a component.</dd>
</dl>""",
"""
- <code><a href="#%3Cinit%3E(int)" class="member-name-link">R</a>​(int r1)</code>""");
+ <code><a href="#%3Cinit%3E(int)" class="member-name-link">R</a><wbr>(int r1)</code>""");
}
@Test
@@ -484,7 +484,7 @@ public class TestRecordTypes extends JavadocTester {
/span> <span class="element-name">i</span></div>""",
"""
<div class="member-signature"><span class="modifiers">public</span> <span c\
- lass="element-name">R</span>​<span class="parameters">("""
+ lass="element-name">R</span><wbr><span class="parameters">("""
+ pAnno
+ "int i)</span></div>",
"<div class=\"member-signature\">"
diff --git a/test/langtools/jdk/javadoc/doclet/testSerializedFormWithClassFile/TestSerializedFormWithClassFile.java b/test/langtools/jdk/javadoc/doclet/testSerializedFormWithClassFile/TestSerializedFormWithClassFile.java
index cadaabf1906..5dc0de13de4 100644
--- a/test/langtools/jdk/javadoc/doclet/testSerializedFormWithClassFile/TestSerializedFormWithClassFile.java
+++ b/test/langtools/jdk/javadoc/doclet/testSerializedFormWithClassFile/TestSerializedFormWithClassFile.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -76,8 +76,8 @@ public class TestSerializedFormWithClassFile extends JavadocTester {
checkOutput("serialized-form.html", true,
"""
<div class="member-signature"><span class="modifiers">public</span> <span c\
- lass="return-type">void</span> <span class="element-name">readObject</span>&\
- #8203;<span class="parameters">(java.io.ObjectInputStream arg0)</span>
+ lass="return-type">void</span> <span class="element-name">readObject</span>\
+ <wbr><span class="parameters">(java.io.ObjectInputStream arg0)</span>
throws <span class="exceptions">java.lang.ClassNotFoundException,
java.io.IOException</span></div>
""");
diff --git a/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java b/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java
index 01a9338b858..f52c4619aee 100644
--- a/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java
+++ b/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java
@@ -84,131 +84,133 @@ public class TestTypeAnnotations extends JavadocTester {
"""
<div class="type-signature"><span class="modifiers">class </span><span class="el\
ement-name type-name-label">ExtendsGeneric<K extends <a href="ClassParamA.htm\
- l" title="annotation interface in typeannos">@ClassParamA</a> <a href="Unannotated.html" t\
- itle="class in typeannos">Unannotated</a><<a href="ClassParamB.html" title="a\
- nnotation interface in typeannos">@ClassParamB</a> java.lang.String>></span>""");
+ l" title="annotation interface in typeannos">@ClassParamA</a> <a href="Unannotat\
+ ed.html" title="class in typeannos">Unannotated</a><<a href="ClassParamB.html\
+ " title="annotation interface in typeannos">@ClassParamB</a> java.lang.String>\
+ ;></span>""");
checkOutput("typeannos/TwoBounds.html", true,
"""
<div class="type-signature"><span class="modifiers">class </span><span class="el\
ement-name type-name-label">TwoBounds<K extends <a href="ClassParamA.html" ti\
- tle="annotation interface in typeannos">@ClassParamA</a> java.lang.String,​V extends\
- <a href="ClassParamB.html" title="annotation interface in typeannos">@ClassParamB</a> jav\
- a.lang.String></span>""");
+ tle="annotation interface in typeannos">@ClassParamA</a> java.lang.String,<wbr>V\
+ extends <a href="ClassParamB.html" title="annotation interface in typeannos">@C\
+ lassParamB</a> java.lang.String></span>""");
checkOutput("typeannos/Complex1.html", true,
"""
class </span><span class="element-name type-name-label">Complex1<K extends <a\
- href="ClassParamA.html" title="annotation interface in typeannos">@ClassParamA</a> java.l\
- ang.String & java.lang.Runnable></span>""");
+ href="ClassParamA.html" title="annotation interface in typeannos">@ClassParamA<\
+ /a> java.lang.String & java.lang.Runnable></span>""");
checkOutput("typeannos/Complex2.html", true,
"""
class </span><span class="element-name type-name-label">Complex2<K extends ja\
- va.lang.String & <a href="ClassParamB.html" title="annotation interface in typeannos">\
- @ClassParamB</a> java.lang.Runnable></span>""");
+ va.lang.String & <a href="ClassParamB.html" title="annotation interface in t\
+ ypeannos">@ClassParamB</a> java.lang.Runnable></span>""");
checkOutput("typeannos/ComplexBoth.html", true,
"""
class </span><span class="element-name type-name-label">ComplexBoth<K extends\
- <a href="ClassParamA.html" title="annotation interface in typeannos">@ClassParamA</a> jav\
- a.lang.String & <a href="ClassParamA.html" title="annotation interface in typeannos">@\
- ClassParamA</a> java.lang.Runnable></span>""");
+ <a href="ClassParamA.html" title="annotation interface in typeannos">@ClassPara\
+ mA</a> java.lang.String & <a href="ClassParamA.html" title="annotation inter\
+ face in typeannos">@ClassParamA</a> java.lang.Runnable></span>""");
// Test for type annotations on fields (Fields.java).
checkOutput("typeannos/DefaultScope.html", true,
"""
<div class="member-signature"><span class="return-type"><a href="Parameterized.h\
tml" title="class in typeannos">Parameterized</a><<a href="FldA.html" title="\
- annotation interface in typeannos">@FldA</a> java.lang.String,​<a href="FldB.html" t\
- itle="annotation interface in typeannos">@FldB</a> java.lang.String></span> <span \
- class="element-name">bothTypeArgs</span></div>""",
+ annotation interface in typeannos">@FldA</a> java.lang.String,<wbr><a href="FldB\
+ .html" title="annotation interface in typeannos">@FldB</a> java.lang.String><\
+ /span> <span class="element-name">bothTypeArgs</span></div>""",
"""
<div class="member-signature"><span class="return-type"><a href="FldA.html" titl\
- e="annotation interface in typeannos">@FldA</a> java.lang.String <a href="FldB.html" title\
- ="annotation interface in typeannos">@FldB</a> []</span> <span class="element-name">a\
- rray1Deep</span></div>""",
+ e="annotation interface in typeannos">@FldA</a> java.lang.String <a href="FldB.h\
+ tml" title="annotation interface in typeannos">@FldB</a> []</span> <span cl\
+ ass="element-name">array1Deep</span></div>""",
"""
<div class="member-signature"><span class="return-type">java.lang.String <a href\
- ="FldB.html" title="annotation interface in typeannos">@FldB</a> [][]</span> <span cl\
- ass="element-name">array2SecondOld</span></div>""",
+ ="FldB.html" title="annotation interface in typeannos">@FldB</a> [][]</span>&nbs\
+ p;<span class="element-name">array2SecondOld</span></div>""",
// When JDK-8068737, we should change the order
"""
<div class="member-signature"><span class="return-type"><a href="FldD.html" titl\
- e="annotation interface in typeannos">@FldD</a> java.lang.String <a href="FldC.html" title\
- ="annotation interface in typeannos">@FldC</a> <a href="FldB.html" title="annotation interface in ty\
- peannos">@FldB</a> [] <a href="FldC.html" title="annotation interface in typeannos">@FldC<\
- /a> <a href="FldA.html" title="annotation interface in typeannos">@FldA</a> []</span> \
- ;<span class="element-name">array2Deep</span></div>""");
+ e="annotation interface in typeannos">@FldD</a> java.lang.String <a href="FldC.h\
+ tml" title="annotation interface in typeannos">@FldC</a> <a href="FldB.html" tit\
+ le="annotation interface in typeannos">@FldB</a> [] <a href="FldC.html" title="a\
+ nnotation interface in typeannos">@FldC</a> <a href="FldA.html" title="annotatio\
+ n interface in typeannos">@FldA</a> []</span> <span class="element-name">ar\
+ ray2Deep</span></div>""");
checkOutput("typeannos/ModifiedScoped.html", true,
"""
<div class="member-signature"><span class="modifiers">public final</span> <\
span class="return-type"><a href="Parameterized.html" title="class in typeannos"\
- >Parameterized</a><<a href="FldA.html" title="annotation interface in typeannos">@FldA<\
- /a> <a href="Parameterized.html" title="class in typeannos">Parameterized</a><\
- ;<a href="FldA.html" title="annotation interface in typeannos">@FldA</a> java.lang.String,\
- ​<a href="FldB.html" title="annotation interface in typeannos">@FldB</a> java.lang.S\
- tring>,​<a href="FldB.html" title="annotation interface in typeannos">@FldB</a> j\
- ava.lang.String></span> <span class="element-name">nestedParameterized</\
- span></div>""",
+ >Parameterized</a><<a href="FldA.html" title="annotation interface in typeann\
+ os">@FldA</a> <a href="Parameterized.html" title="class in typeannos">Parameteri\
+ zed</a><<a href="FldA.html" title="annotation interface in typeannos">@FldA</\
+ a> java.lang.String,<wbr><a href="FldB.html" title="annotation interface in type\
+ annos">@FldB</a> java.lang.String>,<wbr><a href="FldB.html" title="annotation\
+ interface in typeannos">@FldB</a> java.lang.String></span> <span class=\
+ "element-name">nestedParameterized</span></div>""",
"""
<div class="member-signature"><span class="modifiers">public final</span> <\
- span class="return-type"><a href="FldA.html" title="annotation interface in typeannos">@Fl\
- dA</a> java.lang.String[][]</span> <span class="element-name">array2</span>\
- </div>""");
+ span class="return-type"><a href="FldA.html" title="annotation interface in type\
+ annos">@FldA</a> java.lang.String[][]</span> <span class="element-name">arr\
+ ay2</span></div>""");
// Test for type annotations on method return types (MethodReturnType.java).
checkOutput("typeannos/MtdDefaultScope.html", true,
"""
<div class="member-signature"><span class="modifiers">public</span> <span c\
lass="type-parameters"><T></span> <span class="return-type"><a href="\
- MRtnA.html" title="annotation interface in typeannos">@MRtnA</a> java.lang.String</span>&n\
- bsp;<span class="element-name">method</span>()</div>""",
+ MRtnA.html" title="annotation interface in typeannos">@MRtnA</a> java.lang.Strin\
+ g</span> <span class="element-name">method</span>()</div>""",
// When JDK-8068737 is fixed, we should change the order
"""
<div class="member-signature"><span class="return-type"><a href="MRtnA.html" tit\
- le="annotation interface in typeannos">@MRtnA</a> java.lang.String <a href="MRtnB.html" ti\
- tle="annotation interface in typeannos">@MRtnB</a> [] <a href="MRtnA.html" title="annotati\
- on interface in typeannos">@MRtnA</a> []</span> <span class="element-name">array2Deep\
- </span>()</div>""",
+ le="annotation interface in typeannos">@MRtnA</a> java.lang.String <a href="MRtn\
+ B.html" title="annotation interface in typeannos">@MRtnB</a> [] <a href="MRtnA.h\
+ tml" title="annotation interface in typeannos">@MRtnA</a> []</span> <span c\
+ lass="element-name">array2Deep</span>()</div>""",
"""
<div class="member-signature"><span class="return-type"><a href="MRtnA.html" tit\
- le="annotation interface in typeannos">@MRtnA</a> java.lang.String[][]</span> <span c\
- lass="element-name">array2</span>()</div>""");
+ le="annotation interface in typeannos">@MRtnA</a> java.lang.String[][]</span>&nb\
+ sp;<span class="element-name">array2</span>()</div>""");
checkOutput("typeannos/MtdModifiedScoped.html", true,
"""
<div class="member-signature"><span class="modifiers">public final</span> <\
span class="return-type"><a href="MtdParameterized.html" title="class in typeann\
- os">MtdParameterized</a><<a href="MRtnA.html" title="annotation interface in typeannos"\
- >@MRtnA</a> <a href="MtdParameterized.html" title="class in typeannos">MtdParame\
- terized</a><<a href="MRtnA.html" title="annotation interface in typeannos">@MRtnA</a> j\
- ava.lang.String,​<a href="MRtnB.html" title="annotation interface in typeannos">@MRt\
- nB</a> java.lang.String>,​<a href="MRtnB.html" title="annotation interface in typ\
- eannos">@MRtnB</a> java.lang.String></span> <span class="element-name">n\
- estedMtdParameterized</span>()</div>""");
+ os">MtdParameterized</a><<a href="MRtnA.html" title="annotation interface in \
+ typeannos">@MRtnA</a> <a href="MtdParameterized.html" title="class in typeannos"\
+ >MtdParameterized</a><<a href="MRtnA.html" title="annotation interface in typ\
+ eannos">@MRtnA</a> java.lang.String,<wbr><a href="MRtnB.html" title="annotation \
+ interface in typeannos">@MRtnB</a> java.lang.String>,<wbr><a href="MRtnB.html\
+ " title="annotation interface in typeannos">@MRtnB</a> java.lang.String></spa\
+ n> <span class="element-name">nestedMtdParameterized</span>()</div>""");
// Test for type annotations on method type parameters (MethodTypeParameters.java).
checkOutput("typeannos/UnscopedUnmodified.html", true,
"""
<div class="member-signature"><span class="type-parameters"><K extends <a hre\
- f="MTyParamA.html" title="annotation interface in typeannos">@MTyParamA</a> java.lang.Stri\
- ng></span> <span class="return-type">void</span> <span class="eleme\
- nt-name">methodExtends</span>()</div>""",
+ f="MTyParamA.html" title="annotation interface in typeannos">@MTyParamA</a> java\
+ .lang.String></span> <span class="return-type">void</span> <span cl\
+ ass="element-name">methodExtends</span>()</div>""",
"""
<div class="member-signature"><span class="type-parameters-long"><K extends <\
- a href="MTyParamA.html" title="annotation interface in typeannos">@MTyParamA</a> <a href="\
- MtdTyParameterized.html" title="class in typeannos">MtdTyParameterized</a><<a\
- href="MTyParamB.html" title="annotation interface in typeannos">@MTyParamB</a> java.lang.\
- String>></span>
+ a href="MTyParamA.html" title="annotation interface in typeannos">@MTyParamA</a>\
+ <a href="MtdTyParameterized.html" title="class in typeannos">MtdTyParameterized\
+ </a><<a href="MTyParamB.html" title="annotation interface in typeannos">@MTyP\
+ aramB</a> java.lang.String>></span>
<span class="return-type">void</span> <span class="element-name">nestedExtends</span>()</div>""");
checkOutput("typeannos/PublicModifiedMethods.html", true,
@@ -221,47 +223,49 @@ public class TestTypeAnnotations extends JavadocTester {
"""
<div class="member-signature"><span class="modifiers">public final</span> <\
span class="type-parameters-long"><K extends <a href="MTyParamA.html" title="\
- annotation interface in typeannos">@MTyParamA</a> java.lang.String,​
- V extends <a href="MTyParamA.html" title="annotation interface in typeannos">@MTyParamA</a\
- > <a href="MtdTyParameterized.html" title="class in typeannos">MtdTyParameterize\
- d</a><<a href="MTyParamB.html" title="annotation interface in typeannos">@MTyParamB</a>\
- java.lang.String>></span>
+ annotation interface in typeannos">@MTyParamA</a> java.lang.String,<wbr>
+ V extends <a href="MTyParamA.html" title="annotation interface in typeannos">@MT\
+ yParamA</a> <a href="MtdTyParameterized.html" title="class in typeannos">MtdTyPa\
+ rameterized</a><<a href="MTyParamB.html" title="annotation interface in typea\
+ nnos">@MTyParamB</a> java.lang.String>></span>
<span class="return-type">void</span> <span class="element-name">dual</span>()</div>""");
// Test for type annotations on parameters (Parameters.java).
checkOutput("typeannos/Parameters.html", true,
"""
<div class="member-signature"><span class="return-type">void</span> <span c\
- lass="element-name">unannotated</span>​<span class="parameters">(<a href="\
- ParaParameterized.html" title="class in typeannos">ParaParameterized</a><java\
- .lang.String,​java.lang.String> a)</span></div>""",
+ lass="element-name">unannotated</span><wbr><span class="parameters">(<a href="Pa\
+ raParameterized.html" title="class in typeannos">ParaParameterized</a><java.l\
+ ang.String,<wbr>java.lang.String> a)</span></div>""",
"""
<div class="member-signature"><span class="return-type">void</span> <span c\
- lass="element-name">nestedParaParameterized</span>​<span class="parameters\
- ">(<a href="ParaParameterized.html" title="class in typeannos">ParaParameterized\
- </a><<a href="ParamA.html" title="annotation interface in typeannos">@ParamA</a> <a hre\
- f="ParaParameterized.html" title="class in typeannos">ParaParameterized</a><<\
- a href="ParamA.html" title="annotation interface in typeannos">@ParamA</a> java.lang.Strin\
- g,​<a href="ParamB.html" title="annotation interface in typeannos">@ParamB</a> java.\
- lang.String>,​<a href="ParamB.html" title="annotation interface in typeannos">@Pa\
- ramB</a> java.lang.String> a)</span></div>""",
+ lass="element-name">nestedParaParameterized</span><wbr><span class="parameters">\
+ (<a href="ParaParameterized.html" title="class in typeannos">ParaParameterized</\
+ a><<a href="ParamA.html" title="annotation interface in typeannos">@ParamA</a\
+ > <a href="ParaParameterized.html" title="class in typeannos">ParaParameterized<\
+ /a><<a href="ParamA.html" title="annotation interface in typeannos">@ParamA</\
+ a> java.lang.String,<wbr><a href="ParamB.html" title="annotation interface in ty\
+ peannos">@ParamB</a> java.lang.String>,<wbr><a href="ParamB.html" title="anno\
+ tation interface in typeannos">@ParamB</a> java.lang.String> a)</span></\
+ div>""",
// When JDK-8068737 is fixed, we should change the order
"""
<div class="member-signature"><span class="return-type">void</span> <span c\
- lass="element-name">array2Deep</span>​<span class="parameters">(<a href="P\
- aramA.html" title="annotation interface in typeannos">@ParamA</a> java.lang.String <a href\
- ="ParamB.html" title="annotation interface in typeannos">@ParamB</a> [] <a href="ParamA.ht\
- ml" title="annotation interface in typeannos">@ParamA</a> [] a)</span></div>""");
+ lass="element-name">array2Deep</span><wbr><span class="parameters">(<a href="Par\
+ amA.html" title="annotation interface in typeannos">@ParamA</a> java.lang.String\
+ <a href="ParamB.html" title="annotation interface in typeannos">@ParamB</a> [] \
+ <a href="ParamA.html" title="annotation interface in typeannos">@ParamA</a> []&n\
+ bsp;a)</span></div>""");
// Test for type annotations on throws (Throws.java).
checkOutput("typeannos/ThrDefaultUnmodified.html", true,
"""
<div class="member-signature"><span class="return-type">void</span> <span c\
lass="element-name">oneException</span>()
- throws <span class="exceptions"><a href="ThrA.html" title="annotation interface\
- in typeannos">@ThrA</a> java.lang.Exception</span></div>""",
+ throws <span class="exceptions"><a href="ThrA.html" title="annotation\
+ interface in typeannos">@ThrA</a> java.lang.Exception</span></div>""",
"""
<div class="member-signature"><span class="return-type">void</span> <span c\
@@ -273,15 +277,15 @@ public class TestTypeAnnotations extends JavadocTester {
checkOutput("typeannos/ThrPublicModified.html", true,
"""
<div class="member-signature"><span class="modifiers">public final</span> <\
- span class="return-type">void</span> <span class="element-name">oneException</span>\
- ​<span class="parameters">(java.lang.String a)</span>
+ span class="return-type">void</span> <span class="element-name">oneExceptio\
+ n</span><wbr><span class="parameters">(java.lang.String a)</span>
throws <span class="exceptions"><a href="ThrA.html" titl\
e="annotation interface in typeannos">@ThrA</a> java.lang.Exception</span></div>""",
"""
<div class="member-signature"><span class="modifiers">public final</span> <\
- span class="return-type">void</span> <span class="element-name">twoExceptions</span\
- >​<span class="parameters">(java.lang.String a)</span>
+ span class="return-type">void</span> <span class="element-name">twoExceptio\
+ ns</span><wbr><span class="parameters">(java.lang.String a)</span>
throws <span class="exceptions"><a href="ThrA.html" tit\
le="annotation interface in typeannos">@ThrA</a> java.lang.RuntimeException,
<a href="ThrA.html" title="annotation interface in typeannos">@ThrA</a> java.lang.Exception</span></div>""");
@@ -290,8 +294,8 @@ public class TestTypeAnnotations extends JavadocTester {
"""
<div class="member-signature"><span class="return-type">void</span> <span c\
lass="element-name">oneException</span>()
- throws <span class="exceptions"><a href="ThrB.html" title="annotation interface\
- in typeannos">@ThrB</a>("m") java.lang.Exception</span></div>""",
+ throws <span class="exceptions"><a href="ThrB.html" title="annotation\
+ interface in typeannos">@ThrB</a>("m") java.lang.Exception</span></div>""",
"""
<div class="member-signature"><span class="return-type">void</span> <span c\
@@ -303,10 +307,10 @@ public class TestTypeAnnotations extends JavadocTester {
// Test for type annotations on type parameters (TypeParameters.java).
checkOutput("typeannos/TestMethods.html", true,
"""
- <div class="member-signature"><span class="type-parameters"><K,​
- <a href="TyParaA.html" title="annotation interface in typeannos">@TyParaA</a> V extends <a\
- href="TyParaA.html" title="annotation interface in typeannos">@TyParaA</a> java.lang.Stri\
- ng></span>
+ <div class="member-signature"><span class="type-parameters"><K,<wbr>
+ <a href="TyParaA.html" title="annotation interface in typeannos">@TyParaA</a> V \
+ extends <a href="TyParaA.html" title="annotation interface in typeannos">@TyPara\
+ A</a> java.lang.String></span>
<span class="return-type">void</span> <span class="element-name">secondAnnotated</span>()</div>"""
);
@@ -314,98 +318,99 @@ public class TestTypeAnnotations extends JavadocTester {
checkOutput("typeannos/BoundTest.html", true,
"""
<div class="member-signature"><span class="return-type">void</span> <span c\
- lass="element-name">wcExtends</span>​<span class="parameters">(<a href="My\
- List.html" title="class in typeannos">MyList</a><? extends <a href="WldA.html\
- " title="annotation interface in typeannos">@WldA</a> java.lang.String> l)</span><\
- /div>""",
+ lass="element-name">wcExtends</span><wbr><span class="parameters">(<a href="MyLi\
+ st.html" title="class in typeannos">MyList</a><? extends <a href="WldA.html" \
+ title="annotation interface in typeannos">@WldA</a> java.lang.String> l)\
+ </span></div>""",
"""
<div class="member-signature"><span class="return-type"><a href="MyList.html" ti\
tle="class in typeannos">MyList</a><? super <a href="WldA.html" title="annota\
- tion interface in typeannos">@WldA</a> java.lang.String></span> <span class="element-name"\
- >returnWcSuper</span>()</div>""");
+ tion interface in typeannos">@WldA</a> java.lang.String></span> <span cl\
+ ass="element-name">returnWcSuper</span>()</div>""");
checkOutput("typeannos/BoundWithValue.html", true,
"""
<div class="member-signature"><span class="return-type">void</span> <span c\
- lass="element-name">wcSuper</span>​<span class="parameters">(<a href="MyLi\
- st.html" title="class in typeannos">MyList</a><? super <a href="WldB.html" ti\
- tle="annotation interface in typeannos">@WldB</a>("m") java.lang.String> l)</span>\
- </div>""",
+ lass="element-name">wcSuper</span><wbr><span class="parameters">(<a href="MyList\
+ .html" title="class in typeannos">MyList</a><? super <a href="WldB.html" titl\
+ e="annotation interface in typeannos">@WldB</a>("m") java.lang.String> l\
+ )</span></div>""",
"""
<div class="member-signature"><span class="return-type"><a href="MyList.html" ti\
tle="class in typeannos">MyList</a><? extends <a href="WldB.html" title="anno\
- tation interface in typeannos">@WldB</a>("m") java.lang.String></span> <span class\
- ="element-name">returnWcExtends</span>()</div>""");
+ tation interface in typeannos">@WldB</a>("m") java.lang.String></span> <\
+ span class="element-name">returnWcExtends</span>()</div>""");
checkOutput("typeannos/SelfTest.html", true,
"""
<div class="member-signature"><span class="return-type"><a href="MyList.html" ti\
- tle="class in typeannos">MyList</a><<a href="WldA.html" title="annotation interface in \
- typeannos">@WldA</a> ?></span> <span class="element-name">returnWcExtends</span>\
- ()</div>""",
+ tle="class in typeannos">MyList</a><<a href="WldA.html" title="annotation int\
+ erface in typeannos">@WldA</a> ?></span> <span class="element-name">retu\
+ rnWcExtends</span>()</div>""",
"""
<div class="member-signature"><span class="return-type"><a href="MyList.html" ti\
- tle="class in typeannos">MyList</a><<a href="WldA.html" title="annotation interface in \
- typeannos">@WldA</a> ? extends <a href="WldA.html" title="annotation interface in typeanno\
- s">@WldA</a> <a href="MyList.html" title="class in typeannos">MyList</a><<a h\
- ref="WldB.html" title="annotation interface in typeannos">@WldB</a>("m") ?>></span>&\
- nbsp;<span class="element-name">complex</span>()</div>""");
+ tle="class in typeannos">MyList</a><<a href="WldA.html" title="annotation int\
+ erface in typeannos">@WldA</a> ? extends <a href="WldA.html" title="annotation i\
+ nterface in typeannos">@WldA</a> <a href="MyList.html" title="class in typeannos\
+ ">MyList</a><<a href="WldB.html" title="annotation interface in typeannos">@W\
+ ldB</a>("m") ?>></span> <span class="element-name">complex</span>()</\
+ div>""");
checkOutput("typeannos/SelfWithValue.html", true,
"""
<div class="member-signature"><span class="return-type"><a href="MyList.html" ti\
- tle="class in typeannos">MyList</a><<a href="WldB.html" title="annotation interface in \
- typeannos">@WldB</a>("m") ?></span> <span class="element-name">returnWcExtends</\
- span>()</div>""",
+ tle="class in typeannos">MyList</a><<a href="WldB.html" title="annotation int\
+ erface in typeannos">@WldB</a>("m") ?></span> <span class="element-name"\
+ >returnWcExtends</span>()</div>""",
"""
<div class="member-signature"><span class="return-type"><a href="MyList.html" ti\
- tle="class in typeannos">MyList</a><<a href="WldB.html" title="annotation interface in \
- typeannos">@WldB</a>("m") ? extends <a href="MyList.html" title="class in typean\
- nos">MyList</a><<a href="WldB.html" title="annotation interface in typeannos">@WldB</a>\
- ("m") ? super java.lang.String>></span> <span class="element-name">complex</s\
- pan>()</div>""");
+ tle="class in typeannos">MyList</a><<a href="WldB.html" title="annotation int\
+ erface in typeannos">@WldB</a>("m") ? extends <a href="MyList.html" title="class\
+ in typeannos">MyList</a><<a href="WldB.html" title="annotation interface in \
+ typeannos">@WldB</a>("m") ? super java.lang.String>></span> <span cla\
+ ss="element-name">complex</span>()</div>""");
// Test for receiver annotations (Receivers.java).
checkOutput("typeannos/DefaultUnmodified.html", true,
"""
<div class="member-signature"><span class="return-type">void</span> <span c\
- lass="element-name">withException</span>​<span class="parameters">(<a href\
- ="RcvrA.html" title="annotation interface in typeannos">@RcvrA</a> DefaultUnmodified&\
- nbsp;this)</span>
+ lass="element-name">withException</span><wbr><span class="parameters">(<a href="\
+ RcvrA.html" title="annotation interface in typeannos">@RcvrA</a> DefaultUnmodifi\
+ ed this)</span>
throws <span class="exceptions">java.lang.Exception</span></div>""",
"""
<div class="member-signature"><span class="return-type">java.lang.String</span>&\
- nbsp;<span class="element-name">nonVoid</span>​<span class="parameters">(<a href="\
- RcvrA.html" title="annotation interface in typeannos">@RcvrA</a> <a href="RcvrB.html" titl\
- e="annotation interface in typeannos">@RcvrB</a>("m") DefaultUnmodified this)</s\
- pan></div>""",
+ nbsp;<span class="element-name">nonVoid</span><wbr><span class="parameters">(<a \
+ href="RcvrA.html" title="annotation interface in typeannos">@RcvrA</a> <a href="\
+ RcvrB.html" title="annotation interface in typeannos">@RcvrB</a>("m") DefaultUnm\
+ odified this)</span></div>""",
"""
<div class="member-signature"><span class="type-parameters"><T extends java.l\
ang.Runnable></span> <span class="return-type">void</span> <span cl\
- ass="element-name">accept</span>​<span class="parameters">(<a href="RcvrA.\
- html" title="annotation interface in typeannos">@RcvrA</a> DefaultUnmodified thi\
- s,
+ ass="element-name">accept</span><wbr><span class="parameters">(<a href="RcvrA.ht\
+ ml" title="annotation interface in typeannos">@RcvrA</a> DefaultUnmodified \
+ this,
T r)</span>
throws <span class="exceptions">java.lang.Exception</span></div>""");
checkOutput("typeannos/PublicModified.html", true,
"""
<div class="member-signature"><span class="modifiers">public final</span> <\
- span class="return-type">java.lang.String</span> <span class="element-name">nonVoid\
- </span>​<span class="parameters">(<a href="RcvrA.html" title="annotation i\
- nterface in typeannos">@RcvrA</a> PublicModified this)</span></div>""",
+ span class="return-type">java.lang.String</span> <span class="element-name"\
+ >nonVoid</span><wbr><span class="parameters">(<a href="RcvrA.html" title="annota\
+ tion interface in typeannos">@RcvrA</a> PublicModified this)</span></div>""",
"""
<div class="member-signature"><span class="modifiers">public final</span> <\
span class="type-parameters"><T extends java.lang.Runnable></span> <s\
- pan class="return-type">void</span> <span class="element-name">accept</span>​\
- <span class="parameters">(<a href="RcvrA.html" title="annotation interface in typea\
- nnos">@RcvrA</a> PublicModified this,
+ pan class="return-type">void</span> <span class="element-name">accept</span\
+ ><wbr><span class="parameters">(<a href="RcvrA.html" title="annotation interface\
+ in typeannos">@RcvrA</a> PublicModified this,
T r)</span>
throws <span class="exceptions">java.lang.Exception</span></div>""");
@@ -413,24 +418,25 @@ public class TestTypeAnnotations extends JavadocTester {
"""
<div class="member-signature"><span class="type-parameters"><T extends java.l\
ang.Runnable></span> <span class="return-type">void</span> <span cl\
- ass="element-name">accept</span>​<span class="parameters">(<a href="RcvrB.\
- html" title="annotation interface in typeannos">@RcvrB</a>("m") WithValue this,
+ ass="element-name">accept</span><wbr><span class="parameters">(<a href="RcvrB.ht\
+ ml" title="annotation interface in typeannos">@RcvrB</a>("m") WithValue this,
T r)</span>
throws <span class="exceptions">java.lang.Exception</span></div>""");
checkOutput("typeannos/WithFinal.html", true,
"""
<div class="member-signature"><span class="return-type">java.lang.String</span>&\
- nbsp;<span class="element-name">nonVoid</span>​<span class="parameters">(<a href="\
- RcvrB.html" title="annotation interface in typeannos">@RcvrB</a>("m") <a href="WithFinal.h\
- tml" title="class in typeannos">WithFinal</a> afield)</span></div>""");
+ nbsp;<span class="element-name">nonVoid</span><wbr><span class="parameters">(<a \
+ href="RcvrB.html" title="annotation interface in typeannos">@RcvrB</a>("m") <a h\
+ ref="WithFinal.html" title="class in typeannos">WithFinal</a> afield)</span\
+ ></div>""");
checkOutput("typeannos/WithBody.html", true,
"""
<div class="member-signature"><span class="return-type">void</span> <span c\
- lass="element-name">field</span>​<span class="parameters">(<a href="RcvrA.\
- html" title="annotation interface in typeannos">@RcvrA</a> WithBody this)</span>\
- </div>""");
+ lass="element-name">field</span><wbr><span class="parameters">(<a href="RcvrA.ht\
+ ml" title="annotation interface in typeannos">@RcvrA</a> WithBody this)</sp\
+ an></div>""");
checkOutput("typeannos/Generic2.html", true,
"""
@@ -438,29 +444,30 @@ public class TestTypeAnnotations extends JavadocTester {
lass="element-name">test1</span>()</div>""",
"""
<div class="member-signature"><span class="return-type">void</span> <span c\
- lass="element-name">test2</span>​<span class="parameters">(<a href="RcvrA.\
- html" title="annotation interface in typeannos">@RcvrA</a> Generic2<X> thi\
- s)</span></div>""",
+ lass="element-name">test2</span><wbr><span class="parameters">(<a href="RcvrA.ht\
+ ml" title="annotation interface in typeannos">@RcvrA</a> Generic2<X> \
+ this)</span></div>""",
"""
<div class="member-signature"><span class="return-type">void</span> <span c\
- lass="element-name">test3</span>​<span class="parameters">(Generic2<<a \
- href="RcvrA.html" title="annotation interface in typeannos">@RcvrA</a> X> this)</s\
- pan></div>""",
+ lass="element-name">test3</span><wbr><span class="parameters">(Generic2<<a hr\
+ ef="RcvrA.html" title="annotation interface in typeannos">@RcvrA</a> X> \
+ this)</span></div>""",
"""
<div class="member-signature"><span class="return-type">void</span> <span cl\
- ass="element-name">test4</span>​<span class="parameters">(<a href="RcvrA.ht\
- ml" title="annotation interface in typeannos">@RcvrA</a> Generic2<<a href="RcvrA.html" t\
- itle="annotation interface in typeannos">@RcvrA</a> X> this)</span></div>""");
+ ass="element-name">test4</span><wbr><span class="parameters">(<a href="RcvrA.html\
+ " title="annotation interface in typeannos">@RcvrA</a> Generic2<<a href="RcvrA\
+ .html" title="annotation interface in typeannos">@RcvrA</a> X> this)</spa\
+ n></div>""");
// Test for repeated type annotations (RepeatedAnnotations.java).
checkOutput("typeannos/RepeatingAtClassLevel.html", true,
"""
<div class="type-signature"><span class="annotations"><a href="RepTypeA.html" ti\
- tle="annotation interface in typeannos">@RepTypeA</a> <a href="RepTypeA.html" title="annot\
- ation interface in typeannos">@RepTypeA</a>
- <a href="RepTypeB.html" title="annotation interface in typeannos">@RepTypeB</a> <a href="R\
- epTypeB.html" title="annotation interface in typeannos">@RepTypeB</a>
+ tle="annotation interface in typeannos">@RepTypeA</a> <a href="RepTypeA.html" ti\
+ tle="annotation interface in typeannos">@RepTypeA</a>
+ <a href="RepTypeB.html" title="annotation interface in typeannos">@RepTypeB</a> \
+ <a href="RepTypeB.html" title="annotation interface in typeannos">@RepTypeB</a>
</span><span class="modifiers">class </span><span class="element-name type-name-\
label">RepeatingAtClassLevel</span>
<span class="extends-implements">extends java.lang.Object</span></div>""");
@@ -489,11 +496,12 @@ public class TestTypeAnnotations extends JavadocTester {
checkOutput("typeannos/RepeatingOnConstructor.html", true,
"""
<div class="member-signature"><span class="annotations"><a href="RepConstructorA\
- .html" title="annotation interface in typeannos">@RepConstructorA</a> <a href="RepConstruc\
- torA.html" title="annotation interface in typeannos">@RepConstructorA</a>
- <a href="RepConstructorB.html" title="annotation interface in typeannos">@RepConstructorB<\
- /a> <a href="RepConstructorB.html" title="annotation interface in typeannos">@RepConstruct\
- orB</a>
+ .html" title="annotation interface in typeannos">@RepConstructorA</a> <a href="R\
+ epConstructorA.html" title="annotation interface in typeannos">@RepConstructorA<\
+ /a>
+ <a href="RepConstructorB.html" title="annotation interface in typeannos">@RepCon\
+ structorB</a> <a href="RepConstructorB.html" title="annotation interface in type\
+ annos">@RepConstructorB</a>
</span><span class="element-name">RepeatingOnConstructor</span>()</div>""",
"""
@@ -503,7 +511,7 @@ public class TestTypeAnnotations extends JavadocTester {
<a href="RepConstructorB.html" title="annotation interface in typeannos">@RepConstructorB<\
/a> <a href="RepConstructorB.html" title="annotation interface in typeannos">@RepConstruct\
orB</a>
- </span><span class="element-name">RepeatingOnConstructor</span>​<span class="parameters">(int i,
+ </span><span class="element-name">RepeatingOnConstructor</span><wbr><span class="parameters">(int i,
int j)</span></div>""",
"""
@@ -513,13 +521,13 @@ public class TestTypeAnnotations extends JavadocTester {
<a href="RepAllContextsB.html" title="annotation interface in typeannos">@RepAllContextsB<\
/a> <a href="RepAllContextsB.html" title="annotation interface in typeannos">@RepAllContex\
tsB</a>
- </span><span class="element-name">RepeatingOnConstructor</span>​<span class="parameters">(int i,
+ </span><span class="element-name">RepeatingOnConstructor</span><wbr><span class="parameters">(int i,
int j,
int k)</span></div>""",
"""
- <div class="member-signature"><span class="element-name">RepeatingOnConstructor</span>&#\
- 8203;<span class="parameters">(<a href="RepParameterA.html" title="annotation interface in\
+ <div class="member-signature"><span class="element-name">RepeatingOnConstructor</span>\
+ <wbr><span class="parameters">(<a href="RepParameterA.html" title="annotation interface in\
typeannos">@RepParameterA</a> <a href="RepParameterA.html" title="annotation interface in\
typeannos">@RepParameterA</a> <a href="RepParameterB.html" title="annotation interface in\
typeannos">@RepParameterB</a> <a href="RepParameterB.html" title="annotation interface in\
@@ -539,14 +547,14 @@ public class TestTypeAnnotations extends JavadocTester {
checkOutput("typeannos/RepeatingOnConstructor.Inner.html", true,
"""
<code><a href="#%3Cinit%3E(java.lang.String,java.lang.String...)" class="member-\
- name-link">Inner</a>​(java.lang.String parameter,
+ name-link">Inner</a><wbr>(java.lang.String parameter,
java.lang.String <a href="RepTypeUseA.html" title="annotation interface in typeannos">@Rep\
TypeUseA</a> <a href="RepTypeUseA.html" title="annotation interface in typeannos">@RepType\
UseA</a> <a href="RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeUseB\
</a> <a href="RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeUseB</a>\
... vararg)</code>""",
"""
- Inner</span>​<span class="parameters">(<a href="RepTypeUseA.html" title="a\
+ Inner</span><wbr><span class="parameters">(<a href="RepTypeUseA.html" title="a\
nnotation interface in typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.html" title="annot\
ation interface in typeannos">@RepTypeUseA</a> <a href="RepTypeUseB.html" title="annotatio\
n interface in typeannos">@RepTypeUseB</a> <a href="RepTypeUseB.html" title="annotation interface in\
@@ -710,7 +718,7 @@ public class TestTypeAnnotations extends JavadocTester {
"""
<code><a href="#test5(java.lang.String,java.lang.\
- String...)" class="member-name-link">test5</a>​(java.lang.String parameter,
+ String...)" class="member-name-link">test5</a><wbr>(java.lang.String parameter,
java.lang.String <a href="RepTypeUseA.html" title="annotation interface in typeannos">@Re\
pTypeUseA</a> <a href="RepTypeUseA.html" title="annotation interface in typeannos">@RepTyp\
eUseA</a> <a href="RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeUse\
@@ -758,12 +766,12 @@ public class TestTypeAnnotations extends JavadocTester {
pan class="element-name">test4</span>()""",
"""
- java.lang.String</span> <span class="element-name">test5</span>​<span\
- class="parameters">(<a href="RepTypeUseA.html" title="annotation interface in typeannos">@\
- RepTypeUseA</a> <a href="RepTypeUseA.html" title="annotation interface in typeannos">@RepT\
- ypeUseA</a> <a href="RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeU\
- seB</a> <a href="RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeUseB<\
- /a> RepeatingOnMethod this,
+ java.lang.String</span> <span class="element-name">test5</span><wbr><span class="para\
+ meters">(<a href="RepTypeUseA.html" title="annotation interface in typeannos">@RepTypeUseA\
+ </a> <a href="RepTypeUseA.html" title="annotation interface in typeannos">@RepTypeUseA</a>\
+ <a href="RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeUseB</a> <a \
+ href="RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeUseB</a> Repeati\
+ ngOnMethod this,
<a href="RepParameterA.html" title="annotation interface in typeannos">@RepParameterA</a> \
<a href="RepParameterA.html" title="annotation interface in typeannos">@RepParameterA</a> \
<a href="RepParameterB.html" title="annotation interface in typeannos">@RepParameterB</a> \
@@ -784,17 +792,17 @@ public class TestTypeAnnotations extends JavadocTester {
<code>(package private) <T> java.lang.String</code></div>
<div class="col-second even-row-color method-summary-table method-summary-table-\
tab2 method-summary-table-tab4"><code><a href="#genericMethod(T)" class="member-\
- name-link">genericMethod</a>​(T t)</code>""",
+ name-link">genericMethod</a><wbr>(T t)</code>""",
"""
<code>(package private) <T> java.lang.String</code></div>
<div class="col-second odd-row-color method-summary-table method-summary-table-t\
ab2 method-summary-table-tab4"><code><a href="#genericMethod2(T)" class="member-\
- name-link">genericMethod2</a>​(<a href="RepTypeUseA.html" title="annotatio\
- n interface in typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.html" title="anno\
- tation interface in typeannos">@RepTypeUseA</a> <a href="RepTypeUseB.html" title="annotati\
- on interface in typeannos">@RepTypeUseB</a> <a href="RepTypeUseB.html" title="annotation i\
- nterface in typeannos">@RepTypeUseB</a> T t)</code>""",
+ name-link">genericMethod2</a><wbr>(<a href="RepTypeUseA.html" title="annotation \
+ interface in typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.html" title="annot\
+ ation interface in typeannos">@RepTypeUseA</a> <a href="RepTypeUseB.html" title=\
+ "annotation interface in typeannos">@RepTypeUseB</a> <a href="RepTypeUseB.html" \
+ title="annotation interface in typeannos">@RepTypeUseB</a> T t)</code>""",
"""
<code>(package private) java.lang.String</code></div>
@@ -804,16 +812,16 @@ public class TestTypeAnnotations extends JavadocTester {
"""
<span class="return-type">java.lang.String</span> <span class="element-name">test</\
- span>​<span class="parameters">(<a href="RepTypeUseA.html" title="annotati\
- on interface in typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.html" title="annotation i\
- nterface in typeannos">@RepTypeUseA</a> <a href="RepTypeUseB.html" title="annotation interface in ty\
- peannos">@RepTypeUseB</a> <a href="RepTypeUseB.html" title="annotation interface in typean\
- nos">@RepTypeUseB</a> RepeatingOnTypeParametersBoundsTypeArgumentsOnMethod&\
- lt;<a href="RepTypeUseA.html" title="annotation interface in typeannos">@RepTypeUseA</a> <\
- a href="RepTypeUseA.html" title="annotation interface in typeannos">@RepTypeUseA</a> <a hr\
- ef="RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeUseB</a> <a href="\
- RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeUseB</a> T> th\
- is)""");
+ span><wbr><span class="parameters">(<a href="RepTypeUseA.html" title="annotation interfa\
+ ce in typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.html" title="annotation interface\
+ in typeannos">@RepTypeUseA</a> <a href="RepTypeUseB.html" title="annotation interface i\
+ n typeannos">@RepTypeUseB</a> <a href="RepTypeUseB.html" title="annotation interface in \
+ typeannos">@RepTypeUseB</a> RepeatingOnTypeParametersBoundsTypeArgumentsOnMethod<<a h\
+ ref="RepTypeUseA.html" title="annotation interface in typeannos">@RepTypeUseA</a> <a hre\
+ f="RepTypeUseA.html" title="annotation interface in typeannos">@RepTypeUseA</a> <a href=\
+ "RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeUseB</a> <a href="R\
+ epTypeUseB.html" title="annotation interface in typeannos">@RepTypeUseB</a> T> t\
+ his)""");
checkOutput("typeannos/RepeatingOnVoidMethodDeclaration.html", true,
"""
diff --git a/test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java b/test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java
index 57a3254b212..a548facfd54 100644
--- a/test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java
+++ b/test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java
@@ -56,7 +56,7 @@ public class TestTypeParameters extends JavadocTester {
checkOutput("pkg/C.html", true,
"""
<div class="col-first odd-row-color method-summary-table method-summary-table-ta\
- b2 method-summary-table-tab4"><code><W extends java.lang.String,​
+ b2 method-summary-table-tab4"><code><W extends java.lang.String,<wbr>
V extends java.util.List><br>java.lang.Object</code></div>""",
"<code><T> java.lang.Object</code>");