X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fusers%2FUsers.java;h=2637ed4d9afeeb923af00e3a6bb3a829805c0071;hb=566b27535d7f8ebf90529ec2f714a4ac17f1cc60;hp=cc164b7692c88b390068cc6f05e06e8d89d0c82a;hpb=4b56d461613392a3808d886d5373cf46b65a040e;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/users/Users.java b/org.argeo.cms/src/org/argeo/cms/users/Users.java
index cc164b769..2637ed4d9 100644
--- a/org.argeo.cms/src/org/argeo/cms/users/Users.java
+++ b/org.argeo.cms/src/org/argeo/cms/users/Users.java
@@ -14,14 +14,12 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
 import org.argeo.cms.CmsUiProvider;
-import org.argeo.cms.CmsUtils;
 import org.argeo.cms.maintenance.NonAdminPage;
-import org.argeo.eclipse.ui.dialogs.UserCreationWizard;
+import org.argeo.cms.util.CmsUtils;
 import org.argeo.eclipse.ui.parts.UsersTable;
 import org.argeo.jcr.ArgeoNames;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.security.UserAdminService;
-import org.argeo.security.jcr.JcrSecurityModel;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
@@ -52,7 +50,6 @@ public class Users implements CmsUiProvider {
 
 	// Enable user CRUD // INJECTED
 	private UserAdminService userAdminService;
-	private JcrSecurityModel jcrSecurityModel;
 	// private UserDetailsManager userDetailsManager;
 	private String userWkspName;
 
@@ -216,8 +213,8 @@ public class Users implements CmsUiProvider {
 
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				UserCreationWizard newUserWizard = new UserCreationWizard(
-						session, userAdminService, jcrSecurityModel);
+				NewUserWizard newUserWizard = new NewUserWizard(session,
+						userAdminService);
 				WizardDialog dialog = new WizardDialog(addBtn.getShell(),
 						newUserWizard);
 				if (dialog.open() == Dialog.OK)
@@ -340,11 +337,6 @@ public class Users implements CmsUiProvider {
 		userPage.setUserAdminService(userAdminService);
 	}
 
-	public void setJcrSecurityModel(JcrSecurityModel jcrSecurityModel) {
-		this.jcrSecurityModel = jcrSecurityModel;
-		// userPage.setJcrSecurityModel(jcrSecurityModel);
-	}
-
 	public void setUserDetailsManager(UserDetailsManager userDetailsManager) {
 		// this.userDetailsManager = userDetailsManager;
 		// userPage.setUserDetailsManager(userDetailsManager);