X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=swt%2Forg.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2Fpeople%2FNewUserForm.java;h=bdaa2e8b2cffac6895fe11703b7f0344e94024c8;hb=6360b46535b91e4d94fa79d658c6f98ae88663f9;hp=e45197323d4e5c6d72464617b55b6831d9abc734;hpb=932dbdce11c1a862b6a7babcb91bfec8e491e0b8;p=gpl%2Fargeo-suite.git

diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/NewUserForm.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/NewUserForm.java
index e451973..bdaa2e8 100644
--- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/NewUserForm.java
+++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/NewUserForm.java
@@ -11,11 +11,12 @@ import java.util.UUID;
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.ldap.LdapAttr;
 import org.argeo.api.acr.ldap.LdapObj;
+import org.argeo.api.cms.directory.CmsUser;
 import org.argeo.api.cms.directory.CmsUserManager;
 import org.argeo.api.cms.directory.HierarchyUnit;
 import org.argeo.app.core.SuiteUtils;
-import org.argeo.app.ui.SuiteMsg;
-import org.argeo.app.ui.SuiteUiUtils;
+import org.argeo.app.swt.ux.SuiteSwtUtils;
+import org.argeo.app.ux.SuiteMsg;
 import org.argeo.cms.swt.dialogs.CmsFeedback;
 import org.argeo.cms.swt.widgets.SwtGuidedFormPage;
 import org.argeo.cms.ux.widgets.AbstractGuidedForm;
@@ -27,7 +28,6 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Text;
-import org.osgi.service.useradmin.User;
 
 /** Ask first & last name. Update the passed node on finish */
 public class NewUserForm extends AbstractGuidedForm {
@@ -83,7 +83,7 @@ public class NewUserForm extends AbstractGuidedForm {
 			properties.put(LdapAttr.employeeNumber.name(), uuid.toString());
 
 			Map<String, Object> credentials = new HashMap<>();
-			User user = cmsUserManager.createUser(username, properties, credentials);
+			CmsUser user = cmsUserManager.createUser(username, properties, credentials);
 
 			Long huGidNumber = hierarchyUnit.get(LdapAttr.gidNumber.qName(), Long.class).orElseThrow();
 			Long nextUserId = SuiteUtils.findNextId(hierarchyUnit, LdapObj.posixAccount.qName());
@@ -127,18 +127,18 @@ public class NewUserForm extends AbstractGuidedForm {
 			parent.setLayout(new GridLayout(2, false));
 
 			// FirstName
-			SuiteUiUtils.createBoldLabel(parent, SuiteMsg.firstName);
+			SuiteSwtUtils.createBoldLabel(parent, SuiteMsg.firstName);
 			firstNameT = new Text(parent, SWT.BORDER);
 			// firstNameTxt.setMessage("a first name");
 			firstNameT.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 
 			// LastName
-			SuiteUiUtils.createBoldLabel(parent, SuiteMsg.lastName);
+			SuiteSwtUtils.createBoldLabel(parent, SuiteMsg.lastName);
 			lastNameT = new Text(parent, SWT.BORDER);
 			// lastNameTxt.setMessage("a last name");
 			lastNameT.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 
-			SuiteUiUtils.createBoldLabel(parent, SuiteMsg.email);
+			SuiteSwtUtils.createBoldLabel(parent, SuiteMsg.email);
 			emailT = new Text(parent, SWT.BORDER);
 			emailT.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));