[#286] Patch that even if you have many arguments with same length, t…

…hey will be add in the right order.
playframework · Oct 15, 2010 · 1531d15 · 1531d15
1 parent 5d49a46
commit 1531d15
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/framework/src/play/data/validation/Check.java b/framework/src/play/data/validation/Check.java
@@ -13,8 +13,8 @@ public Check() {
     public void setMessage(String message, String... vars) {
         checkWithCheck.setMessage(message);
         checkWithCheck.variables.clear();
-        for (String variable : vars) {
-            checkWithCheck.variables.put("var" + (variable.length()), variable);
+        for (int i = 0; i < vars.length; i++) {
+            checkWithCheck.variables.put("var" + i, vars[i]);
         }
         checkWithCheck.setVariables();
     }

diff --git a/framework/src/play/data/validation/CheckWithCheck.java b/framework/src/play/data/validation/CheckWithCheck.java
@@ -1,8 +1,9 @@
 package play.data.validation;
 
 import java.lang.reflect.Constructor;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.TreeMap;
+
 import net.sf.oval.Validator;
 import net.sf.oval.configuration.annotation.AbstractAnnotationCheck;
 import net.sf.oval.context.OValContext;
@@ -13,7 +14,7 @@ public class CheckWithCheck extends AbstractAnnotationCheck<CheckWith> {
 
     final static String mes = "validation.invalid";
 
-    Map<String, String> variables = new HashMap<String, String>();
+    Map<String, String> variables = new TreeMap<String, String>();
     Check check;
 
     @Override