X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Feditors%2FUserEditor.java;h=ed39f30f282cac4cf776f98c90ab2a3e1f856adb;hb=cd2948994931fcb43283ffb30c1058d5860dec68;hp=a5879b9f95540bd8ab153a5dc6758706c4e8f5de;hpb=863c2382c277f82f0bba67b8d73ea61ce1eda1f3;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserEditor.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserEditor.java
index a5879b9f9..ed39f30f2 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserEditor.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserEditor.java
@@ -19,9 +19,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.argeo.ArgeoException;
-import org.argeo.security.ui.admin.SecurityAdminImages;
 import org.argeo.security.ui.admin.SecurityAdminPlugin;
 import org.argeo.security.ui.admin.internal.UserAdminConstants;
+import org.argeo.security.ui.admin.internal.UserAdminWrapper;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;
@@ -31,6 +31,7 @@ import org.osgi.service.useradmin.Authorization;
 import org.osgi.service.useradmin.Role;
 import org.osgi.service.useradmin.User;
 import org.osgi.service.useradmin.UserAdmin;
+import org.osgi.service.useradmin.UserAdminEvent;
 
 /** Editor for a user, might be a user or a group. */
 public class UserEditor extends FormEditor implements UserAdminConstants {
@@ -40,6 +41,7 @@ public class UserEditor extends FormEditor implements UserAdminConstants {
 			+ ".userEditor";
 
 	/* DEPENDENCY INJECTION */
+	private UserAdminWrapper userAdminWrapper;
 	private UserAdmin userAdmin;
 
 	// Context
@@ -53,20 +55,28 @@ public class UserEditor extends FormEditor implements UserAdminConstants {
 		user = (User) userAdmin.getRole(username);
 
 		String commonName = getProperty(KEY_CN);
-		// this.setPartProperty("name", commonName != null ? commonName
-		// : "username");
 
-		// if (user.getType() == Role.GROUP) {
-		// this.setPartProperty("icon", "icons/users.gif");
-		// firePartPropertyChanged("icon", "icons/user.gif", "icons/users.gif");
-		// }
 		setPartName(commonName != null ? commonName : "username");
-		setTitleImage(user.getType() == Role.GROUP ? SecurityAdminImages.ICON_GROUP
-				: SecurityAdminImages.ICON_USER);
+
+		// TODO: following has been disabled because it causes NPE after a
+		// login/logout on RAP
+		// Image titleIcon = user.getType() == Role.GROUP ?
+		// SecurityAdminImages.ICON_GROUP
+		// : SecurityAdminImages.ICON_USER;
+		// setTitleImage(titleIcon);
 	}
 
-	protected List<User> getFlatGroups() {
-		Authorization currAuth = userAdmin.getAuthorization(user);
+	/**
+	 * returns the list of all authorisation for the given user or of the
+	 * current displayed user if parameter is null
+	 */
+	protected List<User> getFlatGroups(User aUser) {
+		Authorization currAuth;
+		if (aUser == null)
+			currAuth = userAdmin.getAuthorization(this.user);
+		else
+			currAuth = userAdmin.getAuthorization(aUser);
+
 		String[] roles = currAuth.getRoles();
 
 		List<User> groups = new ArrayList<User>();
@@ -89,12 +99,10 @@ public class UserEditor extends FormEditor implements UserAdminConstants {
 
 	protected void addPages() {
 		try {
-
 			if (user.getType() == Role.GROUP)
-				addPage(new GroupMainPage(this, userAdmin));
+				addPage(new GroupMainPage(this, userAdminWrapper));
 			else
-				addPage(new UserMainPage(this, userAdmin));
-
+				addPage(new UserMainPage(this, userAdminWrapper));
 		} catch (Exception e) {
 			throw new ArgeoException("Cannot add pages", e);
 		}
@@ -108,7 +116,10 @@ public class UserEditor extends FormEditor implements UserAdminConstants {
 			return "";
 	}
 
-	/** The property is directly updated!!! */
+	/**
+	 * Updates the property in the working copy. The transaction must be
+	 * explicitly committed to persist the update.
+	 */
 	@SuppressWarnings("unchecked")
 	protected void setProperty(String key, String value) {
 		user.getProperties().put(key, value);
@@ -116,8 +127,11 @@ public class UserEditor extends FormEditor implements UserAdminConstants {
 
 	@Override
 	public void doSave(IProgressMonitor monitor) {
+		userAdminWrapper.beginTransactionIfNeeded();
 		commitPages(true);
 		firePropertyChange(PROP_DIRTY);
+		userAdminWrapper.notifyListeners(new UserAdminEvent(null,
+				UserAdminEvent.ROLE_REMOVED, user));
 	}
 
 	@Override
@@ -139,7 +153,8 @@ public class UserEditor extends FormEditor implements UserAdminConstants {
 	}
 
 	/* DEPENDENCY INJECTION */
-	public void setUserAdmin(UserAdmin userAdmin) {
-		this.userAdmin = userAdmin;
+	public void setUserAdminWrapper(UserAdminWrapper userAdminWrapper) {
+		this.userAdminWrapper = userAdminWrapper;
+		this.userAdmin = userAdminWrapper.getUserAdmin();
 	}
 }
\ No newline at end of file