Adapt to changes in Argeo Commons

[gpl/argeo-suite.git] / swt / org.argeo.app.ui / src / org / argeo / app / ui / people / UsersPart.java

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 d82b227d709887e9441e2c348679ca2cbcb22145..96e24444cfe2a2c60c7910bf173daa0f10a5df80 100644 (file)
--- 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,8 +5,8 @@ import java.util.List;
 
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.ContentSession;
-import org.argeo.api.acr.ldap.LdapAttrs;
-import org.argeo.api.acr.ldap.LdapObjs;
+import org.argeo.api.acr.ldap.LdapAttr;
+import org.argeo.api.acr.ldap.LdapObj;
 import org.argeo.api.cms.directory.CmsUserManager;
 import org.argeo.api.cms.directory.HierarchyUnit;
 import org.argeo.api.cms.directory.UserDirectory;
@@ -30,25 +30,25 @@ public class UsersPart extends DefaultTabularPart<HierarchyUnit, Content> {
 
                        @Override
                        public String getText(Content role) {
-                               if (role.hasContentClass(LdapObjs.inetOrgPerson))
+                               if (role.hasContentClass(LdapObj.inetOrgPerson))
                                        return UserAdminUtils.getUserDisplayName(role.adapt(User.class));
-                               else if (role.hasContentClass(LdapObjs.organization))
-                                       return role.attr(LdapAttrs.o);
-                               else if (role.hasContentClass(LdapObjs.groupOfNames))
-                                       return role.attr(LdapAttrs.cn);
+                               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(LdapObjs.posixAccount))
+                               if (role.hasContentClass(LdapObj.posixAccount))
                                        return SuiteIcon.user;
-                               else if (role.hasContentClass(LdapObjs.inetOrgPerson))
+                               else if (role.hasContentClass(LdapObj.inetOrgPerson))
                                        return SuiteIcon.person;
-                               else if (role.hasContentClass(LdapObjs.organization))
+                               else if (role.hasContentClass(LdapObj.organization))
                                        return SuiteIcon.organisationContact;
-                               else if (role.hasContentClass(LdapObjs.groupOfNames))
+                               else if (role.hasContentClass(LdapObj.groupOfNames))
                                        return SuiteIcon.group;
                                else
                                        return null;
@@ -69,7 +69,7 @@ public class UsersPart extends DefaultTabularPart<HierarchyUnit, Content> {
                if (ud.getRealm().isPresent()) {
                        for (Role r : ud.getHierarchyUnitRoles(ud, null, true)) {
                                Content content = ContentUtils.roleToContent(cmsUserManager, contentSession, r);
-                               if (content.hasContentClass(LdapObjs.inetOrgPerson, LdapObjs.organization))
+                               if (content.hasContentClass(LdapObj.inetOrgPerson, LdapObj.organization))
                                        roles.add(content);
                        }
 
@@ -79,8 +79,8 @@ public class UsersPart extends DefaultTabularPart<HierarchyUnit, Content> {
                                                || directChild.isType(HierarchyUnit.Type.ROLES))) {
                                        for (Role r : ud.getHierarchyUnitRoles(directChild, null, false)) {
                                                Content content = ContentUtils.roleToContent(cmsUserManager, contentSession, r);
-                                               if (content.hasContentClass(LdapObjs.inetOrgPerson, LdapObjs.organization,
-                                                               LdapObjs.groupOfNames))
+                                               if (content.hasContentClass(LdapObj.inetOrgPerson, LdapObj.organization,
+                                                               LdapObj.groupOfNames))
                                                        roles.add(content);
                                        }
                                }