X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2Fdirectory%2FHierarchyUnitContent.java;h=5acf8ab63fc07711f1956ed4fa3380c952f294a5;hb=feddb4be70a8304dd4a533efee6e14c22691b500;hp=0ec025ced2c153bfa80170bf497ed4f8cd409021;hpb=55d1a78150b6be0004f6bcb28703bcdd6daf55a1;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 0ec025ced..5acf8ab63 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
@@ -11,9 +11,11 @@ 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.HierarchyUnit;
+import org.argeo.api.cms.directory.CmsDirectory;
+import org.argeo.api.cms.directory.HierarchyUnit;
+import org.argeo.api.cms.directory.UserDirectory;
 import org.osgi.service.useradmin.Role;
 
 class HierarchyUnitContent extends AbstractDirectoryContent {
@@ -44,7 +46,7 @@ class HierarchyUnitContent extends AbstractDirectoryContent {
 	@Override
 	public Content getParent() {
 		HierarchyUnit parentHu = hierarchyUnit.getParent();
-		if (parentHu == null) {
+		if (parentHu instanceof CmsDirectory) {
 			return new DirectoryContent(getSession(), provider, hierarchyUnit.getDirectory());
 		}
 		return new HierarchyUnitContent(getSession(), provider, parentHu);
@@ -53,7 +55,7 @@ class HierarchyUnitContent extends AbstractDirectoryContent {
 	@Override
 	public Iterator<Content> iterator() {
 		List<Content> lst = new ArrayList<>();
-		for (HierarchyUnit hu : hierarchyUnit.getDirectHierachyUnits(false))
+		for (HierarchyUnit hu : hierarchyUnit.getDirectHierarchyUnits(false))
 			lst.add(new HierarchyUnitContent(getSession(), provider, hu));
 
 		for (Role role : ((UserDirectory) hierarchyUnit.getDirectory()).getHierarchyUnitRoles(hierarchyUnit, null,
@@ -68,7 +70,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;
 	}