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/27 17:23:47 UTC

[2/3] git commit: wicket-2949 use raw input

wicket-2949 use raw input


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/8a43cb3f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8a43cb3f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8a43cb3f

Branch: refs/heads/wicket-1.4.x
Commit: 8a43cb3f8772f3e70a2deb0174d24eb873d0b1c9
Parents: ebec622
Author: Sven Meier <sv...@meiers.net>
Authored: Fri Jan 27 16:14:37 2012 +0100
Committer: Sven Meier <sv...@meiers.net>
Committed: Fri Jan 27 16:44:40 2012 +0100

----------------------------------------------------------------------
 .../extensions/markup/html/form/select/Select.java |    3 ++-
 .../org/apache/wicket/markup/html/form/Check.java  |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/8a43cb3f/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 46f7bcc..805d91a 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,7 +213,8 @@ public class Select<T> extends FormComponent<T>
 		// if the raw input is specified use that, otherwise use model
 		if (hasRawInput())
 		{
-			String[] values = getInputAsArray();
+			// Wicket-2949 getInputAsArray() might not be the raw input
+			String[] values = getRawInput().split(VALUE_SEPARATOR);
 			if (values != null && values.length > 0)
 			{
 				for (int i = 0; i < values.length; i++)

http://git-wip-us.apache.org/repos/asf/wicket/blob/8a43cb3f/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 3d1be5c..9ed4897 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,7 +177,8 @@ public class Check<T> extends LabeledWebMarkupContainer
 
 		if (group.hasRawInput())
 		{
-			final String[] input = group.getInputAsArray();
+			// Wicket-2949 getInputAsArray() might not be the raw input
+			final String[] input = group.getRawInput().split(FormComponent.VALUE_SEPARATOR);
 
 			if (input != null)
 			{