X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Fcommands%2FAddRole.java;h=c91f81a3c455a4e39cf94592a5231db040e4c4ef;hb=15c69c8b17d393d554f95d7945e379133d6488fd;hp=a1008f6994e83a0e7293f2b5ea407e66c5fe447b;hpb=d33e8191813f561cee96fbbbd3f74737070140d0;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/AddRole.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/AddRole.java
index a1008f699..c91f81a3c 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/AddRole.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/AddRole.java
@@ -15,16 +15,10 @@
  */
 package org.argeo.security.ui.admin.commands;
 
-import org.argeo.ArgeoException;
 import org.argeo.security.UserAdminService;
-import org.argeo.security.ui.admin.editors.ArgeoUserEditor;
-import org.argeo.security.ui.admin.views.RolesView;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.handlers.HandlerUtil;
 
 /** Add a new role. */
 public class AddRole extends AbstractHandler {
@@ -33,37 +27,44 @@ public class AddRole extends AbstractHandler {
 	private String rolePrefix = "ROLE_";
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
-		RolesView rolesView = (RolesView) HandlerUtil
-				.getActiveWorkbenchWindow(event).getActivePage()
-				.findView(RolesView.ID);
-		String role = rolesView.getNewRole();
-		if (role.trim().equals(""))
-			return null;
-		if (role.equals(rolesView.getAddNewRoleText()))
-			return null;
-		role = role.trim().toUpperCase();
-		if (!role.startsWith(rolePrefix))
-			role = rolePrefix + role;
-		if (userAdminService.listEditableRoles().contains(role))
-			throw new ArgeoException("Role " + role + " already exists");
-		userAdminService.newRole(role);
-		rolesView.refresh();
-
-		// refresh editors
-		IEditorReference[] refs = HandlerUtil.getActiveWorkbenchWindow(event)
-				.getActivePage()
-				.findEditors(null, ArgeoUserEditor.ID, IWorkbenchPage.MATCH_ID);
-		for (IEditorReference ref : refs) {
-			ArgeoUserEditor userEditor = (ArgeoUserEditor) ref.getEditor(false);
-			if (userEditor != null) {
-				userEditor.refresh();
-			}
-		}
 		return null;
 	}
 
 	public void setUserAdminService(UserAdminService userAdminService) {
 		this.userAdminService = userAdminService;
 	}
-
 }
+// JcrRolesView rolesView = (JcrRolesView) HandlerUtil
+// .getActiveWorkbenchWindow(event).getActivePage()
+// .findView(JcrRolesView.ID);
+// String role = rolesView.getNewRole();
+// if (role.trim().equals(""))
+// return null;
+// if (role.equals(rolesView.getAddNewRoleText()))
+// return null;
+// role = role.trim().toUpperCase();
+// if (!role.startsWith(rolePrefix))
+// role = rolePrefix + role;
+// if (userAdminService.listEditableRoles().contains(role))
+// throw new ArgeoException("Role " + role + " already exists");
+// userAdminService.newRole(role);
+// rolesView.refresh();
+//
+// // refresh editors
+// IEditorReference[] refs = HandlerUtil.getActiveWorkbenchWindow(event)
+// .getActivePage()
+// .findEditors(null, JcrArgeoUserEditor.ID, IWorkbenchPage.MATCH_ID);
+// for (IEditorReference ref : refs) {
+// JcrArgeoUserEditor userEditor = (JcrArgeoUserEditor) ref.getEditor(false);
+// if (userEditor != null) {
+// userEditor.refresh();
+// }
+// }
+// return null;
+// }
+//
+// public void setUserAdminService(UserAdminService userAdminService) {
+// this.userAdminService = userAdminService;
+// }
+//
+// }