X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Finternal%2Fproviders%2FUserFilter.java;h=0b473446d35d590c868758118cd21c00e951c14f;hb=f782539a48e6d4779767c5a511c25df1b9078667;hp=742b7d3931d2648b8f3d993a92a5eafdfc1ef2a5;hpb=25e98954db6faeec4ba9950f651e81fbea595b0c;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserFilter.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserFilter.java index 742b7d393..0b473446d 100644 --- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserFilter.java +++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserFilter.java @@ -3,8 +3,8 @@ package org.argeo.security.ui.admin.internal.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.security.ui.admin.internal.UiAdminUtils; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; import org.osgi.service.useradmin.User; @@ -39,7 +39,7 @@ public class UserFilter extends ViewerFilter { if (!showSystemRole && user.getName().matches( ".*(" + AuthConstants.ROLES_BASEDN + ")")) - // UiAdminUtils.getProperty(user, LdifName.dn.name()) + // UserAdminUtils.getProperty(user, LdifName.dn.name()) // .toLowerCase().endsWith(AuthConstants.ROLES_BASEDN)) return false; @@ -50,7 +50,7 @@ public class UserFilter extends ViewerFilter { return true; for (String key : knownProps) { - String currVal = UiAdminUtils.getProperty(user, key); + String currVal = UserAdminUtils.getProperty(user, key); if (notEmpty(currVal) && currVal.toLowerCase().matches(searchString)) return true;