X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2Fdirectory%2FHierarchyUnitContent.java;h=e4c637f20b8fd2fca0cdccaf0f295e3594d2f8e0;hb=HEAD;hp=bf8dae72eb722df203ae8a0a13666745ee6a8844;hpb=3066d79e3ced9339679672242bdf2340a03e1f29;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/directory/HierarchyUnitContent.java b/org.argeo.cms/src/org/argeo/cms/acr/directory/HierarchyUnitContent.java
index bf8dae72e..e4c637f20 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/directory/HierarchyUnitContent.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/directory/HierarchyUnitContent.java
@@ -10,12 +10,12 @@ import javax.xml.namespace.QName;
 
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.ContentName;
-import org.argeo.api.acr.CrName;
+import org.argeo.api.acr.DName;
 import org.argeo.api.acr.spi.ProvidedSession;
-import org.argeo.osgi.useradmin.UserDirectory;
-import org.argeo.util.directory.Directory;
-import org.argeo.util.directory.HierarchyUnit;
-import org.osgi.service.useradmin.Role;
+import org.argeo.api.cms.directory.CmsDirectory;
+import org.argeo.api.cms.directory.CmsRole;
+import org.argeo.api.cms.directory.HierarchyUnit;
+import org.argeo.api.cms.directory.UserDirectory;
 
 class HierarchyUnitContent extends AbstractDirectoryContent {
 	private HierarchyUnit hierarchyUnit;
@@ -45,7 +45,7 @@ class HierarchyUnitContent extends AbstractDirectoryContent {
 	@Override
 	public Content getParent() {
 		HierarchyUnit parentHu = hierarchyUnit.getParent();
-		if (parentHu instanceof Directory) {
+		if (parentHu instanceof CmsDirectory) {
 			return new DirectoryContent(getSession(), provider, hierarchyUnit.getDirectory());
 		}
 		return new HierarchyUnitContent(getSession(), provider, parentHu);
@@ -57,7 +57,7 @@ class HierarchyUnitContent extends AbstractDirectoryContent {
 		for (HierarchyUnit hu : hierarchyUnit.getDirectHierarchyUnits(false))
 			lst.add(new HierarchyUnitContent(getSession(), provider, hu));
 
-		for (Role role : ((UserDirectory) hierarchyUnit.getDirectory()).getHierarchyUnitRoles(hierarchyUnit, null,
+		for (CmsRole role : ((UserDirectory) hierarchyUnit.getDirectory()).getHierarchyUnitRoles(hierarchyUnit, null,
 				false))
 			lst.add(new RoleContent(getSession(), provider, this, role));
 		return lst.iterator();
@@ -69,7 +69,7 @@ class HierarchyUnitContent extends AbstractDirectoryContent {
 	@Override
 	public List<QName> getContentClasses() {
 		List<QName> contentClasses = super.getContentClasses();
-		contentClasses.add(CrName.COLLECTION.get());
+		contentClasses.add(DName.collection.qName());
 		return contentClasses;
 	}