From 8339c61fea89f948b129a24834a53c7988c42df5 Mon Sep 17 00:00:00 2001
From: Mathieu <mbaudier@argeo.org>
Date: Sat, 12 Nov 2022 08:02:53 +0100
Subject: [PATCH] Adapt to changes in Argeo Commons

---
 org.argeo.app.api/src/org/argeo/app/api/SuiteRole.java      | 2 +-
 org.argeo.app.core/src/org/argeo/app/core/SuiteUtils.java   | 2 +-
 .../src/org/argeo/app/ui/people/PeopleEntryArea.java        | 6 +++---
 .../src/org/argeo/app/ui/people/PersonUiProvider.java       | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/org.argeo.app.api/src/org/argeo/app/api/SuiteRole.java b/org.argeo.app.api/src/org/argeo/app/api/SuiteRole.java
index b409d3b..086f931 100644
--- a/org.argeo.app.api/src/org/argeo/app/api/SuiteRole.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/SuiteRole.java
@@ -6,7 +6,7 @@ import org.argeo.api.acr.ArgeoNamespace;
 import org.argeo.api.acr.ContentName;
 import org.argeo.api.acr.ldap.LdapAttrs;
 import org.argeo.api.cms.CmsConstants;
-import org.argeo.cms.auth.SystemRole;
+import org.argeo.cms.SystemRole;
 
 /** Standard suite system roles. */
 public enum SuiteRole implements SystemRole {
diff --git a/org.argeo.app.core/src/org/argeo/app/core/SuiteUtils.java b/org.argeo.app.core/src/org/argeo/app/core/SuiteUtils.java
index b766aca..6453b88 100644
--- a/org.argeo.app.core/src/org/argeo/app/core/SuiteUtils.java
+++ b/org.argeo.app.core/src/org/argeo/app/core/SuiteUtils.java
@@ -18,7 +18,7 @@ import org.argeo.api.acr.ldap.LdapObjs;
 import org.argeo.api.cms.CmsConstants;
 import org.argeo.api.cms.CmsSession;
 import org.argeo.app.api.EntityType;
-import org.argeo.cms.auth.RoleNameUtils;
+import org.argeo.cms.RoleNameUtils;
 import org.argeo.jcr.JcrException;
 import org.argeo.jcr.JcrUtils;
 
diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java
index a8c50f1..d54a9d8 100644
--- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java
+++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java
@@ -11,8 +11,9 @@ import org.argeo.api.acr.ContentRepository;
 import org.argeo.api.acr.ContentSession;
 import org.argeo.api.acr.ldap.LdapAttrs;
 import org.argeo.api.acr.ldap.LdapObjs;
-import org.argeo.api.cms.directory.Directory;
+import org.argeo.api.cms.directory.CmsDirectory;
 import org.argeo.api.cms.directory.HierarchyUnit;
+import org.argeo.api.cms.directory.UserDirectory;
 import org.argeo.api.cms.ux.CmsIcon;
 import org.argeo.api.cms.ux.CmsView;
 import org.argeo.app.ui.SuiteIcon;
@@ -24,7 +25,6 @@ import org.argeo.cms.auth.CmsRole;
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.auth.UserAdminUtils;
 import org.argeo.cms.jcr.acr.JcrContent;
-import org.argeo.cms.osgi.useradmin.UserDirectory;
 import org.argeo.cms.swt.CmsSwtTheme;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.swt.Selected;
@@ -79,7 +79,7 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider {
 			public List<HierarchyUnit> getChildren(HierarchyUnit parent) {
 				List<HierarchyUnit> visible = new ArrayList<>();
 				if (parent != null) {
-					if (parent instanceof Directory) // do no show children of the directories
+					if (parent instanceof CmsDirectory) // do no show children of the directories
 						return visible;
 					for (HierarchyUnit hu : parent.getDirectHierarchyUnits(true)) {
 						visible.add(hu);
diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java
index 6343c1b..f5f2610 100644
--- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java
+++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java
@@ -15,10 +15,10 @@ import org.argeo.app.ui.SuiteUiUtils;
 import org.argeo.cms.CmsMsg;
 import org.argeo.cms.CmsUserManager;
 import org.argeo.cms.Localized;
+import org.argeo.cms.RoleNameUtils;
+import org.argeo.cms.SystemRole;
 import org.argeo.cms.auth.CmsRole;
 import org.argeo.cms.auth.CurrentUser;
-import org.argeo.cms.auth.RoleNameUtils;
-import org.argeo.cms.auth.SystemRole;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.swt.Selected;
 import org.argeo.cms.swt.acr.SwtSection;
-- 
2.30.2