Adapt to changes in Argeo Commons

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

diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/HierarchyUnitPart.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/HierarchyUnitPart.java
index 9ad3457664a948c23eedec60615573cc2fd6982f..784684d729dd3a31d4191476df51374185f36070 100644 (file)
--- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/HierarchyUnitPart.java
+++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/HierarchyUnitPart.java
@@ -5,16 +5,16 @@ import java.util.List;
 
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.ContentSession;
-import org.argeo.api.acr.ldap.LdapObjs;
+import org.argeo.api.acr.ldap.LdapObj;
 import org.argeo.api.cms.directory.CmsDirectory;
 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.app.ux.SuiteIcon;
 import org.argeo.cms.CurrentUser;
 import org.argeo.cms.acr.ContentUtils;
-import org.argeo.cms.auth.CmsRole;
+import org.argeo.cms.auth.CmsSystemRole;
 import org.argeo.cms.ux.widgets.AbstractHierarchicalPart;
 import org.argeo.cms.ux.widgets.Column;
 
@@ -36,9 +36,9 @@ public class HierarchyUnitPart extends AbstractHierarchicalPart<HierarchyUnit> {
                        @Override
                        public CmsIcon getIcon(HierarchyUnit model) {
                                Content content = ContentUtils.hierarchyUnitToContent(contentSession, model);
-                               if (content.hasContentClass(LdapObjs.organization))
+                               if (content.hasContentClass(LdapObj.organization))
                                        return SuiteIcon.organisation;
-                               else if (content.hasContentClass(LdapObjs.posixGroup))
+                               else if (content.hasContentClass(LdapObj.posixGroup))
                                        return SuiteIcon.users;
                                else
                                        return SuiteIcon.addressBook;
@@ -57,11 +57,11 @@ public class HierarchyUnitPart extends AbstractHierarchicalPart<HierarchyUnit> {
                        }
                } else {
                        for (UserDirectory directory : cmsUserManager.getUserDirectories()) {
-                               if (CurrentUser.implies(CmsRole.userAdmin, directory.getBase())) {
+                               if (CurrentUser.implies(CmsSystemRole.userAdmin, directory.getBase())) {
                                        visible.add(directory);
                                }
                                for (HierarchyUnit hu : directory.getDirectHierarchyUnits(true)) {
-                                       if (CurrentUser.implies(CmsRole.userAdmin, hu.getBase())) {
+                                       if (CurrentUser.implies(CmsSystemRole.userAdmin, hu.getBase())) {
                                                visible.add(hu);
                                        }
                                }