X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2FAbstractContent.java;h=fd4ef4cfc2c8dddc6870c91d2df8184a4c202289;hb=7e464c3cedfa41ece64811fb55ddc9ce740a1050;hp=18c6724ace740d6a5df99e5cf43e9126cd6c9eaf;hpb=4c7e1885b8bf3c93fa0919ace122e3f289a925ea;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/AbstractContent.java b/org.argeo.cms/src/org/argeo/cms/acr/AbstractContent.java
index 18c6724ac..fd4ef4cfc 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/AbstractContent.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/AbstractContent.java
@@ -16,6 +16,7 @@ import org.argeo.api.acr.Content;
 import org.argeo.api.acr.CrName;
 import org.argeo.api.acr.spi.ProvidedContent;
 import org.argeo.api.acr.spi.ProvidedSession;
+import org.argeo.util.LangUtils;
 
 /** Partial reference implementation of a {@link ProvidedContent}. */
 public abstract class AbstractContent extends AbstractMap<QName, Object> implements ProvidedContent {
@@ -93,7 +94,7 @@ public abstract class AbstractContent extends AbstractMap<QName, Object> impleme
 		for (Content c : ancestors) {
 			QName name = c.getName();
 			// FIXME
-			if (!CrName.ROOT.get().equals(name))
+			if (!CrName.root.qName().equals(name))
 				path.append('/').append(name);
 		}
 		return path.toString();
@@ -132,7 +133,7 @@ public abstract class AbstractContent extends AbstractMap<QName, Object> impleme
 	 */
 
 	@Override
-	public List<QName> getTypes() {
+	public List<QName> getContentClasses() {
 		return new ArrayList<>();
 	}
 
@@ -152,9 +153,9 @@ public abstract class AbstractContent extends AbstractMap<QName, Object> impleme
 	/*
 	 * DEFAULTS
 	 */
-	//	- no children
-	//	- no attributes
-	//	- cannot be modified
+	// - no children
+	// - no attributes
+	// - cannot be modified
 	@Override
 	public Iterator<Content> iterator() {
 		return Collections.emptyIterator();
@@ -226,12 +227,7 @@ public abstract class AbstractContent extends AbstractMap<QName, Object> impleme
 
 		@Override
 		public int size() {
-
-			int count = 0;
-			for (Iterator<QName> it = keys().iterator(); it.hasNext();) {
-				count++;
-			}
-			return count;
+			return LangUtils.size(keys());
 		}
 
 	}