Adapt to changes in Argeo Commons

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 b409d3b22c713153b09d04fcb46b1857ccb62afc..086f93193157dde79c76d93cb2b36ffc2ef20d5b 100644 (file)
--- 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 b766aca268f7941daf2b613a6d271fbd9d308266..6453b88b4c2c2d12133a1dd94923a818a668b0e1 100644 (file)
--- 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 a8c50f1f65d0bb161a5505cef607491b58b9663f..d54a9d82d7ccb38fa68965fecb39c8333a204642 100644 (file)
--- 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 6343c1bca15238a8bbe5a1508e0541ac7ec233e5..f5f2610d888d1c84a5b94a330126bd81b1721e69 100644 (file)
--- 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;