X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Finternal%2FUiAdminUtils.java;fp=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Finternal%2FUiAdminUtils.java;h=4419d80a9e0b9387ba1dd37f489d831d1e4ef4e8;hb=a1d862e4ef6221ebc91fcccea688d66504020365;hp=062be2dfcc0fda08d2165f7ee712839bcc5fdc59;hpb=831fd907fdc595e64c7835534c1ca625cd9d914b;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java
index 062be2dfc..4419d80a9 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java
@@ -10,6 +10,7 @@ import javax.transaction.Status;
 import javax.transaction.UserTransaction;
 
 import org.argeo.ArgeoException;
+import org.argeo.osgi.useradmin.LdifName;
 import org.argeo.security.ui.admin.internal.providers.UserTransactionProvider;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
@@ -28,8 +29,7 @@ public class UiAdminUtils {
 	}
 
 	public final static boolean isCurrentUser(User user) {
-		String userName = UiAdminUtils.getProperty(user,
-				UserAdminConstants.KEY_DN);
+		String userName = getProperty(user, LdifName.dn.name());
 		try {
 			LdapName selfUserName = UiAdminUtils.getLdapName();
 			LdapName userLdapName = new LdapName(userName);
@@ -57,14 +57,14 @@ public class UiAdminUtils {
 	}
 
 	public final static User getUser(UserAdmin userAdmin, LdapName dn) {
-		User user = userAdmin.getUser(UserAdminConstants.KEY_DN, dn.toString());
+		User user = userAdmin.getUser(LdifName.dn.name(), dn.toString());
 		return user;
 	}
 
 	public final static String getUsername(User user) {
-		String cn = getProperty(user, UserAdminConstants.KEY_CN);
+		String cn = getProperty(user, LdifName.dn.name());
 		if (isEmpty(cn))
-			cn = getProperty(user, UserAdminConstants.KEY_UID);
+			cn = getProperty(user, LdifName.uid.name());
 		return cn;
 	}