Prepare Argeo Commons 2.1.49 release (+ cosmetic comments refactoring)

[lgpl/argeo-commons.git] / org.argeo.cms.ui.workbench / src / org / argeo / cms / ui / workbench / internal / useradmin / providers / UserFilter.java

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserFilter.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserFilter.java
index 624ee546d16ac85df4545901de050ef2d8caefbd..feb78d48cb99d813bd4955ac688bccc3d35f15fa 100644 (file)
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserFilter.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserFilter.java
@@ -2,9 +2,9 @@ package org.argeo.cms.ui.workbench.internal.useradmin.providers;
 
 import static org.argeo.eclipse.ui.EclipseUiUtils.notEmpty;
 
-import org.argeo.cms.auth.AuthConstants;
 import org.argeo.cms.util.useradmin.UserAdminUtils;
-import org.argeo.osgi.useradmin.LdifName;
+import org.argeo.naming.LdapAttrs;
+import org.argeo.node.NodeConstants;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
 import org.osgi.service.useradmin.User;
@@ -15,10 +15,10 @@ public class UserFilter extends ViewerFilter {
        private String searchString;
        private boolean showSystemRole = true;
 
-       private final String[] knownProps = { LdifName.dn.name(),
-                       LdifName.cn.name(), LdifName.givenName.name(), LdifName.sn.name(),
-                       LdifName.uid.name(), LdifName.description.name(),
-                       LdifName.mail.name() };
+       private final String[] knownProps = { LdapAttrs.DN, LdapAttrs.cn.name(),
+                       LdapAttrs.givenName.name(), LdapAttrs.sn.name(),
+                       LdapAttrs.uid.name(), LdapAttrs.description.name(),
+                       LdapAttrs.mail.name() };
 
        public void setSearchText(String s) {
                // ensure that the value can be used for matching
@@ -37,7 +37,7 @@ public class UserFilter extends ViewerFilter {
                User user = (User) element;
                if (!showSystemRole
                                && user.getName().matches(
-                                               ".*(" + AuthConstants.ROLES_BASEDN + ")"))
+                                               ".*(" + NodeConstants.ROLES_BASEDN + ")"))
                        // UserAdminUtils.getProperty(user, LdifName.dn.name())
                        // .toLowerCase().endsWith(AuthConstants.ROLES_BASEDN))
                        return false;
@@ -56,5 +56,4 @@ public class UserFilter extends ViewerFilter {
                }
                return false;
        }
-
-}
\ No newline at end of file
+}