X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Finternal%2Fparts%2FGroupsView.java;h=82f4e1bdd8f27a0f6f1713f159d85e68910846ed;hb=8260f4470f514ea347ca53f5b4dfc632c4a4de66;hp=77621fe30c80cce0b98162b8156c8ff64b9c596d;hpb=f295f8e7a43efc1839416158f4e0f268506c88b5;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java
index 77621fe30..82f4e1bdd 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java
@@ -20,7 +20,7 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.ArgeoException;
+import org.argeo.cms.CmsException;
 import org.argeo.cms.auth.AuthConstants;
 import org.argeo.cms.util.useradmin.UserAdminUtils;
 import org.argeo.eclipse.ui.ColumnDefinition;
@@ -29,6 +29,7 @@ import org.argeo.eclipse.ui.parts.LdifUsersTable;
 import org.argeo.jcr.ArgeoNames;
 import org.argeo.osgi.useradmin.LdifName;
 import org.argeo.security.ui.admin.SecurityAdminPlugin;
+import org.argeo.security.ui.admin.internal.UiUserAdminListener;
 import org.argeo.security.ui.admin.internal.UserAdminWrapper;
 import org.argeo.security.ui.admin.internal.providers.CommonNameLP;
 import org.argeo.security.ui.admin.internal.providers.DomainNameLP;
@@ -46,6 +47,7 @@ import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.part.ViewPart;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.service.useradmin.Role;
@@ -111,17 +113,34 @@ public class GroupsView extends ViewPart implements ArgeoNames {
 		userViewer.addDragSupport(operations, tt, new UserDragListener(
 				userViewer));
 
+		// // Register a useradmin listener
+		// listener = new UserAdminListener() {
+		// @Override
+		// public void roleChanged(UserAdminEvent event) {
+		// if (userViewer != null && !userViewer.getTable().isDisposed())
+		// refresh();
+		// }
+		// };
+		// userAdminWrapper.addListener(listener);
+		// }
+
 		// Register a useradmin listener
-		listener = new UserAdminListener() {
-			@Override
-			public void roleChanged(UserAdminEvent event) {
-				if (userViewer != null && !userViewer.getTable().isDisposed())
-					refresh();
-			}
-		};
+		listener = new MyUiUAListener(parent.getDisplay());
 		userAdminWrapper.addListener(listener);
 	}
 
+	private class MyUiUAListener extends UiUserAdminListener {
+		public MyUiUAListener(Display display) {
+			super(display);
+		}
+
+		@Override
+		public void roleChangedToUiThread(UserAdminEvent event) {
+			if (userViewer != null && !userViewer.getTable().isDisposed())
+				refresh();
+		}
+	}
+
 	private class MyUserTableViewer extends LdifUsersTable {
 		private static final long serialVersionUID = 8467999509931900367L;
 
@@ -197,7 +216,7 @@ public class GroupsView extends ViewPart implements ArgeoNames {
 				roles = userAdminWrapper.getUserAdmin().getRoles(
 						builder.toString());
 			} catch (InvalidSyntaxException e) {
-				throw new ArgeoException("Unable to get roles with filter: "
+				throw new CmsException("Unable to get roles with filter: "
 						+ filter, e);
 			}
 			List<User> users = new ArrayList<User>();