X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2Fdirectory%2FDirectoryContent.java;h=50eea156d52442e6e406341d5aeaf105783c7d14;hb=feddb4be70a8304dd4a533efee6e14c22691b500;hp=e1ad96077e26bfc08925b69f8a9df6b41188f2c6;hpb=e2ffdf6872592aa22d0de2b0ec69ee4eca698c45;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/acr/directory/DirectoryContent.java b/org.argeo.cms/src/org/argeo/cms/acr/directory/DirectoryContent.java index e1ad96077..50eea156d 100644 --- a/org.argeo.cms/src/org/argeo/cms/acr/directory/DirectoryContent.java +++ b/org.argeo.cms/src/org/argeo/cms/acr/directory/DirectoryContent.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; @@ -8,25 +9,21 @@ import javax.xml.namespace.QName; import org.argeo.api.acr.Content; import org.argeo.api.acr.ContentName; -import org.argeo.api.acr.spi.ContentProvider; import org.argeo.api.acr.spi.ProvidedSession; -import org.argeo.cms.acr.AbstractContent; -import org.argeo.util.directory.Directory; -import org.argeo.util.directory.HierarchyUnit; +import org.argeo.api.cms.directory.CmsDirectory; +import org.argeo.api.cms.directory.HierarchyUnit; -class DirectoryContent extends AbstractContent { - private Directory directory; - private DirectoryContentProvider provider; +class DirectoryContent extends AbstractDirectoryContent { + private CmsDirectory directory; - public DirectoryContent(ProvidedSession session, DirectoryContentProvider provider, Directory directory) { - super(session); - this.provider = provider; + public DirectoryContent(ProvidedSession session, DirectoryContentProvider provider, CmsDirectory directory) { + super(session, provider); this.directory = directory; } @Override - public ContentProvider getProvider() { - return provider; + Dictionary doGetProperties() { + return directory.getProperties(); } @Override