X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fplugins%2Forg.argeo.security.ui.admin%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Fcommands%2FAddRole.java;h=a1008f6994e83a0e7293f2b5ea407e66c5fe447b;hb=516bd52dc17e93fff2a1b858f3eb34ee99f76992;hp=e8825bce302c8e71b9f501cda3035a20b80ebbc6;hpb=acb6a464eab2729653b3a78f1b5c72f1bc4bc4fb;p=lgpl%2Fargeo-commons.git

diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/AddRole.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/AddRole.java
index e8825bce3..a1008f699 100644
--- a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/AddRole.java
+++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/AddRole.java
@@ -1,17 +1,35 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.security.ui.admin.commands;
 
 import org.argeo.ArgeoException;
-import org.argeo.security.ArgeoSecurityService;
+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 {
-	public final static String COMMAND_ID = "org.argeo.security.ui.addRole";
-	private ArgeoSecurityService securityService;
+	public final static String COMMAND_ID = "org.argeo.security.ui.admin.addRole";
+	private UserAdminService userAdminService;
 	private String rolePrefix = "ROLE_";
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
@@ -26,15 +44,26 @@ public class AddRole extends AbstractHandler {
 		role = role.trim().toUpperCase();
 		if (!role.startsWith(rolePrefix))
 			role = rolePrefix + role;
-		if (securityService.listEditableRoles().contains(role))
+		if (userAdminService.listEditableRoles().contains(role))
 			throw new ArgeoException("Role " + role + " already exists");
-		securityService.newRole(role);
+		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 setSecurityService(ArgeoSecurityService securityService) {
-		this.securityService = securityService;
+	public void setUserAdminService(UserAdminService userAdminService) {
+		this.userAdminService = userAdminService;
 	}
 
 }