Clarify ACR API

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / acr / dav / DavContent.java

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/dav/DavContent.java b/org.argeo.cms/src/org/argeo/cms/acr/dav/DavContent.java
index 0003e533433e3ccbdd903ab0804c2f2ad0292e0b..b5915406e3411c045722a00a0f1c3b8b2152da2d 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/acr/dav/DavContent.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/dav/DavContent.java
@@ -15,8 +15,9 @@ import org.argeo.api.acr.NamespaceUtils;
 import org.argeo.api.acr.spi.ContentProvider;
 import org.argeo.api.acr.spi.ProvidedSession;
 import org.argeo.cms.acr.AbstractContent;
-import org.argeo.cms.acr.ContentUtils;
-import org.argeo.util.dav.DavResponse;
+import org.argeo.cms.acr.CmsContent;
+import org.argeo.cms.dav.DavResponse;
+import org.argeo.cms.http.HttpStatus;
 
 public class DavContent extends AbstractContent {
        private final DavContentProvider provider;
@@ -40,7 +41,7 @@ public class DavContent extends AbstractContent {
 
        @Override
        public QName getName() {
-               String fileName = ContentUtils.getParentPath(uri.getPath())[1];
+               String fileName = CmsContent.getParentPath(uri.getPath())[1];
                ContentName name = NamespaceUtils.parsePrefixedName(provider, fileName);
                return name;
        }
@@ -48,7 +49,7 @@ public class DavContent extends AbstractContent {
        @Override
        public Content getParent() {
                try {
-                       String parentPath = ContentUtils.getParentPath(uri.getPath())[0];
+                       String parentPath = CmsContent.getParentPath(uri.getPath())[0];
                        URI parentUri = new URI(uri.getScheme(), uri.getHost(), parentPath, null);
                        return provider.getDavContent(getSession(), parentUri);
                } catch (URISyntaxException e) {
@@ -103,7 +104,7 @@ public class DavContent extends AbstractContent {
                        DavResponse response = responses.next();
                        String relativePath = response.getHref();
                        URI contentUri = provider.relativePathToUri(relativePath);
-                       return new DavContent(getSession(), provider, contentUri, response.getPropertyNames());
+                       return new DavContent(getSession(), provider, contentUri, response.getPropertyNames(HttpStatus.OK));
                }
 
        }