Updated Branches:
refs/heads/master 763264238 -> b0dee67bf
Copy changes from checkboxlist and refactor changes to match existing
code. See WW-4181.
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f3c54b90
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f3c54b90
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f3c54b90
Branch: refs/heads/master
Commit: f3c54b90ac5e63cd403c256ad10312fc2eb753cb
Parents: 7632642
Author: Greg Huber
Authored: Fri Jan 31 13:45:03 2014 +
Committer: Greg Huber
Committed: Fri Jan 31 13:45:03 2014 +
--
.../views/java/simple/CheckboxListHandler.java | 80
.../struts2/views/java/simple/RadioHandler.java | 70 +++--
2 files changed, 96 insertions(+), 54 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/f3c54b90/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java
--
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 478e6d1..f44746d 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
@@ -22,6 +22,7 @@
package org.apache.struts2.views.java.simple;
import com.opensymphony.xwork2.util.ValueStack;
+
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.struts2.util.MakeIterator;
@@ -35,9 +36,9 @@ import java.util.Map;
public class CheckboxListHandler extends AbstractTagHandler implements
TagGenerator {
public void generate() throws IOException {
- Map params = context.getParameters();
+Map params = context.getParameters();
- //Get parameters
+// Get parameters
Object listObj = params.get("list");
String listKey = (String) params.get("listKey");
String listValue = (String) params.get("listValue");
@@ -47,7 +48,7 @@ public class CheckboxListHandler extends AbstractTagHandler
implements TagGenera
int cnt = 1;
-//This will interate through all lists
+// This will interate through all lists
ValueStack stack = this.context.getStack();
if (listObj != null) {
Iterator itt = MakeIterator.convert(listObj);
@@ -55,44 +56,39 @@ public class CheckboxListHandler extends AbstractTagHandler
implements TagGenera
Object item = itt.next();
stack.push(item);
-//key
+// key
Object itemKey = findValue(listKey != null ? listKey : "top");
String itemKeyStr = StringUtils.defaultString(itemKey == null
? null : itemKey.toString());
-//value
+// value
Object itemValue = findValue(listValue != null ? listValue :
"top");
String itemValueStr = StringUtils.defaultString(itemValue ==
null ? null : itemValue.toString());
-//Checkbox button section
+// Checkbox button section
Attributes a = new Attributes();
-a.add("type", "checkbox")
- .add("name", name)
- .add("value", itemKeyStr)
- .addIfTrue("checked", isChecked(params, itemKeyStr))
- .addIfTrue("readonly", params.get("readonly"))
- .addIfTrue("disabled", disabled)
- .addIfExists("tabindex", params.get("tabindex"))
-.addIfExists("id", id + "-" + Integer.toString(cnt));
- start("input", a);
- end("input");
-
-//Label section
+a.add("type", "checkbox").add("name", name).add("value",
itemKeyStr)
+.addIfTrue("checked", isChecked(params, itemKeyStr))
+.addIfTrue("readonly",
params.get("readonly")).addIfTrue("disabled", disabled)
+.addIfExists("tabindex", params.get("tabindex"))
+.addIfExists("id", id + "-" + Integer.toString(cnt));
+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"
