X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms.ui.workbench%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Fworkbench%2Finternal%2Fuseradmin%2Fparts%2FUsersView.java;fp=org.argeo.cms.ui.workbench%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Fworkbench%2Finternal%2Fuseradmin%2Fparts%2FUsersView.java;h=e2b1c0eec04299d4b8d52528272b1fb02b86dd74;hb=2aa7488102120eb82bcb7c1ac53188b9424eeace;hp=9e8f9d197d9741192c824a86cc63fd7977d8a147;hpb=db7aecc7170c024e0e39135cf6b8aa6ce7569ccb;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..e2b1c0eec 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
@@ -32,9 +32,10 @@ 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.naming.LdapAttrs;
+import org.argeo.naming.LdapObjs;
 import org.argeo.node.ArgeoNames;
 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;
@@ -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());