git commit: Make we sure we handle doubles/longs correctly, for class cast exception.
Updated Branches: refs/heads/master b0dee67bf -> e858e4d00 Make we sure we handle doubles/longs correctly, for class cast exception. Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e858e4d0 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e858e4d0 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e858e4d0 Branch: refs/heads/master Commit: e858e4d000ecca5ba628225724fdfd98b31d9e7a Parents: b0dee67 Author: Greg Huber Authored: Mon Feb 3 10:09:22 2014 + Committer: Greg Huber Committed: Mon Feb 3 10:09:22 2014 + -- .../views/java/simple/CheckboxListHandler.java | 219 ++- .../struts2/views/java/simple/RadioHandler.java | 178 --- 2 files changed, 212 insertions(+), 185 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/e858e4d0/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 f44746d..891fee5 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 @@ -33,106 +33,123 @@ import java.io.IOException; import java.util.Iterator; import java.util.Map; -public class CheckboxListHandler extends AbstractTagHandler implements TagGenerator { -public void generate() throws IOException { - -Map params = context.getParameters(); - -// Get parameters -Object listObj = params.get("list"); -String listKey = (String) params.get("listKey"); -String listValue = (String) params.get("listValue"); -String name = (String) params.get("name"); -Object disabled = params.get("disabled"); -String id = (String) params.get("id"); - -int cnt = 1; - -// This will interate through all lists -ValueStack stack = this.context.getStack(); -if (listObj != null) { -Iterator itt = MakeIterator.convert(listObj); -while (itt.hasNext()) { -Object item = itt.next(); -stack.push(item); - -// key -Object itemKey = findValue(listKey != null ? listKey : "top"); -String itemKeyStr = StringUtils.defaultString(itemKey == null ? null : itemKey.toString()); - -// value -Object itemValue = findValue(listValue != null ? listValue : "top"); -String itemValueStr = StringUtils.defaultString(itemValue == null ? null : itemValue.toString()); - -// 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 = new Attributes(); -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 -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); -start("input", a); -end("input"); - -stack.pop(); -cnt++; -} -} -} - -/** - * 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 - * -
git commit: Code formatting changes only.
Updated Branches: refs/heads/master e858e4d00 -> 18b9c55b4 Code formatting changes only. Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/18b9c55b Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/18b9c55b Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/18b9c55b Branch: refs/heads/master Commit: 18b9c55b4b6271c1f9c143c86e235382750c3836 Parents: e858e4d Author: Greg Huber Authored: Mon Feb 3 14:02:39 2014 + Committer: Greg Huber Committed: Mon Feb 3 14:02:39 2014 + -- .../views/java/simple/CheckboxListHandler.java | 224 +-- .../struts2/views/java/simple/RadioHandler.java | 188 2 files changed, 200 insertions(+), 212 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/18b9c55b/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 891fee5..3914b30 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 @@ -33,123 +33,111 @@ import java.io.IOException; import java.util.Iterator; import java.util.Map; -public class CheckboxListHandler extends AbstractTagHandler implements - TagGenerator { - public void generate() throws IOException { - - Map params = context.getParameters(); - - // Get parameters - Object listObj = params.get("list"); - String listKey = (String) params.get("listKey"); - String listValue = (String) params.get("listValue"); - String name = (String) params.get("name"); - Object disabled = params.get("disabled"); - String id = (String) params.get("id"); - - int cnt = 1; - - // This will interate through all lists - ValueStack stack = this.context.getStack(); - if (listObj != null) { - Iterator itt = MakeIterator.convert(listObj); - while (itt.hasNext()) { - Object item = itt.next(); - stack.push(item); - - // key - Object itemKey = findValue(listKey != null ? listKey : "top"); - String itemKeyStr = StringUtils - .defaultString(itemKey == null ? null : itemKey - .toString()); - - // value - Object itemValue = findValue(listValue != null ? listValue - : "top"); - String itemValueStr = StringUtils - .defaultString(itemValue == null ? null : itemValue - .toString()); - - // 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 = new Attributes(); - 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); - sup
[CONF] Confluence Changes in the last 24 hours
Confluence Changes in the last 24 hours Apache Camel Pages Page: Camel 2.13.0 Release edited by Henryk Konsek [01:24 PM] (View Changes) Page: Bean Validation edited by Henryk Konsek [01:19 PM] (View Changes) Page: Component List edited by Henryk Konsek [12:27 PM] (View Changes) Page: File2 edited by Claus Ibsen [08:19 AM] (View Changes) Apache Cloudstack Pages Page: Domain-Account-User Sync Up Among Multiple Regions edited by Alex Ough [08:34 PM] (View Changes) Page: Dynamic ComputeOffering edited by prashant kumar mishra [10:08 AM] (View Changes) Page: Database High Availability (DB HA) edited by Damodar Reddy T [10:02 AM] (View Changes) Apache CXF Documentation Pages Page: JAX-RS OAuth2 edited by Sergey Beryozkin [05:37 PM] (View Changes) Page: JAXRS Kerberos edited by Sergey Beryozkin [11:17 AM] (View Changes) Apache Helix Pages Page: Building a Participant created by Kanak Biscuitwala [08:23 PM] Page: Building a Spectator created by Kanak Biscuitwala [08:29 PM] Apache Hive Pages Page: Configuration Properties edited by Lefty Leverenz [01:53 PM] (View Changes) Page: HiveServer2 Clients edited by Lefty Leverenz [01:14 PM] (View Changes) Page: Setting Up HiveServer2 edited by Lefty Leverenz [01:06 PM] (View Changes) Apache Kafka Pages Page: Kafka 0.9 Consumer Rewrite Design edited by Guozhang Wang [02:02 AM] (View Changes) OFBiz Project Administration Workspace Pages Page: New Features Roadmap - Living Document edited by Jacques Le Roux [08:44 PM] (View Changes)