svn commit: r1436660 - /struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java

[lukaszlenart]

Author: lukaszlenart
Date: Mon Jan 21 22:23:18 2013
New Revision: 1436660

URL: http://svn.apache.org/viewvc?rev=1436660&view=rev
Log:
WW-3919 adds proper logic to render id attribute

Modified:
    
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java

Modified: 
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java?rev=1436660&r1=1436659&r2=1436660&view=diff
==============================================================================
--- 
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java
 (original)
+++ 
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java
 Mon Jan 21 22:23:18 2013
@@ -72,13 +72,13 @@ public class CheckboxListHandler extends
                        .addIfTrue("readonly", params.get("readonly"))
                        .addIfTrue("disabled", disabled)
                        .addIfExists("tabindex", params.get("tabindex"))
-                       .addIfExists("id", name + "-" + 
Integer.toString(cnt++));
+                    .addIfExists("id", id + "-" + Integer.toString(cnt));
                        start("input", a);
                        end("input");
 
                 //Label section
                 a = new Attributes();
-                a.add("for",id)
+                a.add("for",id + "-" + Integer.toString(cnt))
                        .addIfExists("class", params.get("cssClass"))
                        .addIfExists("style", params.get("cssStyle"));
                 super.start("label", a);
@@ -97,7 +97,7 @@ public class CheckboxListHandler extends
                 end("input");
 
                 stack.pop();
-
+                cnt++;
             }
         }
     }