Return-Path: 
 <bval-commits-return-572-apmail-incubator-bval-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-bval-commits-archive@minotaur.apache.org
Received: (qmail 94625 invoked from network); 27 Sep 2010 14:57:38 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 27 Sep 2010 14:57:38 -0000
Received: (qmail 23084 invoked by uid 500); 27 Sep 2010 14:57:38 -0000
Delivered-To: apmail-incubator-bval-commits-archive@incubator.apache.org
Received: (qmail 23048 invoked by uid 500); 27 Sep 2010 14:57:37 -0000
Mailing-List: contact bval-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:bval-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:bval-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:bval-commits@incubator.apache.org>
List-Id: <bval-commits.incubator.apache.org>
Reply-To: bval-dev@incubator.apache.org
Delivered-To: mailing list bval-commits@incubator.apache.org
Received: (qmail 23041 invoked by uid 99); 27 Sep 2010 14:57:36 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Sep 2010 14:57:36 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Sep 2010 14:57:36 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id B65BD2388A36; Mon, 27 Sep 2010 14:57:15 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1001768 -
 /incubator/bval/sandbox/lang3-work/bval-jsr303d/src/main/java/org/apache/bval/constraints/dynamic/AbstractValuesConstraintAppender.java
Date: Mon, 27 Sep 2010 14:57:15 -0000
To: bval-commits@incubator.apache.org
From: mbenson@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100927145715.B65BD2388A36@eris.apache.org>

Author: mbenson
Date: Mon Sep 27 14:57:15 2010
New Revision: 1001768

URL: http://svn.apache.org/viewvc?rev=1001768&view=rev
Log:
preserve order from *values constraints as far as possible

Modified:
    incubator/bval/sandbox/lang3-work/bval-jsr303d/src/main/java/org/apache/bval/constraints/dynamic/AbstractValuesConstraintAppender.java

Modified: incubator/bval/sandbox/lang3-work/bval-jsr303d/src/main/java/org/apache/bval/constraints/dynamic/AbstractValuesConstraintAppender.java
URL: http://svn.apache.org/viewvc/incubator/bval/sandbox/lang3-work/bval-jsr303d/src/main/java/org/apache/bval/constraints/dynamic/AbstractValuesConstraintAppender.java?rev=1001768&r1=1001767&r2=1001768&view=diff
==============================================================================
--- incubator/bval/sandbox/lang3-work/bval-jsr303d/src/main/java/org/apache/bval/constraints/dynamic/AbstractValuesConstraintAppender.java (original)
+++ incubator/bval/sandbox/lang3-work/bval-jsr303d/src/main/java/org/apache/bval/constraints/dynamic/AbstractValuesConstraintAppender.java Mon Sep 27 14:57:15 2010
@@ -25,6 +25,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -89,9 +90,9 @@ public abstract class AbstractValuesCons
     }
 
     private class CumulativeValues {
-        final Set<V> values = new HashSet<V>();
+        final Set<V> values = new LinkedHashSet<V>();
         final Set<Class<? extends Payload>> payload = new HashSet<Class<? extends Payload>>();
-        final Set<String> message = new HashSet<String>();
+        final Set<String> message = new LinkedHashSet<String>();
         final Strategy strategy;
 
         /**
@@ -283,8 +284,8 @@ public abstract class AbstractValuesCons
         CumulativeValues values = valuesMap.remove(group);
         HashSet<Class<?>> groups = new HashSet<Class<?>>();
         groups.add(group.getGroup());
-        HashSet<Class<? extends Payload>> payloads = new HashSet<Class<? extends Payload>>(values.payload);
-        HashSet<String> messages = new HashSet<String>(values.message);
+        Set<Class<? extends Payload>> payloads = new LinkedHashSet<Class<? extends Payload>>(values.payload);
+        Set<String> messages = new LinkedHashSet<String>(values.message);
         if (!values.values.isEmpty()) {
             // merge groups with same values and strategy:
             for (Iterator<Map.Entry<Group, CumulativeValues>> iter = valuesMap.entrySet().iterator(); iter.hasNext();) {