Introduce a UserAdmin wrapper service

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

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/DeleteUsers.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/DeleteUsers.java
index 554e90aff3421da52c565bb7d6a96e8866897e22..6a9da4b8d34e166b8f7dbaf8cec842189e2df41b 100644 (file)
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/DeleteUsers.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/DeleteUsers.java
@@ -15,27 +15,23 @@
  */
 package org.argeo.security.ui.admin.commands;
 
+import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.Map;
-import java.util.TreeMap;
-
-import javax.transaction.UserTransaction;
+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.views.UsersView;
+import org.argeo.security.ui.admin.internal.UserAdminWrapper;
 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.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.osgi.service.useradmin.User;
 import org.osgi.service.useradmin.UserAdmin;
+import org.osgi.service.useradmin.UserAdminEvent;
 
 /** Deletes the selected users */
 public class DeleteUsers extends AbstractHandler {
@@ -43,8 +39,7 @@ public class DeleteUsers extends AbstractHandler {
                        + ".deleteUsers";
 
        /* DEPENDENCY INJECTION */
-       private UserAdmin userAdmin;
-       private UserTransaction userTransaction;
+       private UserAdminWrapper userAdminWrapper;
 
        @SuppressWarnings("unchecked")
        public Object execute(ExecutionEvent event) throws ExecutionException {
@@ -52,56 +47,42 @@ public class DeleteUsers extends AbstractHandler {
                if (selection.isEmpty())
                        return null;
 
-               Map<String, String> toDelete = new TreeMap<String, String>();
-               // Map<String, User> toDelete = new TreeMap<String, User>();
                Iterator<User> it = ((IStructuredSelection) selection).iterator();
-               users: while (it.hasNext()) {
+               List<User> users = new ArrayList<User>();
+               StringBuilder builder = new StringBuilder();
+
+               while (it.hasNext()) {
                        User currUser = it.next();
                        String userName = UiAdminUtils.getUsername(currUser);
-                       // TODO check not deleting own user
-                       // if (userName.equals(profileNode.getSession().getUserID())) {
-                       // log.warn("Cannot delete its own user: " + userName);
-                       // continue nodes;
-                       // }
-                       toDelete.put(userName, currUser.getName());
+                       if (UiAdminUtils.isCurrentUser(currUser)) {
+                               MessageDialog.openError(HandlerUtil.getActiveShell(event),
+                                               "Deletion forbidden",
+                                               "You cannot delete your own user this way.");
+                               return null;
+                       }
+                       builder.append(userName).append("; ");
+                       users.add(currUser);
                }
 
-               if (!MessageDialog
-                               .openQuestion(
-                                               HandlerUtil.getActiveShell(event),
-                                               "Delete Users",
-                                               "Are you sure that you want to delete users "
-                                                               + toDelete.keySet()
-                                                               + "?\n"
-                                                               + "This might lead to inconsistencies in the application."))
+               if (!MessageDialog.openQuestion(
+                               HandlerUtil.getActiveShell(event),
+                               "Delete Users",
+                               "Are you sure that you want to delete these users?\n"
+                                               + builder.substring(0, builder.length() - 2)))
                        return null;
 
-               UiAdminUtils.beginTransactionIfNeeded(userTransaction);
-               for (String name : toDelete.values()) {
-                       userAdmin.removeRole(name);
+               userAdminWrapper.beginTransactionIfNeeded();
+               UserAdmin userAdmin = userAdminWrapper.getUserAdmin();
+               for (User user : users) {
+                       userAdmin.removeRole(user.getName());
+                       userAdminWrapper.notifyListeners(new UserAdminEvent(null,
+                                       UserAdminEvent.ROLE_REMOVED, user));
                }
-
-               // TODO rather notify the update listener
-               forceRefresh(event);
                return null;
        }
 
-       private void forceRefresh(ExecutionEvent event) {
-               IWorkbenchWindow iww = HandlerUtil.getActiveWorkbenchWindow(event);
-               if (iww == null)
-                       return;
-               IWorkbenchPage activePage = iww.getActivePage();
-               IWorkbenchPart part = activePage.getActivePart();
-               if (part instanceof UsersView)
-                       ((UsersView) part).refresh();
-       }
-
        /* DEPENDENCY INJECTION */
-       public void setUserAdmin(UserAdmin userAdmin) {
-               this.userAdmin = userAdmin;
-       }
-
-       public void setUserTransaction(UserTransaction userTransaction) {
-               this.userTransaction = userTransaction;
+       public void setUserAdminWrapper(UserAdminWrapper userAdminWrapper) {
+               this.userAdminWrapper = userAdminWrapper;
        }
 }
\ No newline at end of file