X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2FSimpleArgeoUser.java;h=29166472146f8bd3e6e39aa30597da0c2b6f835d;hb=8b78007039ccb1f19d498742a64cf62435e8b093;hp=ca7229c2b27cef7770295f84500ba54d98ccd2b8;hpb=ab4dcfd6237c3f2064e63b3e6bb1a740f0a56e2c;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..291664721 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,9 @@ 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 {
+@Deprecated
+public class SimpleArgeoUser implements ArgeoUser, Serializable,
+		Comparable<ArgeoUser> {
 	private static final long serialVersionUID = 1L;
 
 	private String username;
@@ -52,10 +54,12 @@ public class SimpleArgeoUser implements ArgeoUser, Serializable {
 		return userNatures;
 	}
 
+	@Deprecated
 	public void updateUserNatures(Map<String, UserNature> userNaturesData) {
 		updateUserNaturesWithCheck(userNatures, userNaturesData);
 	}
 
+	@Deprecated
 	public static void updateUserNaturesWithCheck(
 			Map<String, UserNature> userNatures,
 			Map<String, UserNature> userNaturesData) {
@@ -70,24 +74,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;
@@ -105,6 +112,7 @@ public class SimpleArgeoUser implements ArgeoUser, Serializable {
 		this.username = username;
 	}
 
+	@Deprecated
 	public void setUserNatures(Map<String, UserNature> userNatures) {
 		this.userNatures = userNatures;
 	}