X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2FContentUtils.java;h=48b047c295359434450bface9438b986e83aea9b;hb=6832a0807e45e70c23b22598874807a3a9373475;hp=17144cfdb660cfceaf84c54016b46b6f44c1ac8e;hpb=c0342975a37c70895c2e8f6b341d790700168d7f;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java b/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java
index 17144cfdb..48b047c29 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java
@@ -14,6 +14,7 @@ import org.argeo.api.acr.Content;
 import org.argeo.api.acr.ContentRepository;
 import org.argeo.api.acr.ContentSession;
 import org.argeo.api.acr.CrName;
+import org.argeo.api.acr.DName;
 import org.argeo.api.cms.CmsAuth;
 import org.argeo.cms.CmsUserManager;
 import org.argeo.osgi.useradmin.UserDirectory;
@@ -64,6 +65,7 @@ public class ContentUtils {
 
 	public static final char SLASH = '/';
 	public static final String ROOT_SLASH = "" + SLASH;
+	public static final String EMPTY = "";
 
 	/**
 	 * Split a path (with '/' separator) in an array of length 2, the first part
@@ -83,7 +85,7 @@ public class ContentUtils {
 		}
 
 		if (parentIndex == -1) // no '/'
-			return new String[] { "", path };
+			return new String[] { EMPTY, path };
 
 		return new String[] { parentIndex != 0 ? path.substring(0, parentIndex) : "" + SLASH,
 				path.substring(parentIndex + 1) };
@@ -98,7 +100,7 @@ public class ContentUtils {
 
 	public static List<String> toPathSegments(String path) {
 		List<String> res = new ArrayList<>();
-		if ("".equals(path) || ROOT_SLASH.equals(path))
+		if (EMPTY.equals(path) || ROOT_SLASH.equals(path))
 			return res;
 		collectPathSegments(path, res);
 		return res;
@@ -106,10 +108,10 @@ public class ContentUtils {
 
 	private static void collectPathSegments(String path, List<String> segments) {
 		String[] parent = getParentPath(path);
-		if ("".equals(parent[1])) // root
+		if (EMPTY.equals(parent[1])) // root
 			return;
 		segments.add(0, parent[1]);
-		if ("".equals(parent[0])) // end
+		if (EMPTY.equals(parent[0])) // end
 			return;
 		collectPathSegments(parent[0], segments);
 	}
@@ -134,7 +136,7 @@ public class ContentUtils {
 	public static Content createCollections(ContentSession session, String path) {
 		if (session.exists(path)) {
 			Content content = session.get(path);
-			if (!content.isContentClass(CrName.collection.qName())) {
+			if (!content.isContentClass(DName.collection.qName())) {
 				throw new IllegalStateException("Content " + path + " already exists, but is not a collection");
 			} else {
 				return content;
@@ -142,7 +144,7 @@ public class ContentUtils {
 		} else {
 			String[] parentPath = getParentPath(path);
 			Content parent = createCollections(session, parentPath[0]);
-			Content content = parent.add(parentPath[1], CrName.collection.qName());
+			Content content = parent.add(parentPath[1], DName.collection.qName());
 			return content;
 		}
 	}