Adapt security for JSP UI, breaks RIA UI (user natures collection)

[lgpl/argeo-commons.git] / security / runtime / org.argeo.security.core / src / main / java / org / argeo / security / UserNature.java

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/UserNature.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/UserNature.java
index 3713fdc79142b561bd960663f4dc0ec66d3b9322..25710e40529021018fdf94fa1529b7bc42a3aa74 100644 (file)
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/UserNature.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/UserNature.java
@@ -1,7 +1,24 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.security;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
 import org.argeo.ArgeoException;
 
@@ -22,7 +39,8 @@ public class UserNature implements Serializable {
        }
 
        public final static void updateUserNaturesWithCheck(
-                       List<UserNature> userNatures, List<UserNature> userNaturesData) {
+                       Map<String, UserNature> userNatures,
+                       Map<String, UserNature> userNaturesData) {
                if (userNatures.size() != userNaturesData.size())
                        throw new ArgeoException(
                                        "It is forbidden to add or remove user natures via this method");
@@ -39,8 +57,8 @@ public class UserNature implements Serializable {
                                                "Could not find a user nature of type " + type);
                }
 
-               for (int i = 0; i < userNatures.size(); i++) {
-                       userNatures.set(i, userNaturesData.get(i));
+               for (String key : userNatures.keySet()) {
+                       userNatures.put(key, userNaturesData.get(key));
                }
        }
 }