X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2FUserNature.java;h=25710e40529021018fdf94fa1529b7bc42a3aa74;hb=79d37fb873ba8ebaafe64c924f53bc9c76ea6d8c;hp=3713fdc79142b561bd960663f4dc0ec66d3b9322;hpb=f516f257ad75279a2d14ab3d39e041637f10219d;p=lgpl%2Fargeo-commons.git 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 3713fdc79..25710e405 100644 --- 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 + * + * 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 userNatures, List userNaturesData) { + Map userNatures, + Map 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)); } } }