This is an automated email from the ASF dual-hosted git repository. thiagohp pushed a commit to branch javax in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
commit 79844a9931a9f3889968a10577d6c259bddc45e2 Author: Thiago H. de Paula Figueiredo <[email protected]> AuthorDate: Tue Feb 24 23:08:53 2026 -0300 Fixing compilation errors on tapestry-javadoc --- .../apache/tapestry5/javadoc/ClassDescription.java | 37 ++++++++++++++-------- .../tapestry5/javadoc/ParameterDescription.java | 25 ++++++++------- .../tapestry5/javadoc/TapestryDocTaglet.java | 27 +++++++++------- 3 files changed, 52 insertions(+), 37 deletions(-) diff --git a/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/ClassDescription.java b/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/ClassDescription.java index 2b959b1bb..1af159767 100644 --- a/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/ClassDescription.java +++ b/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/ClassDescription.java @@ -14,12 +14,23 @@ package org.apache.tapestry5.javadoc; -import com.sun.source.doctree.DocCommentTree; -import com.sun.source.doctree.DocTree; -import com.sun.source.doctree.SinceTree; -import com.sun.source.util.SimpleDocTreeVisitor; -import jdk.javadoc.doclet.DocletEnvironment; -import org.apache.commons.lang.StringUtils; +import java.util.List; +import java.util.Map; + +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.Element; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.TypeMirror; +import javax.lang.model.util.ElementFilter; +import javax.lang.model.util.SimpleAnnotationValueVisitor9; +import javax.lang.model.util.SimpleTypeVisitor9; + +import org.apache.commons.lang3.StringUtils; import org.apache.tapestry5.BindingConstants; import org.apache.tapestry5.annotations.Component; import org.apache.tapestry5.annotations.Events; @@ -27,14 +38,12 @@ import org.apache.tapestry5.annotations.Parameter; import org.apache.tapestry5.commons.util.CollectionFactory; import org.apache.tapestry5.ioc.internal.util.InternalUtils; -import javax.lang.model.element.*; -import javax.lang.model.type.DeclaredType; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.util.ElementFilter; -import javax.lang.model.util.SimpleAnnotationValueVisitor9; -import javax.lang.model.util.SimpleTypeVisitor9; -import java.util.List; -import java.util.Map; +import com.sun.source.doctree.DocCommentTree; +import com.sun.source.doctree.DocTree; +import com.sun.source.doctree.SinceTree; +import com.sun.source.util.SimpleDocTreeVisitor; + +import jdk.javadoc.doclet.DocletEnvironment; public class ClassDescription { diff --git a/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/ParameterDescription.java b/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/ParameterDescription.java index d9f87c176..f97e66e7b 100644 --- a/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/ParameterDescription.java +++ b/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/ParameterDescription.java @@ -14,18 +14,20 @@ package org.apache.tapestry5.javadoc; -import com.sun.source.doctree.*; -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.tapestry5.commons.util.CollectionFactory; - -import javax.lang.model.element.VariableElement; import java.io.IOException; import java.util.Locale; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.lang.model.element.VariableElement; + +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.text.StringEscapeUtils; +import org.apache.tapestry5.commons.util.CollectionFactory; + +import com.sun.source.doctree.*; + public class ParameterDescription { public final VariableElement field; @@ -103,18 +105,19 @@ public class ParameterDescription String label = seeTag.getLabel().toString(); if (StringUtils.isNotEmpty(label)) { - builder.append(StringEscapeUtils.escapeHtml(label)); + builder.append(StringEscapeUtils.escapeHtml4(label)); continue; } if (seeTag.getReference() != null) - builder.append(StringEscapeUtils.escapeHtml(seeTag.getReference().getSignature())); + builder.append( + StringEscapeUtils.escapeHtml4(seeTag.getReference().getSignature())); } else if (tag.getKind() == DocTree.Kind.CODE) { LiteralTree codeTag = (LiteralTree) tag; builder.append("<code>"); - builder.append(StringEscapeUtils.escapeHtml(codeTag.getBody().getBody())); + builder.append(StringEscapeUtils.escapeHtml4(codeTag.getBody().getBody())); builder.append("</code>"); } } @@ -135,7 +138,7 @@ public class ParameterDescription boolean match = m.find(index); if (match){ if (index != m.start()){ - sb.append(StringEscapeUtils.escapeHtml(string.substring(index, m.start()))); + sb.append(StringEscapeUtils.escapeHtml4(string.substring(index, m.start()))); } String tagName = m.group(1); if (tagName!= null){ @@ -147,7 +150,7 @@ public class ParameterDescription } index = m.end(); }else{ - sb.append(StringEscapeUtils.escapeHtml(string.substring(index))); + sb.append(StringEscapeUtils.escapeHtml4(string.substring(index))); break; } } diff --git a/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java b/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java index 2229af4f8..336e0c2d1 100644 --- a/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java +++ b/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java @@ -14,18 +14,6 @@ package org.apache.tapestry5.javadoc; -import com.sun.source.doctree.DocTree; -import jdk.javadoc.doclet.Doclet; -import jdk.javadoc.doclet.DocletEnvironment; -import jdk.javadoc.doclet.Taglet; -import org.apache.commons.lang.StringUtils; -import org.apache.tapestry5.commons.util.CollectionFactory; -import org.apache.tapestry5.ioc.internal.util.InternalUtils; - -import javax.lang.model.element.Element; -import javax.lang.model.element.TypeElement; -import javax.tools.JavaFileObject; -import javax.tools.StandardLocation; import java.io.File; import java.io.IOException; import java.io.StringWriter; @@ -34,6 +22,21 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.lang.model.element.Element; +import javax.lang.model.element.TypeElement; +import javax.tools.JavaFileObject; +import javax.tools.StandardLocation; + +import org.apache.commons.lang3.StringUtils; +import org.apache.tapestry5.commons.util.CollectionFactory; +import org.apache.tapestry5.ioc.internal.util.InternalUtils; + +import com.sun.source.doctree.DocTree; + +import jdk.javadoc.doclet.Doclet; +import jdk.javadoc.doclet.DocletEnvironment; +import jdk.javadoc.doclet.Taglet; + /** * An inline tag allowed inside a type; it produces Tapestry component reference and other information. */
