Wicket-2949 even if empty raw input takes precedence
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/61792e65 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/61792e65 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/61792e65 Branch: refs/heads/wicket-1.5.x Commit: 61792e650fe87f47f4970cc59589a60792445ce2 Parents: e25e1c9 Author: Sven Meier <[email protected]> Authored: Sat Jan 28 11:59:34 2012 +0100 Committer: Sven Meier <[email protected]> Committed: Sat Jan 28 11:59:34 2012 +0100 ---------------------------------------------------------------------- .../org/apache/wicket/markup/html/form/Check.java | 15 ++++++++----- .../extensions/markup/html/form/select/Select.java | 17 ++++++++------ 2 files changed, 19 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/61792e65/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Check.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Check.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Check.java index 322894d..21a5643 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Check.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Check.java @@ -174,15 +174,18 @@ public class Check<T> extends LabeledWebMarkupContainer "] contains a null model object, must be an object of type java.util.Collection"); } - final String raw = group.getRawInput(); - if (!Strings.isEmpty(raw)) + if (group.hasRawInput()) { - final String[] values = raw.split(FormComponent.VALUE_SEPARATOR); - for (String value : values) + final String raw = group.getRawInput(); + if (!Strings.isEmpty(raw)) { - if (uuid.equals(value)) + final String[] values = raw.split(FormComponent.VALUE_SEPARATOR); + for (String value : values) { - tag.put("checked", "checked"); + if (uuid.equals(value)) + { + tag.put("checked", "checked"); + } } } } http://git-wip-us.apache.org/repos/asf/wicket/blob/61792e65/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java index a44625c..083ccc3 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java @@ -221,16 +221,19 @@ public class Select<T> extends FormComponent<T> Args.notNull(option, "option"); // if the raw input is specified use that, otherwise use model - final String raw = getRawInput(); - if (!Strings.isEmpty(raw)) + if (hasRawInput()) { - String[] values = raw.split(VALUE_SEPARATOR); - for (int i = 0; i < values.length; i++) + final String raw = getRawInput(); + if (!Strings.isEmpty(raw)) { - String value = values[i]; - if (value.equals(option.getValue())) + String[] values = raw.split(VALUE_SEPARATOR); + for (int i = 0; i < values.length; i++) { - return true; + String value = values[i]; + if (value.equals(option.getValue())) + { + return true; + } } } return false;
