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%2FDeleteUsers.java;h=ee366483aed1b9c4d8030ded6a8daf92b7939ec2;hb=5b444174cd13680f99944026877f6cac2e1faba1;hp=cec30f02a3aab49780bed4aa8436afe52976140b;hpb=328d27b8653a55d9561134f120bca09776f43c1c;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/DeleteUsers.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/DeleteUsers.java
index cec30f02a..ee366483a 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/DeleteUsers.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/DeleteUsers.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;
@@ -55,10 +55,9 @@ public class DeleteUsers extends AbstractHandler {
 
 		while (it.hasNext()) {
 			User currUser = it.next();
-			String userName = UserAdminUtils.getUsername(currUser);
+			String userName = UserAdminUtils.getUserLocalId(currUser.getName());
 			if (UserAdminUtils.isCurrentUser(currUser)) {
-				MessageDialog.openError(HandlerUtil.getActiveShell(event),
-						"Deletion forbidden",
+				MessageDialog.openError(HandlerUtil.getActiveShell(event), "Deletion forbidden",
 						"You cannot delete your own user this way.");
 				return null;
 			}
@@ -66,17 +65,13 @@ public class DeleteUsers extends AbstractHandler {
 			users.add(currUser);
 		}
 
-		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)))
+		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;
 
 		userAdminWrapper.beginTransactionIfNeeded();
 		UserAdmin userAdmin = userAdminWrapper.getUserAdmin();
-		IWorkbenchPage iwp = HandlerUtil.getActiveWorkbenchWindow(event)
-				.getActivePage();
+		IWorkbenchPage iwp = HandlerUtil.getActiveWorkbenchWindow(event).getActivePage();
 
 		for (User user : users) {
 			String userName = user.getName();
@@ -92,8 +87,7 @@ public class DeleteUsers extends AbstractHandler {
 		userAdminWrapper.commitOrNotifyTransactionStateChange();
 
 		for (User user : users) {
-			userAdminWrapper.notifyListeners(new UserAdminEvent(null,
-					UserAdminEvent.ROLE_REMOVED, user));
+			userAdminWrapper.notifyListeners(new UserAdminEvent(null, UserAdminEvent.ROLE_REMOVED, user));
 		}
 		return null;
 	}