[jdk11u-dev] Withdrawn: 8222669: Create and use new html.Entity class

[Amos Shi]

On Thu, 25 Apr 2024 21:46:44 GMT, Amos Shi <ashi at openjdk.org> wrote:

> Backport of [JDK-8222669](https://bugs.openjdk.org/browse/JDK-8222669). The reason is `8222669` is a dependency to [JDK-8253700](https://bugs.openjdk.org/browse/JDK-8253700).
> - This PR contains two commits
>   - Commit 1: is the `git apply` change
>   - Commit 2: is the manual merge of the `.rej` files. All changes has two types
>     - Add missing `import`, or re-organize the `import` section based on the original commit
>     - Change `Contents.SPACE` to `Entity.NO_BREAK_SPACE` based on the original commit
>  
> Sample manual merge file
> - `NestedClassWriterImpl.java.rej`
> 
> 
> @@ -32,6 +32,7 @@
>  import javax.lang.model.element.TypeElement;
>  
>  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.StringContent;
> @@ -154,7 +155,7 @@
>                      : resources.getText("doclet.Nested_Classes_Interfaces_Inherited_From_Class"));
>          }
>          Content labelHeading = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING, label);
> -        labelHeading.add(Contents.SPACE);
> +        labelHeading.add(Entity.NO_BREAK_SPACE);
>          labelHeading.add(classLink);
>          inheritedTree.add(labelHeading);
>      }
> 
> 
> 
> 
> Testing
> - Local: Test passed on `MacOS 14.4.1`
>   - `dev-8222669-11/test/langtools/jdk/javadoc/doclet`: Test results: passed: `191`
> - Pipeline: All checks have passed
> - Testing Machine: SAP nightlies passed on `2024-04-27`
>   - jdk/javadoc/doclet/5093723/T5093723.java: SUCCESSFUL GitHub 📊⏲ - [58,605 msec]
>   - jdk/javadoc/doclet/AccessAsciiArt/AccessAsciiArt.java: SUCCESSFUL GitHub 📊⏲ - [38,695 msec]
>   - jdk/javadoc/doclet/AccessSummary/AccessSummary.java: SUCCESSFUL GitHub 📊⏲ - [44,981 msec]
>   - jdk/javadoc/doclet/ValidHtml/ValidHtml.java: SUCCESSFUL GitHub 📊⏲ - [4,706 msec]
>   - jdk/javadoc/doclet/VersionNumber/VersionNumber.java: SUCCESSFUL GitHub 📊⏲ - [2,702 msec]
>   - ...

This pull request has been closed without being integrated.

-------------

PR: https://git.openjdk.org/jdk11u-dev/pull/2680