Improve and simplify OSGi Boot

[lgpl/argeo-commons.git] / org.argeo.security.ui.admin / src / org / argeo / security / ui / admin / internal / commands / DeleteGroups.java

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 47bd5f5dad07604fa6db01274c5f2754d0b7ad47..df5d430abd1fad48dee70330d558819dec39c415 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
@@ -19,8 +19,8 @@ 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;
@@ -36,7 +36,7 @@ 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";
@@ -55,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);
@@ -71,10 +71,8 @@ public class DeleteGroups extends AbstractHandler {
                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
@@ -82,11 +80,16 @@ public class DeleteGroups extends AbstractHandler {
                        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) {
                        userAdminWrapper.notifyListeners(new UserAdminEvent(null,
                                        UserAdminEvent.ROLE_REMOVED, group));
                }
+
                return null;
        }