8352740: Introduce new factory method HtmlTree.IMG

Reviewed-by: liach, jjg

Author: nizarbenalla

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SearchWriter.java

@@ -143,10 +143,9 @@ private Content createResourceSection() {
                 .add(HtmlTree.SPAN(Text.of("link"))
                         .setId(HtmlId.of("page-search-link")))
                 .add(HtmlTree.BUTTON(HtmlId.of("page-search-copy"))
-                        .add(HtmlTree.of(HtmlTag.IMG)
-                                .put(HtmlAttr.SRC, pathToRoot.resolve(DocPaths.RESOURCE_FILES)
-                                        .resolve(DocPaths.CLIPBOARD_SVG).getPath())
-                                .put(HtmlAttr.ALT, copyUrlText))
+                        .add(HtmlTree.IMG(pathToRoot.resolve(DocPaths.RESOURCE_FILES)
+                                        .resolve(DocPaths.CLIPBOARD_SVG),
+                                copyUrlText))
                         .add(HtmlTree.SPAN(Text.of(copyText))
                                 .put(HtmlAttr.DATA_COPIED, copiedText))
                         .addStyle(HtmlStyles.copy)

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableOfContents.java

@@ -117,17 +117,12 @@ protected Content toContent(boolean hasFilterInput) {
         content.add(listBuilder);
         content.add(HtmlTree.BUTTON(HtmlStyles.hideSidebar)
                 .add(HtmlTree.SPAN(writer.contents.hideSidebar).add(Entity.NO_BREAK_SPACE))
-                .add(HtmlTree.of(HtmlTag.IMG)
-                        .put(HtmlAttr.SRC, writer.pathToRoot.resolve(DocPaths.RESOURCE_FILES)
-                                .resolve(DocPaths.LEFT_SVG).getPath())
-                        .put(HtmlAttr.ALT, writer.contents.hideSidebar.toString())));
+                .add(HtmlTree.IMG(writer.pathToRoot.resolve(DocPaths.RESOURCE_FILES).resolve(DocPaths.LEFT_SVG),
+                        writer.contents.hideSidebar.toString())));
         content.add(HtmlTree.BUTTON(HtmlStyles.showSidebar)
-                .add(HtmlTree.of(HtmlTag.IMG)
-                        .put(HtmlAttr.SRC, writer.pathToRoot.resolve(DocPaths.RESOURCE_FILES)
-                                .resolve(DocPaths.RIGHT_SVG).getPath())
-                        .put(HtmlAttr.ALT, writer.contents.showSidebar.toString()))
+                .add(HtmlTree.IMG(writer.pathToRoot.resolve(DocPaths.RESOURCE_FILES)
+                        .resolve(DocPaths.RIGHT_SVG), writer.contents.showSidebar.toString()))
                 .add(HtmlTree.SPAN(Entity.NO_BREAK_SPACE).add(writer.contents.showSidebar)));
         return content;
     }
-
 }

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java

@@ -194,10 +194,9 @@ private Content snippetTagOutput(Element element, SnippetTree tag, StyledText co
                 HtmlTree.of(HtmlTag.BUTTON)
                         .add(HtmlTree.SPAN(Text.of(copyText))
                                 .put(HtmlAttr.DATA_COPIED, copiedText))
-                        .add(HtmlTree.of(HtmlTag.IMG)
-                                .put(HtmlAttr.SRC, pathToRoot.resolve(DocPaths.RESOURCE_FILES)
-                                                             .resolve(DocPaths.CLIPBOARD_SVG).getPath())
-                                .put(HtmlAttr.ALT, copySnippetText))
+                        .add(HtmlTree.IMG(pathToRoot.resolve(DocPaths.RESOURCE_FILES)
+                                        .resolve(DocPaths.CLIPBOARD_SVG),
+                                copySnippetText))
                         .addStyle(HtmlStyles.copy)
                         .addStyle(HtmlStyles.snippetCopy)
                         .put(HtmlAttr.ARIA_LABEL, copySnippetText)

src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlTree.java

@@ -38,6 +38,8 @@
 import java.util.Objects;
 import java.util.function.Function;
 
+import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
+
 /**
  * A tree node representing an HTML element, containing the name of the element,
  * a collection of attributes, and content.
@@ -1155,6 +1157,18 @@ public static HtmlTree WBR() {
         return WBR_INSTANCE;
     }
 
+    /**
+     * {@return an HTML {@code IMG} element}
+     *
+     * @param src the path of the image
+     * @param alt alternate text for the image
+     */
+    public static HtmlTree IMG(DocPath src, String alt) {
+        return new HtmlTree(HtmlTag.IMG)
+                .put(HtmlAttr.SRC, src.getPath())
+                .put(HtmlAttr.ALT, alt);
+    }
+
     @Override
     public boolean isEmpty() {
         return (!hasContent() && !hasAttrs());