X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2FSimpleArgeoUser.java;fp=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2FSimpleArgeoUser.java;h=c021f8e4453a8e1ae61975c7839c644c9f9d7288;hb=136dab5338b5f731b285d17c804861bd5e5a9b5c;hp=ca7229c2b27cef7770295f84500ba54d98ccd2b8;hpb=43e77c157692d040ad20ea9c15d236b57ce0a9ac;p=lgpl%2Fargeo-commons.git diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/SimpleArgeoUser.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/SimpleArgeoUser.java index ca7229c2b..c021f8e44 100644 --- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/SimpleArgeoUser.java +++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/SimpleArgeoUser.java @@ -28,7 +28,8 @@ import org.argeo.ArgeoException; * Read-write implementation of an Argeo user. Typically initialized with a * generic instance (read-only9 in order to modify a user. */ -public class SimpleArgeoUser implements ArgeoUser, Serializable { +public class SimpleArgeoUser implements ArgeoUser, Serializable, + Comparable { private static final long serialVersionUID = 1L; private String username; @@ -70,24 +71,27 @@ public class SimpleArgeoUser implements ArgeoUser, Serializable { "Could not find a user nature of type " + type); } - // for (int i = 0; i < userNatures.size(); i++) { - // String type = userNatures.get(i).getType(); - // boolean found = false; - // for (int j = 0; j < userNatures.size(); j++) { - // String newType = userNaturesData.get(j).getType(); - // if (type.equals(newType)) - // found = true; - // } - // if (!found) - // throw new ArgeoException( - // "Could not find a user nature of type " + type); - // } - for (String key : userNatures.keySet()) { userNatures.put(key, userNaturesData.get(key)); } } + @Override + public boolean equals(Object obj) { + if (!(obj instanceof ArgeoUser)) + return false; + return ((ArgeoUser) obj).getUsername().equals(username); + } + + public int compareTo(ArgeoUser o) { + return username.compareTo(o.getUsername()); + } + + @Override + public int hashCode() { + return username.hashCode(); + } + @Override public String toString() { return username;