Updated Branches: refs/heads/master 42a640a57 -> df4d78e8e refs/heads/wicket-1.4.x 8a43cb3f8 -> 037776f14 refs/heads/wicket-1.5.x e25e1c9f0 -> 61792e650
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/037776f1 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/037776f1 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/037776f1 Branch: refs/heads/wicket-1.4.x Commit: 037776f141d7d9db539c64474909e685f3e80313 Parents: 8a43cb3 Author: Sven Meier <[email protected]> Authored: Sat Jan 28 12:08:20 2012 +0100 Committer: Sven Meier <[email protected]> Committed: Sat Jan 28 12:08:20 2012 +0100 ---------------------------------------------------------------------- .../extensions/markup/html/form/select/Select.java | 8 ++++---- .../org/apache/wicket/markup/html/form/Check.java | 11 +++++------ 2 files changed, 9 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/037776f1/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 805d91a..5f006c3 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 @@ -213,10 +213,10 @@ public class Select<T> extends FormComponent<T> // if the raw input is specified use that, otherwise use model if (hasRawInput()) { - // Wicket-2949 getInputAsArray() might not be the raw input - String[] values = getRawInput().split(VALUE_SEPARATOR); - if (values != null && values.length > 0) + final String raw = getRawInput(); + if (!Strings.isEmpty(raw)) { + String[] values = raw.split(VALUE_SEPARATOR); for (int i = 0; i < values.length; i++) { String value = values[i]; @@ -225,8 +225,8 @@ public class Select<T> extends FormComponent<T> return true; } } - return false; } + return false; } return compareModels(getDefaultModelObject(), option.getDefaultModelObject()); http://git-wip-us.apache.org/repos/asf/wicket/blob/037776f1/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java ---------------------------------------------------------------------- diff --git a/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java b/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java index 9ed4897..0e04d76 100644 --- a/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java +++ b/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java @@ -177,14 +177,13 @@ public class Check<T> extends LabeledWebMarkupContainer if (group.hasRawInput()) { - // Wicket-2949 getInputAsArray() might not be the raw input - final String[] input = group.getRawInput().split(FormComponent.VALUE_SEPARATOR); - - if (input != null) + final String raw = group.getRawInput(); + if (!Strings.isEmpty(raw)) { - for (int i = 0; i < input.length; i++) + final String[] values = raw.split(FormComponent.VALUE_SEPARATOR); + for (String value : values) { - if (uuid.equals(input[i])) + if (uuid.equals(value)) { tag.put("checked", "checked"); }
