Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 15:17:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Copy changes from checkboxlist and refactor changes to match existing

Browse Source 
code.  See WW-4181.
This commit is contained in:
Greg Huber
2014-01-31 13:45:03 +00:00
parent 763264238a
commit f3c54b90ac
2 changed files with 95 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java
+48 -30
View File
@@ -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<String, Object> params = context.getParameters();
Map<String, Object> 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");
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
// 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)).addIfExists("class", params.get("cssClass"))
.addIfExists("style", params.get("cssStyle"));
super.start("label", a);
if (StringUtils.isNotEmpty(itemValueStr))
characters(itemValueStr);
super.end("label");
//Hidden input section
// Hidden input section
a = new Attributes();
a.add("type", "hidden")
.add("id", "__multiselect_" + StringUtils.defaultString(StringEscapeUtils.escapeHtml4(id)))
.add("name", "__multiselect_" + StringUtils.defaultString(StringEscapeUtils.escapeHtml4(name)))
.add("value", "")
.addIfTrue("disabled", disabled);
.add("value", "").addIfTrue("disabled", disabled);
start("input", a);
end("input");
@@ -102,16 +98,38 @@ public class CheckboxListHandler extends AbstractTagHandler implements TagGenera
}
}
/**
* It's set to true if the nameValue (the value associated with the name
* which is typically set in the action is equal to the current key value.
*
* @param params
* the params
*
* @param itemKeyStr
* the item key str
*
* @return the boolean
*/
private Boolean isChecked(Map<String, Object> params, String itemKeyStr) {
Boolean checked = false;
if (itemKeyStr != null) {
String[] nameValues = (String[]) params.get("nameValue");
if (nameValues != null) {
for (String value : nameValues) {
if (checked = value.equalsIgnoreCase(itemKeyStr)) {
break;
}
}
// NameValue are the values that is provided by the name property
// in the action
Object nameValue = params.get("nameValue");
if (nameValue != null) {
Iterator itt = MakeIterator.convert(nameValue);
while (itt.hasNext()) {
String value = (String) itt.next();
if (checked = value.equalsIgnoreCase(itemKeyStr)) {
break;
}
}
}
}
return checked;
plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/RadioHandler.java
+47 -23
View File
@@ -40,8 +40,6 @@ public class RadioHandler extends AbstractTagHandler implements TagGenerator {
Object listObj = params.get("list");
String listKey = (String) params.get("listKey");
String listValue = (String) params.get("listValue");
// NameValue is the value that is provided by the name property in the action
Object nameValue = params.get("nameValue");
int cnt = 0;
ValueStack stack = this.context.getStack();
@@ -51,40 +49,28 @@ public class RadioHandler extends AbstractTagHandler implements TagGenerator {
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());
// nameValue needs to cast to a string from object
String itemNameValueStr = (nameValue == null ? null : nameValue.toString());
//Checked value. It's set to true if the nameValue (the value associated with the name which is typically set in
//the action is equal to the current key value.
Boolean checked = itemKeyStr != null && itemNameValueStr != null && itemNameValueStr.equals(itemKeyStr);
//Radio button section
// Radio button section
String id = params.get("id") + Integer.toString(cnt++);
Attributes a = new Attributes();
a.add("type", "radio")
.addDefaultToEmpty("name", params.get("name"))
.addIfTrue("checked", checked)
.addIfExists("value", itemKeyStr)
.addIfTrue("disabled", params.get("disabled"))
.addIfExists("tabindex", params.get("tabindex"))
a.add("type", "radio").addDefaultToEmpty("name", params.get("name"))
.addIfTrue("checked", isChecked(params, itemKeyStr)).addIfExists("value", itemKeyStr)
.addIfTrue("disabled", params.get("disabled")).addIfExists("tabindex", params.get("tabindex"))
.addIfExists("id", id);
super.start("input", a);
super.end("input");
//Label section
// Label section
a = new Attributes();
a.addIfExists("for", id)
.addIfExists("class", params.get("cssClass"))
.addIfExists("style", params.get("cssStyle"))
.addIfExists("title", params.get("title"));
a.addIfExists("for", id).addIfExists("class", params.get("cssClass"))
.addIfExists("style", params.get("cssStyle")).addIfExists("title", params.get("title"));
super.start("label", a);
if (StringUtils.isNotEmpty(itemValueStr)) {
characters(itemValueStr);
@@ -95,4 +81,42 @@ public class RadioHandler extends AbstractTagHandler implements TagGenerator {
}
}
/**
* It's set to true if the nameValue (the value associated with the name
* which is typically set in the action is equal to the current key value.
*
* @param params
* the params
*
* @param itemKeyStr
* the item key str
*
* @return the boolean
*/
private Boolean isChecked(Map<String, Object> params, String itemKeyStr) {
Boolean checked = false;
if (itemKeyStr != null) {
// NameValue are the values that is provided by the name property
// in the action
Object nameValue = params.get("nameValue");
if (nameValue != null) {
Iterator itt = MakeIterator.convert(nameValue);
while (itt.hasNext()) {
String value = (String) itt.next();
if (checked = value.equalsIgnoreCase(itemKeyStr)) {
break;
}
}
}
}
return checked;
}
}