X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Fcommands%2FDeleteGroups.java;h=2add11bc4b7f026f1400b39a3cb0914aead4ffa5;hb=cd2948994931fcb43283ffb30c1058d5860dec68;hp=b655cd136bdc9dc5c2ac424f39c7becbad149c4a;hpb=1b8ad59bf691c15ed1317378a83c71c56c81cad2;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/DeleteGroups.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/DeleteGroups.java
index b655cd136..2add11bc4 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/DeleteGroups.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/DeleteGroups.java
@@ -15,13 +15,13 @@
  */
 package org.argeo.security.ui.admin.commands;
 
+import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.Map;
-import java.util.TreeMap;
+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.UserAdminConstants;
+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;
@@ -30,57 +30,52 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 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 */
 public class DeleteGroups extends AbstractHandler {
-	public final static String ID = SecurityAdminPlugin.PLUGIN_ID + ".deleteGroups";
+	public final static String ID = SecurityAdminPlugin.PLUGIN_ID
+			+ ".deleteGroups";
+
+	/* DEPENDENCY INJECTION */
+	private UserAdminWrapper userAdminWrapper;
 
-	
 	@SuppressWarnings("unchecked")
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		ISelection selection = HandlerUtil.getCurrentSelection(event);
 		if (selection.isEmpty())
 			return null;
 
-		Map<String, Group> toDelete = new TreeMap<String, Group>();
+		List<Group> groups = new ArrayList<Group>();
 		Iterator<Group> it = ((IStructuredSelection) selection).iterator();
-		groups: while (it.hasNext()) {
+		StringBuilder builder = new StringBuilder();
+		while (it.hasNext()) {
 			Group currGroup = it.next();
-			String groupName = UiAdminUtils.getProperty(currGroup,
-					UserAdminConstants.KEY_CN);
-
+			String groupName = UiAdminUtils.getUsername(currGroup);
 			// TODO add checks
-			// if (userName.equals(profileNode.getSession().getUserID())) {
-			// log.warn("Cannot delete its own user: " + userName);
-			// continue groups;
-			// }
-			toDelete.put(groupName, currGroup);
+			builder.append(groupName).append("; ");
+			groups.add(currGroup);
 		}
 
-		if (!MessageDialog
-				.openQuestion(
-						HandlerUtil.getActiveShell(event),
-						"Delete Groups",
-						"Are you sure that you want to delete groups "
-								+ toDelete.keySet()
-								+ "?\n"
-								+ "This might lead to inconsistencies in the application."))
+		if (!MessageDialog.openQuestion(HandlerUtil.getActiveShell(event),
+				"Delete Groups",
+				"Are you sure that you " + "want to delete these groups?\n"
+						+ builder.substring(0, builder.length() - 2)))
 			return null;
 
-		for (String groupName : toDelete.keySet()) {
+		userAdminWrapper.beginTransactionIfNeeded();
+		UserAdmin userAdmin = userAdminWrapper.getUserAdmin();
+		for (Group group : groups) {
+			userAdmin.removeRole(group.getName());
+			userAdminWrapper.notifyListeners(new UserAdminEvent(null,
+					UserAdminEvent.ROLE_REMOVED, group));
 		}
-		MessageDialog.openInformation(HandlerUtil.getActiveShell(event),
-				"Unimplemented method",
-				"The effective deletion is not yet implemented");
-		// TODO refresh?
-		// JcrUsersView view = (JcrUsersView) HandlerUtil
-		// .getActiveWorkbenchWindow(event).getActivePage()
-		// .findView(JcrUsersView.ID);
-		// view.refresh();
 		return null;
 	}
 
-	// public void setUserAdmin(UserAdmin userAdmin) {
-	// this.userAdmin = userAdmin;
-	// }
+	/* DEPENDENCY INJECTION */
+	public void setUserAdminWrapper(UserAdminWrapper userAdminWrapper) {
+		this.userAdminWrapper = userAdminWrapper;
+	}
 }
\ No newline at end of file