X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=security%2Fplugins%2Forg.argeo.security.ui.admin%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Feditors%2FArgeoUserEditor.java;h=9b82e8783985325f4dfd3979e52125d035308a47;hb=183b34a3f8c0bce78bed916d413934f20522818c;hp=41e6d4fe7251edc4e46587825b488ea71485a061;hpb=acb6a464eab2729653b3a78f1b5c72f1bc4bc4fb;p=lgpl%2Fargeo-commons.git

diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java
index 41e6d4fe7..9b82e8783 100644
--- a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java
+++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java
@@ -1,9 +1,9 @@
 package org.argeo.security.ui.admin.editors;
 
 import org.argeo.ArgeoException;
-import org.argeo.security.ArgeoSecurityService;
 import org.argeo.security.ArgeoUser;
 import org.argeo.security.SimpleArgeoUser;
+import org.argeo.security.UserAdminService;
 import org.argeo.security.nature.SimpleUserNature;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.ui.IEditorInput;
@@ -13,10 +13,10 @@ import org.eclipse.ui.forms.editor.FormEditor;
 
 /** Editor for an Argeo user. */
 public class ArgeoUserEditor extends FormEditor {
-	public final static String ID = "org.argeo.security.ui.adminArgeoUserEditor";
+	public final static String ID = "org.argeo.security.ui.admin.adminArgeoUserEditor";
 
 	private ArgeoUser user;
-	private ArgeoSecurityService securityService;
+	private UserAdminService userAdminService;
 
 	public void init(IEditorSite site, IEditorInput input)
 			throws PartInitException {
@@ -28,14 +28,14 @@ public class ArgeoUserEditor extends FormEditor {
 			user.getUserNatures().put(SimpleUserNature.TYPE,
 					new SimpleUserNature());
 		} else
-			user = securityService.getUser(username);
+			user = userAdminService.getUser(username);
 		this.setPartProperty("name", username != null ? username : "<new user>");
 		setPartName(username != null ? username : "<new user>");
 	}
 
 	protected void addPages() {
 		try {
-			addPage(new DefaultUserMainPage(this, securityService, user));
+			addPage(new DefaultUserMainPage(this, userAdminService, user));
 
 		} catch (PartInitException e) {
 			throw new ArgeoException("Not able to add page ", e);
@@ -48,10 +48,10 @@ public class ArgeoUserEditor extends FormEditor {
 		// TODO: make it more generic
 		findPage(DefaultUserMainPage.ID).doSave(monitor);
 
-		if (securityService.userExists(user.getUsername()))
-			securityService.updateUser(user);
+		if (userAdminService.userExists(user.getUsername()))
+			userAdminService.updateUser(user);
 		else {
-			securityService.newUser(user);
+			userAdminService.newUser(user);
 			setPartName(user.getUsername());
 		}
 		firePropertyChange(PROP_DIRTY);
@@ -66,7 +66,7 @@ public class ArgeoUserEditor extends FormEditor {
 		return false;
 	}
 
-	public void setSecurityService(ArgeoSecurityService securityService) {
-		this.securityService = securityService;
+	public void setUserAdminService(UserAdminService userAdminService) {
+		this.userAdminService = userAdminService;
 	}
 }