X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=swt%2Forg.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2Fpeople%2FUsersPart.java;h=aaa8115b527f1a270f4a4337783760df2f73a2d4;hb=9d1dd85af774c08ca520313c0311fbe37ed3dd32;hp=96e24444cfe2a2c60c7910bf173daa0f10a5df80;hpb=932dbdce11c1a862b6a7babcb91bfec8e491e0b8;p=gpl%2Fargeo-suite.git

diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersPart.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersPart.java
index 96e2444..aaa8115 100644
--- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersPart.java
+++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersPart.java
@@ -5,19 +5,13 @@ import java.util.List;
 
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.ContentSession;
-import org.argeo.api.acr.ldap.LdapAttr;
 import org.argeo.api.acr.ldap.LdapObj;
+import org.argeo.api.cms.directory.CmsRole;
 import org.argeo.api.cms.directory.CmsUserManager;
 import org.argeo.api.cms.directory.HierarchyUnit;
 import org.argeo.api.cms.directory.UserDirectory;
-import org.argeo.api.cms.ux.CmsIcon;
-import org.argeo.app.ui.SuiteIcon;
 import org.argeo.cms.acr.ContentUtils;
-import org.argeo.cms.auth.UserAdminUtils;
-import org.argeo.cms.ux.widgets.Column;
 import org.argeo.cms.ux.widgets.DefaultTabularPart;
-import org.osgi.service.useradmin.Role;
-import org.osgi.service.useradmin.User;
 
 public class UsersPart extends DefaultTabularPart<HierarchyUnit, Content> {
 	private ContentSession contentSession;
@@ -26,33 +20,7 @@ public class UsersPart extends DefaultTabularPart<HierarchyUnit, Content> {
 	public UsersPart(ContentSession contentSession, CmsUserManager cmsUserManager) {
 		this.contentSession = contentSession;
 		this.cmsUserManager = cmsUserManager;
-		addColumn(new Column<Content>() {
-
-			@Override
-			public String getText(Content role) {
-				if (role.hasContentClass(LdapObj.inetOrgPerson))
-					return UserAdminUtils.getUserDisplayName(role.adapt(User.class));
-				else if (role.hasContentClass(LdapObj.organization))
-					return role.attr(LdapAttr.o);
-				else if (role.hasContentClass(LdapObj.groupOfNames))
-					return role.attr(LdapAttr.cn);
-				else
-					return null;
-			}
-
-			@Override
-			public CmsIcon getIcon(Content role) {
-				if (role.hasContentClass(LdapObj.posixAccount))
-					return SuiteIcon.user;
-				else if (role.hasContentClass(LdapObj.inetOrgPerson))
-					return SuiteIcon.person;
-				else if (role.hasContentClass(LdapObj.organization))
-					return SuiteIcon.organisationContact;
-				else if (role.hasContentClass(LdapObj.groupOfNames))
-					return SuiteIcon.group;
-				else
-					return null;
-			}
+		addColumn(new UserColumn() {
 
 			@Override
 			public int getWidth() {
@@ -67,7 +35,7 @@ public class UsersPart extends DefaultTabularPart<HierarchyUnit, Content> {
 		List<Content> roles = new ArrayList<>();
 		UserDirectory ud = (UserDirectory) hu.getDirectory();
 		if (ud.getRealm().isPresent()) {
-			for (Role r : ud.getHierarchyUnitRoles(ud, null, true)) {
+			for (CmsRole r : ud.getHierarchyUnitRoles(ud, null, true)) {
 				Content content = ContentUtils.roleToContent(cmsUserManager, contentSession, r);
 				if (content.hasContentClass(LdapObj.inetOrgPerson, LdapObj.organization))
 					roles.add(content);
@@ -77,10 +45,9 @@ public class UsersPart extends DefaultTabularPart<HierarchyUnit, Content> {
 			for (HierarchyUnit directChild : hu.getDirectHierarchyUnits(false)) {
 				if (!(directChild.isType(HierarchyUnit.Type.FUNCTIONAL)
 						|| directChild.isType(HierarchyUnit.Type.ROLES))) {
-					for (Role r : ud.getHierarchyUnitRoles(directChild, null, false)) {
+					for (CmsRole r : ud.getHierarchyUnitRoles(directChild, null, false)) {
 						Content content = ContentUtils.roleToContent(cmsUserManager, contentSession, r);
-						if (content.hasContentClass(LdapObj.inetOrgPerson, LdapObj.organization,
-								LdapObj.groupOfNames))
+						if (content.hasContentClass(LdapObj.inetOrgPerson, LdapObj.organization, LdapObj.groupOfNames))
 							roles.add(content);
 					}
 				}