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=f6a0e3b5266d30f6f1d411e2dd6357a41a6fd644;hpb=e2ffdf6872592aa22d0de2b0ec69ee4eca698c45;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 f6a0e3b52..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
@@ -1,6 +1,7 @@
 package org.argeo.cms.acr.directory;
 
 import java.util.ArrayList;
+import java.util.Dictionary;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
@@ -10,29 +11,26 @@ 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.spi.ContentProvider;
+import org.argeo.api.acr.DName;
 import org.argeo.api.acr.spi.ProvidedSession;
-import org.argeo.cms.acr.AbstractContent;
-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 AbstractContent {
+class HierarchyUnitContent extends AbstractDirectoryContent {
 	private HierarchyUnit hierarchyUnit;
 
-	private DirectoryContentProvider provider;
-
 	public HierarchyUnitContent(ProvidedSession session, DirectoryContentProvider provider,
 			HierarchyUnit hierarchyUnit) {
-		super(session);
+		super(session, provider);
 		Objects.requireNonNull(hierarchyUnit);
-		this.provider = provider;
 		this.hierarchyUnit = hierarchyUnit;
 	}
 
 	@Override
-	public ContentProvider getProvider() {
-		return provider;
+	Dictionary<String, Object> doGetProperties() {
+		return hierarchyUnit.getProperties();
 	}
 
 	@Override
@@ -48,7 +46,7 @@ class HierarchyUnitContent extends AbstractContent {
 	@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);
@@ -57,7 +55,7 @@ class HierarchyUnitContent extends AbstractContent {
 	@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,
@@ -69,12 +67,19 @@ class HierarchyUnitContent extends AbstractContent {
 	/*
 	 * TYPING
 	 */
+	@Override
+	public List<QName> getContentClasses() {
+		List<QName> contentClasses = super.getContentClasses();
+		contentClasses.add(DName.collection.qName());
+		return contentClasses;
+	}
 
+	@SuppressWarnings("unchecked")
 	@Override
-	public List<QName> getTypes() {
-		List<QName> res = new ArrayList<>();
-		res.add(CrName.COLLECTION.get());
-		return res;
+	public <A> A adapt(Class<A> clss) {
+		if (clss.equals(HierarchyUnit.class))
+			return (A) hierarchyUnit;
+		return super.adapt(clss);
 	}
 
 	/*