(struts) branch main updated: Sync tag with main ftl template. (#1212)

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/struts.git


The following commit(s) were added to refs/heads/main by this push:
     new f35c808ef Sync tag with main ftl template. (#1212)
f35c808ef is described below

commit f35c808efce514cbcefaf583c0761b50b1f9cdbe
Author: gregh3269 <gregh3...@gmail.com>
AuthorDate: Tue Mar 4 15:45:45 2025 +0000

    Sync tag with main ftl template. (#1212)
    
    Co-authored-by: Greg Huber <ghu...@apache.org>
---
 .../org/apache/struts2/views/java/simple/CheckboxListHandler.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java
 
b/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java
index 2ef97f4f4..2116cad60 100644
--- 
a/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java
+++ 
b/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java
@@ -68,14 +68,15 @@ public class CheckboxListHandler extends AbstractTagHandler 
implements TagGenera
                         .addIfTrue("checked", isChecked(params, itemKeyStr))
                         .addIfTrue("readonly", 
params.get("readonly")).addIfTrue("disabled", disabled)
                         .addIfExists("tabindex", params.get("tabindex"))
-                        .addIfExists("id", id + "-" + Integer.toString(cnt));
+                        .addIfExists("id", id + "-" + Integer.toString(cnt))
+                        .addIfExists("class", params.get("cssClass"))
+                        .addIfExists("style", params.get("cssStyle"));
                 start("input", a);
                 end("input");
 
                 // Label section
                 a = new Attributes();
-                a.add("for", id + "-" + 
Integer.toString(cnt)).addIfExists("class", params.get("cssClass"))
-                        .addIfExists("style", params.get("cssStyle"));
+                a.add("for", id + "-" + Integer.toString(cnt)).add("class", 
"checkboxLabel");
                 super.start("label", a);
                 if (StringUtils.isNotEmpty(itemValueStr))
                     characters(itemValueStr);