X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui.workbench%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Fworkbench%2Finternal%2Fuseradmin%2Fcommands%2FDeleteGroups.java;h=3e8d12fc2500f5b451502f47fbc9ff866784fa93;hb=c149774fa220fe69f430f7b230ac4c442ea6d0fe;hp=16128b8a4af10766bc4e60b182337a8f1ff29e2c;hpb=23b7a170cae60b500e9d45551f26b5075eba73a4;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/DeleteGroups.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/DeleteGroups.java
index 16128b8a4..3e8d12fc2 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/DeleteGroups.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/DeleteGroups.java
@@ -22,7 +22,7 @@ import java.util.List;
 import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper;
 import org.argeo.cms.ui.workbench.internal.useradmin.parts.UserEditorInput;
-import org.argeo.cms.util.useradmin.UserAdminUtils;
+import org.argeo.cms.util.UserAdminUtils;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -38,8 +38,7 @@ import org.osgi.service.useradmin.UserAdminEvent;
 
 /** Delete the selected groups */
 public class DeleteGroups extends AbstractHandler {
-	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID
-			+ ".deleteGroups";
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".deleteGroups";
 
 	/* DEPENDENCY INJECTION */
 	private UserAdminWrapper userAdminWrapper;
@@ -55,22 +54,19 @@ public class DeleteGroups extends AbstractHandler {
 		StringBuilder builder = new StringBuilder();
 		while (it.hasNext()) {
 			Group currGroup = it.next();
-			String groupName = UserAdminUtils.getUsername(currGroup);
+			String groupName = UserAdminUtils.getUserLocalId(currGroup.getName());
 			// TODO add checks
 			builder.append(groupName).append("; ");
 			groups.add(currGroup);
 		}
 
-		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)))
+		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;
 
 		userAdminWrapper.beginTransactionIfNeeded();
 		UserAdmin userAdmin = userAdminWrapper.getUserAdmin();
-		IWorkbenchPage iwp = HandlerUtil.getActiveWorkbenchWindow(event)
-				.getActivePage();
+		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
@@ -86,8 +82,7 @@ public class DeleteGroups extends AbstractHandler {
 
 		// Update the view
 		for (Group group : groups) {
-			userAdminWrapper.notifyListeners(new UserAdminEvent(null,
-					UserAdminEvent.ROLE_REMOVED, group));
+			userAdminWrapper.notifyListeners(new UserAdminEvent(null, UserAdminEvent.ROLE_REMOVED, group));
 		}
 
 		return null;
@@ -97,4 +92,4 @@ public class DeleteGroups extends AbstractHandler {
 	public void setUserAdminWrapper(UserAdminWrapper userAdminWrapper) {
 		this.userAdminWrapper = userAdminWrapper;
 	}
-}
\ No newline at end of file
+}