X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Finternal%2Fproviders%2FUserAdminAbstractLP.java;h=2b0a13db79da99e006aff2a9d1b460c233d06c46;hb=8260f4470f514ea347ca53f5b4dfc632c4a4de66;hp=0590088b2c37d1641d4768853bf36747524a2e14;hpb=a1d862e4ef6221ebc91fcccea688d66504020365;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserAdminAbstractLP.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserAdminAbstractLP.java
index 0590088b2..2b0a13db7 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserAdminAbstractLP.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserAdminAbstractLP.java
@@ -3,10 +3,8 @@ package org.argeo.security.ui.admin.internal.providers;
 import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
 
-import org.argeo.ArgeoException;
-import org.argeo.osgi.useradmin.LdifName;
-import org.argeo.security.ui.admin.internal.UiAdminUtils;
-import org.argeo.security.ui.admin.internal.UserAdminConstants;
+import org.argeo.cms.CmsException;
+import org.argeo.cms.util.useradmin.UserAdminUtils;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.swt.SWT;
@@ -18,8 +16,7 @@ import org.osgi.service.useradmin.User;
  * Utility class that add font modifications to a column label provider
  * depending on the given user properties
  */
-public abstract class UserAdminAbstractLP extends ColumnLabelProvider implements
-		UserAdminConstants {
+public abstract class UserAdminAbstractLP extends ColumnLabelProvider {
 	private static final long serialVersionUID = 137336765024922368L;
 
 	// private Font italic;
@@ -29,9 +26,8 @@ public abstract class UserAdminAbstractLP extends ColumnLabelProvider implements
 	public Font getFont(Object element) {
 		// Self as bold
 		try {
-			LdapName selfUserName = UiAdminUtils.getLdapName();
-			String userName = UiAdminUtils.getProperty((User) element,
-					LdifName.dn.name());
+			LdapName selfUserName = UserAdminUtils.getCurrentUserLdapName();
+			String userName = ((User) element).getName();
 			LdapName userLdapName = new LdapName(userName);
 			if (userLdapName.equals(selfUserName)) {
 				if (bold == null)
@@ -41,7 +37,7 @@ public abstract class UserAdminAbstractLP extends ColumnLabelProvider implements
 				return bold;
 			}
 		} catch (InvalidNameException e) {
-			throw new ArgeoException("cannot parse dn for " + element, e);
+			throw new CmsException("cannot parse dn for " + element, e);
 		}
 
 		// Disabled as Italic