X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Finternal%2Fparts%2FUserBatchUpdateWizard.java;h=d2dbadd085db8338f8ca52e322e673808d986032;hb=d01cf8af884e44c3ddc6482a9dca4ac73bb8e93a;hp=5edcfbd4b9dea31e5dbbab67de56ed41c55ea354;hpb=f0be5ec381492eff23d4576ee4122734af4ad877;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserBatchUpdateWizard.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserBatchUpdateWizard.java
index 5edcfbd4b..d2dbadd08 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserBatchUpdateWizard.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserBatchUpdateWizard.java
@@ -12,6 +12,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
 import org.argeo.cms.auth.AuthConstants;
+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;
@@ -417,7 +418,7 @@ public class UserBatchUpdateWizard extends Wizard {
 					200));
 
 			// Only show technical DN to admin
-			if (UiAdminUtils.isUserInRole(AuthConstants.ROLE_ADMIN))
+			if (UserAdminUtils.isUserInRole(AuthConstants.ROLE_ADMIN))
 				columnDefs.add(new ColumnDefinition(new UserNameLP(),
 						"Distinguished Name", 300));
 
@@ -455,7 +456,7 @@ public class UserBatchUpdateWizard extends Wizard {
 			private static final long serialVersionUID = 5080437561015853124L;
 			private final String[] knownProps = { LdifName.uid.name(),
 					LdifName.dn.name(), LdifName.cn.name(),
-					LdifName.givenname.name(), LdifName.sn.name(),
+					LdifName.givenName.name(), LdifName.sn.name(),
 					LdifName.mail.name() };
 
 			public ChooseUserTableViewer(Composite parent, int style) {
@@ -470,7 +471,7 @@ public class UserBatchUpdateWizard extends Wizard {
 					StringBuilder builder = new StringBuilder();
 
 					StringBuilder tmpBuilder = new StringBuilder();
-					if (UiAdminUtils.notNull(filter))
+					if (EclipseUiUtils.notEmpty(filter))
 						for (String prop : knownProps) {
 							tmpBuilder.append("(");
 							tmpBuilder.append(prop);
@@ -501,7 +502,7 @@ public class UserBatchUpdateWizard extends Wizard {
 				for (Role role : roles)
 					// Prevent current logged in user to perform batch on
 					// himself
-					if (!UiAdminUtils.isCurrentUser((User) role))
+					if (!UserAdminUtils.isCurrentUser((User) role))
 						users.add((User) role);
 				return users;
 			}
@@ -531,7 +532,7 @@ public class UserBatchUpdateWizard extends Wizard {
 			columnDefs.add(new ColumnDefinition(new DomainNameLP(), "Domain",
 					200));
 			// Only show technical DN to admin
-			if (UiAdminUtils.isUserInRole(AuthConstants.ROLE_ADMIN))
+			if (UserAdminUtils.isUserInRole(AuthConstants.ROLE_ADMIN))
 				columnDefs.add(new ColumnDefinition(new UserNameLP(),
 						"Distinguished Name", 300));
 			userTableCmp = new ChosenUsersTableViewer(pageCmp, SWT.MULTI