X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Finternal%2Fcommands%2FDeleteGroups.java;h=df5d430abd1fad48dee70330d558819dec39c415;hb=8260f4470f514ea347ca53f5b4dfc632c4a4de66;hp=59dca2baddb002a2079b185f690790e559061011;hpb=732542c8de267ed7d6cbb8c66b84cc90c8ad22d7;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java
index 59dca2bad..df5d430ab 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java
@@ -19,21 +19,24 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.argeo.cms.util.useradmin.UserAdminUtils;
 import org.argeo.security.ui.admin.SecurityAdminPlugin;
-import org.argeo.security.ui.admin.internal.UiAdminUtils;
 import org.argeo.security.ui.admin.internal.UserAdminWrapper;
+import org.argeo.security.ui.admin.internal.parts.UserEditorInput;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.osgi.service.useradmin.Group;
 import org.osgi.service.useradmin.UserAdmin;
 import org.osgi.service.useradmin.UserAdminEvent;
 
-/** Deletes the selected groups */
+/** Delete the selected groups */
 public class DeleteGroups extends AbstractHandler {
 	public final static String ID = SecurityAdminPlugin.PLUGIN_ID
 			+ ".deleteGroups";
@@ -52,7 +55,7 @@ public class DeleteGroups extends AbstractHandler {
 		StringBuilder builder = new StringBuilder();
 		while (it.hasNext()) {
 			Group currGroup = it.next();
-			String groupName = UiAdminUtils.getUsername(currGroup);
+			String groupName = UserAdminUtils.getUsername(currGroup);
 			// TODO add checks
 			builder.append(groupName).append("; ");
 			groups.add(currGroup);
@@ -66,11 +69,27 @@ public class DeleteGroups extends AbstractHandler {
 
 		userAdminWrapper.beginTransactionIfNeeded();
 		UserAdmin userAdmin = userAdminWrapper.getUserAdmin();
+		IWorkbenchPage iwp = HandlerUtil.getActiveWorkbenchWindow(event)
+				.getActivePage();
+		for (Group group : groups) {
+			String groupName = group.getName();
+			// TODO find a way to close the editor cleanly if opened. Cannot be
+			// done through the UserAdminListeners, it causes a
+			// java.util.ConcurrentModificationException because disposing the
+			// editor unregisters and disposes the listener
+			IEditorPart part = iwp.findEditor(new UserEditorInput(groupName));
+			if (part != null)
+				iwp.closeEditor(part, false);
+			userAdmin.removeRole(groupName);
+		}
+		userAdminWrapper.commitOrNotifyTransactionStateChange();
+
+		// Update the view
 		for (Group group : groups) {
-			userAdmin.removeRole(group.getName());
 			userAdminWrapper.notifyListeners(new UserAdminEvent(null,
 					UserAdminEvent.ROLE_REMOVED, group));
 		}
+
 		return null;
 	}