X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Finternal%2Fcommands%2FNewUser.java;fp=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Finternal%2Fcommands%2FNewUser.java;h=e302087c1e434ca039e60d4cd595e451e2b2a740;hb=f295f8e7a43efc1839416158f4e0f268506c88b5;hp=16e444dc5b91ac686ece74bcf86ae687358e5a2e;hpb=5a128a3f0b2fa3a78a64c3caa8c93b03b387dff8;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewUser.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewUser.java
index 16e444dc5..e302087c1 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewUser.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewUser.java
@@ -24,13 +24,13 @@ import javax.naming.ldap.LdapName;
 import javax.naming.ldap.Rdn;
 
 import org.argeo.ArgeoException;
+import org.argeo.cms.util.useradmin.UserAdminUtils;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
 import org.argeo.jcr.ArgeoNames;
 import org.argeo.osgi.useradmin.LdifName;
 import org.argeo.osgi.useradmin.UserAdminConf;
 import org.argeo.security.ui.admin.SecurityAdminPlugin;
-import org.argeo.security.ui.admin.internal.UiAdminUtils;
 import org.argeo.security.ui.admin.internal.UserAdminWrapper;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
@@ -114,20 +114,20 @@ public class NewUser extends AbstractHandler {
 				Dictionary props = user.getProperties();
 
 				String lastNameStr = lastNameTxt.getText();
-				if (UiAdminUtils.notNull(lastNameStr))
+				if (EclipseUiUtils.notEmpty(lastNameStr))
 					props.put(LdifName.sn.name(), lastNameStr);
 
 				String firstNameStr = firstNameTxt.getText();
-				if (UiAdminUtils.notNull(firstNameStr))
+				if (EclipseUiUtils.notEmpty(firstNameStr))
 					props.put(LdifName.givenName.name(), firstNameStr);
 
-				String cn = UiAdminUtils
-						.getDefaultCn(firstNameStr, lastNameStr);
-				if (UiAdminUtils.notNull(cn))
+				String cn = UserAdminUtils.getDefaultCn(firstNameStr,
+						lastNameStr);
+				if (EclipseUiUtils.notEmpty(cn))
 					props.put(LdifName.cn.name(), cn);
 
 				String mailStr = primaryMailTxt.getText();
-				if (UiAdminUtils.notNull(mailStr))
+				if (EclipseUiUtils.notEmpty(mailStr))
 					props.put(LdifName.mail.name(), mailStr);
 
 				char[] password = mainUserInfo.getPassword();