X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Feclipse%2Fplugins%2Forg.argeo.security.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Feditors%2FArgeoUserEditor.java;h=7c0213704a299a6785c7d3695597de491eddee60;hb=2663dfc4d32c474f8fc7407d24bdcf0fa50ce08a;hp=9e258a65f8dbcf2cf471adcb2422c3efc9e7051f;hpb=dc6f911c680574a9b57c34dcf515ac8f9aa808da;p=lgpl%2Fargeo-commons.git

diff --git a/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/ArgeoUserEditor.java b/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/ArgeoUserEditor.java
index 9e258a65f..7c0213704 100644
--- a/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/ArgeoUserEditor.java
+++ b/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/ArgeoUserEditor.java
@@ -1,9 +1,12 @@
 package org.argeo.security.ui.editors;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
 import org.argeo.security.ArgeoSecurityService;
 import org.argeo.security.ArgeoUser;
-import org.argeo.security.UserNature;
+import org.argeo.security.SimpleArgeoUser;
+import org.argeo.security.nature.SimpleUserNature;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;
@@ -12,6 +15,8 @@ import org.eclipse.ui.forms.editor.FormEditor;
 
 /** Editor for an Argeo user. */
 public class ArgeoUserEditor extends FormEditor {
+	private final static Log log = LogFactory.getLog(ArgeoUserEditor.class);
+
 	public final static String ID = "org.argeo.security.ui.argeoUserEditor";
 
 	private ArgeoUser user;
@@ -22,14 +27,20 @@ public class ArgeoUserEditor extends FormEditor {
 		super.init(site, input);
 		String username = ((ArgeoUserEditorInput) getEditorInput())
 				.getUsername();
-		user = securityService.getSecurityDao().getUser(username);
-		this.setPartProperty("name", username);
+		if (username == null) {// new
+			user = new SimpleArgeoUser();
+			user.getUserNatures().put(SimpleUserNature.TYPE,
+					new SimpleUserNature());
+		} else
+			user = securityService.getSecurityDao().getUser(username);
+		this.setPartProperty("name", username != null ? username : "<new user>");
+		setPartName(username != null ? username : "<new user>");
 	}
 
 	protected void addPages() {
 		try {
-			addPage(new DefaultUserMainPage(this, user));
-				
+			addPage(new DefaultUserMainPage(this, securityService, user));
+
 		} catch (PartInitException e) {
 			throw new ArgeoException("Not able to add page ", e);
 		}
@@ -37,24 +48,36 @@ public class ArgeoUserEditor extends FormEditor {
 
 	@Override
 	public void doSave(IProgressMonitor monitor) {
-		// TODO Auto-generated method stub
+		// list pages
+		// TODO: make it more generic
+		findPage(DefaultUserMainPage.ID).doSave(monitor);
 
+		if (securityService.getSecurityDao().userExists(user.getUsername()))
+			securityService.updateUser(user);
+		else {
+			try {
+				// FIXME: make it cleaner
+				((SimpleArgeoUser)user).setPassword(user.getUsername());
+				securityService.newUser(user);
+				setPartName(user.getUsername());
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		firePropertyChange(PROP_DIRTY);
 	}
 
 	@Override
 	public void doSaveAs() {
-		// TODO Auto-generated method stub
-
 	}
 
 	@Override
 	public boolean isSaveAsAllowed() {
-		// TODO Auto-generated method stub
 		return false;
 	}
 
 	public void setSecurityService(ArgeoSecurityService securityService) {
 		this.securityService = securityService;
 	}
-
 }