You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2012/01/28 12:36:27 UTC
[3/3] git commit: Wicket-2949 even if empty raw input takes precedence
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/df4d78e8
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/df4d78e8
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/df4d78e8
Branch: refs/heads/master
Commit: df4d78e8ed9f2b2d5601b9ccfeca6c28b81305ef
Parents: 42a640a
Author: Sven Meier <sv...@meiers.net>
Authored: Sat Jan 28 11:53:31 2012 +0100
Committer: Sven Meier <sv...@meiers.net>
Committed: Sat Jan 28 11:53:31 2012 +0100
----------------------------------------------------------------------
.../org/apache/wicket/markup/html/form/Check.java | 15 +++++++----
.../extensions/markup/html/form/select/Select.java | 19 ++++++++------
2 files changed, 20 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/df4d78e8/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 f0f6b1c..85dfb8c 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/df4d78e8/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 45f8b37..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
@@ -180,7 +180,7 @@ public class Select<T> extends FormComponent<T>
/**
* @see FormComponent#updateModel()
*/
- @SuppressWarnings( { "unchecked", "rawtypes" })
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void updateModel()
{
@@ -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;