X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui.workbench%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Fworkbench%2Finternal%2Fuseradmin%2Fparts%2FUsersView.java;h=4a3b1572e212b16e49c9fbffc9c88f3dc011e481;hb=5b444174cd13680f99944026877f6cac2e1faba1;hp=9e8f9d197d9741192c824a86cc63fd7977d8a147;hpb=fd8f2c91e47d38445ba9702b40559939162f666d;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UsersView.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UsersView.java
index 9e8f9d197..4a3b1572e 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UsersView.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UsersView.java
@@ -18,7 +18,9 @@ package org.argeo.cms.ui.workbench.internal.useradmin.parts;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.argeo.cms.ArgeoNames;
 import org.argeo.cms.CmsException;
+import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.cms.ui.workbench.internal.useradmin.UiUserAdminListener;
 import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper;
@@ -28,13 +30,12 @@ import org.argeo.cms.ui.workbench.internal.useradmin.providers.MailLP;
 import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserDragListener;
 import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserNameLP;
 import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserTableDefaultDClickListener;
-import org.argeo.cms.util.useradmin.UserAdminUtils;
 import org.argeo.eclipse.ui.ColumnDefinition;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.parts.LdifUsersTable;
-import org.argeo.node.ArgeoNames;
+import org.argeo.naming.LdapAttrs;
+import org.argeo.naming.LdapObjs;
 import org.argeo.node.NodeConstants;
-import org.argeo.osgi.useradmin.LdifName;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.DND;
@@ -75,7 +76,7 @@ public class UsersView extends ViewPart implements ArgeoNames {
 		columnDefs.add(new ColumnDefinition(new MailLP(), "E-mail", 150));
 		columnDefs.add(new ColumnDefinition(new DomainNameLP(), "Domain", 200));
 		// Only show technical DN to admin
-		if (UserAdminUtils.isUserInRole(NodeConstants.ROLE_ADMIN))
+		if (CurrentUser.isInRole(NodeConstants.ROLE_ADMIN))
 			columnDefs.add(new ColumnDefinition(new UserNameLP(),
 					"Distinguished Name", 300));
 
@@ -120,10 +121,10 @@ public class UsersView extends ViewPart implements ArgeoNames {
 	private class MyUserTableViewer extends LdifUsersTable {
 		private static final long serialVersionUID = 8467999509931900367L;
 
-		private final String[] knownProps = { LdifName.uid.name(),
-				LdifName.dn.name(), LdifName.cn.name(),
-				LdifName.givenName.name(), LdifName.sn.name(),
-				LdifName.mail.name() };
+		private final String[] knownProps = { LdapAttrs.DN,
+				LdapAttrs.uid.name(), LdapAttrs.cn.name(),
+				LdapAttrs.givenName.name(), LdapAttrs.sn.name(),
+				LdapAttrs.mail.name() };
 
 		public MyUserTableViewer(Composite parent, int style) {
 			super(parent, style);
@@ -146,14 +147,14 @@ public class UsersView extends ViewPart implements ArgeoNames {
 						tmpBuilder.append("*)");
 					}
 				if (tmpBuilder.length() > 1) {
-					builder.append("(&(").append(LdifName.objectClass.name())
-							.append("=").append(LdifName.inetOrgPerson.name())
+					builder.append("(&(").append(LdapAttrs.objectClass.name())
+							.append("=").append(LdapObjs.inetOrgPerson.name())
 							.append(")(|");
 					builder.append(tmpBuilder.toString());
 					builder.append("))");
 				} else
-					builder.append("(").append(LdifName.objectClass.name())
-							.append("=").append(LdifName.inetOrgPerson.name())
+					builder.append("(").append(LdapAttrs.objectClass.name())
+							.append("=").append(LdapObjs.inetOrgPerson.name())
 							.append(")");
 				roles = userAdminWrapper.getUserAdmin().getRoles(
 						builder.toString());
@@ -190,4 +191,4 @@ public class UsersView extends ViewPart implements ArgeoNames {
 	public void setUserAdminWrapper(UserAdminWrapper userAdminWrapper) {
 		this.userAdminWrapper = userAdminWrapper;
 	}
-}
\ No newline at end of file
+}