Close editor on role deletion

git-svn-id: https://svn.argeo.org/commons/trunk@8419 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

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 59dca2baddb002a2079b185f690790e559061011..47bd5f5dad07604fa6db01274c5f2754d0b7ad47 100644 (file)
--- 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
@@ -22,12 +22,15 @@ import java.util.List;
 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;
@@ -66,8 +69,21 @@ public class DeleteGroups extends AbstractHandler {
 
                userAdminWrapper.beginTransactionIfNeeded();
                UserAdmin userAdmin = userAdminWrapper.getUserAdmin();
+               IWorkbenchPage iwp = HandlerUtil.getActiveWorkbenchWindow(event)
+                               .getActivePage();
+
                for (Group group : groups) {
-                       userAdmin.removeRole(group.getName());
+                       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.notifyListeners(new UserAdminEvent(null,
                                        UserAdminEvent.ROLE_REMOVED, group));
                }

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/DeleteUsers.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/DeleteUsers.java
index 56cd59f36ccd771099283fd8c576c81ad2bc7150..901c371372488275c5866a84b1301a7056eb8a0d 100644 (file)
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/DeleteUsers.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/DeleteUsers.java
@@ -22,12 +22,15 @@ import java.util.List;
 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.User;
 import org.osgi.service.useradmin.UserAdmin;
@@ -73,8 +76,21 @@ public class DeleteUsers extends AbstractHandler {
 
                userAdminWrapper.beginTransactionIfNeeded();
                UserAdmin userAdmin = userAdminWrapper.getUserAdmin();
+               IWorkbenchPage iwp = HandlerUtil.getActiveWorkbenchWindow(event)
+                               .getActivePage();
+
                for (User user : users) {
-                       userAdmin.removeRole(user.getName());
+                       String userName = user.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(userName));
+                       if (part != null)
+                               iwp.closeEditor(part, false);
+
+                       userAdmin.removeRole(userName);
                        userAdminWrapper.notifyListeners(new UserAdminEvent(null,
                                        UserAdminEvent.ROLE_REMOVED, user));
                }

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserEditor.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserEditor.java
index d762d7d5d3806e117f0b5058a0608403f22e9d98..5c86abf321058922f19ce408b3bef147f5662ce9 100644 (file)
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserEditor.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserEditor.java
@@ -141,7 +141,7 @@ public class UserEditor extends FormEditor implements UserAdminConstants {
 
        // CONTROLERS FOR THIS EDITOR AND ITS PAGES
 
-       class NameChangeListener implements UserAdminListener {
+       private class NameChangeListener implements UserAdminListener {
 
                private final User user;