Fix a few glitches in the various maintenance pages.

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / users / Users.java

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 58e0e88622164be3c722236efedf34b0872d4b2d..2637ed4d9afeeb923af00e3a6bb3a829805c0071 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/users/Users.java
+++ b/org.argeo.cms/src/org/argeo/cms/users/Users.java
@@ -14,21 +14,19 @@ 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;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.DisposeEvent;
@@ -40,6 +38,7 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.springframework.security.provisioning.UserDetailsManager;
 
 /**
  * Simple page to manage users of a given repository. We still rely on Argeo
@@ -51,7 +50,7 @@ public class Users implements CmsUiProvider {
 
        // Enable user CRUD // INJECTED
        private UserAdminService userAdminService;
-       private JcrSecurityModel jcrSecurityModel;
+       // private UserDetailsManager userDetailsManager;
        private String userWkspName;
 
        // Local UI Providers
@@ -214,11 +213,11 @@ 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() == Window.OK)
+                               if (dialog.open() == Dialog.OK)
                                        userTableCmp.refresh();
                        }
                });
@@ -338,8 +337,8 @@ 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);
        }
 }
\ No newline at end of file