svn commit: r826223 - /wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java

[jdonnerstag]

Author: jdonnerstag
Date: Sat Oct 17 10:51:41 2009
New Revision: 826223

URL: http://svn.apache.org/viewvc?rev=826223&view=rev
Log:
fixed  CheckBoxMultipleChoice ignores isDisabled() checks
Issue: WICKET-2528

Modified:
    
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java

Modified: 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java?rev=826223&r1=826222&r2=826223&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
 Sat Oct 17 10:51:41 2009
@@ -414,17 +414,12 @@
                                final String idAttr = getMarkupId() + "-" + 
getInputName() + "_" + id;
 
                                // Add checkbox element
-                               buffer.append("<input name=\"")
-                                       .append(getInputName())
-                                       .append("\"")
-                                       .append(" type=\"checkbox\"")
-                                       .append((isSelected(choice, index, 
selected) ? " checked=\"checked\"" : ""))
-                                       .append((isEnabled() ? "" : " 
disabled=\"disabled\""))
-                                       .append(" value=\"")
-                                       .append(id)
-                                       .append("\" id=\"")
-                                       .append(idAttr)
-                                       .append("\"/>");
+                               buffer.append("<input 
name=\"").append(getInputName()).append("\"").append(
+                                       " type=\"checkbox\"").append(
+                                       (isSelected(choice, index, selected) ? 
" checked=\"checked\"" : "")).append(
+                                       (isEnabled() && !isDisabled(choice, 
index, selected) ? ""
+                                               : " 
disabled=\"disabled\"")).append(" value=\"").append(id).append(
+                                       "\" 
id=\"").append(idAttr).append("\"/>");
 
                                // Add label for checkbox
                                String display = label;