X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui.workbench%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Fworkbench%2Fuseradmin%2FUserLP.java;h=e782e370e5fde92b65302eb22eef94f90d2ecebc;hb=57ff8038f5887e0c6e5d3e8f4043e1dce900a1a9;hp=592af3cd595d867b5df1ad9d72750344eefa90b5;hpb=23b7a170cae60b500e9d45551f26b5075eba73a4;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/UserLP.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/UserLP.java
index 592af3cd5..e782e370e 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/UserLP.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/UserLP.java
@@ -1,11 +1,8 @@
 package org.argeo.cms.ui.workbench.useradmin;
 
-import javax.naming.InvalidNameException;
-import javax.naming.ldap.LdapName;
-
 import org.argeo.cms.ui.workbench.internal.useradmin.UsersImages;
-import org.argeo.cms.ui.workbench.internal.useradmin.UsersUtils;
-import org.argeo.eclipse.ui.EclipseUiException;
+import org.argeo.cms.util.UserAdminUtils;
+import org.argeo.node.NodeConstants;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.swt.SWT;
@@ -35,29 +32,14 @@ class UserLP extends ColumnLabelProvider {
 
 	@Override
 	public Font getFont(Object element) {
-		// Self as bold
-		try {
-			LdapName selfUserName = UsersUtils.getLdapName();
-			String userName = ((User) element).getName();
-			LdapName userLdapName = new LdapName(userName);
-			if (userLdapName.equals(selfUserName)) {
-				if (bold == null)
-					bold = JFaceResources.getFontRegistry()
-							.defaultFontDescriptor().setStyle(SWT.BOLD)
-							.createFont(Display.getCurrent());
-				return bold;
-			}
-		} catch (InvalidNameException e) {
-			throw new EclipseUiException("cannot parse dn for " + element, e);
+		// Current user as bold
+		if (UserAdminUtils.isCurrentUser(((User) element))) {
+			if (bold == null)
+				bold = JFaceResources.getFontRegistry().defaultFontDescriptor().setStyle(SWT.BOLD)
+						.createFont(Display.getCurrent());
+			return bold;
 		}
-
-		// Disabled as Italic
-		// Node userProfile = (Node) elem;
-		// if (!userProfile.getProperty(ARGEO_ENABLED).getBoolean())
-		// return italic;
-
 		return null;
-		// return super.getFont(element);
 	}
 
 	@Override
@@ -65,7 +47,7 @@ class UserLP extends ColumnLabelProvider {
 		if (COL_ICON.equals(currType)) {
 			User user = (User) element;
 			String dn = user.getName();
-			if (dn.endsWith(UsersUtils.ROLES_BASEDN))
+			if (dn.endsWith(NodeConstants.ROLES_BASEDN))
 				return UsersImages.ICON_ROLE;
 			else if (user.getType() == Role.GROUP)
 				return UsersImages.ICON_GROUP;
@@ -86,10 +68,10 @@ class UserLP extends ColumnLabelProvider {
 		if (COL_DN.equals(currType))
 			return user.getName();
 		else if (COL_DISPLAY_NAME.equals(currType))
-			return UsersUtils.getCommonName(user);
+			return UserAdminUtils.getCommonName(user);
 		else if (COL_DOMAIN.equals(currType))
-			return UsersUtils.getDomainName(user);
+			return UserAdminUtils.getDomainName(user);
 		else
 			return "";
 	}
-}
\ No newline at end of file
+}