X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2FAbstractContent.java;h=1acdcc3809ba3914a4c256fb814baed41ce3d880;hb=5724ab347ddfba8f2b21cdcc2fa0b8e1e2b4e527;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..1acdcc380 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/AbstractContent.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/AbstractContent.java
@@ -13,31 +13,41 @@ import java.util.Set;
 import javax.xml.namespace.QName;
 
 import org.argeo.api.acr.Content;
+import org.argeo.api.acr.CrAttributeType;
 import org.argeo.api.acr.CrName;
+import org.argeo.api.acr.NamespaceUtils;
 import org.argeo.api.acr.spi.ProvidedContent;
 import org.argeo.api.acr.spi.ProvidedSession;
+import org.argeo.cms.util.LangUtils;
 
 /** Partial reference implementation of a {@link ProvidedContent}. */
 public abstract class AbstractContent extends AbstractMap<QName, Object> implements ProvidedContent {
 	private final ProvidedSession session;
 
+	// cache
+//	private String _path = null;
+
 	public AbstractContent(ProvidedSession session) {
 		this.session = session;
 	}
 
 	/*
-	 * ATTRIBUTES OPERATIONS
+	 * ATTRIBUTES MAP IMPLEMENTATION
 	 */
-//	protected abstract Iterable<QName> keys();
-//
-//	protected abstract void removeAttr(QName key);
-
 	@Override
 	public Set<Entry<QName, Object>> entrySet() {
 		Set<Entry<QName, Object>> result = new AttrSet();
 		return result;
 	}
 
+	@Override
+	public Object get(Object key) {
+		return get((QName) key, Object.class).orElse(null);
+	}
+
+	/*
+	 * ATTRIBUTES OPERATIONS
+	 */
 	@Override
 	public Class<?> getType(QName key) {
 		return String.class;
@@ -50,34 +60,23 @@ public abstract class AbstractContent extends AbstractMap<QName, Object> impleme
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public <A> Optional<List<A>> getMultiple(QName key, Class<A> clss) {
+	public <A> List<A> getMultiple(QName key, Class<A> clss) {
 		Object value = get(key);
 		if (value == null)
-			return null;
+			return new ArrayList<>();
 		if (value instanceof List) {
-			try {
-				List<A> res = (List<A>) value;
-				return Optional.of(res);
-			} catch (ClassCastException e) {
-				List<A> res = new ArrayList<>();
-				List<?> lst = (List<?>) value;
-				try {
-					for (Object o : lst) {
-						A item = (A) o;
-						res.add(item);
-					}
-					return Optional.of(res);
-				} catch (ClassCastException e1) {
-					return Optional.empty();
-				}
+			if (clss.isAssignableFrom(Object.class))
+				return (List<A>) value;
+			List<A> res = new ArrayList<>();
+			List<?> lst = (List<?>) value;
+			for (Object o : lst) {
+				A item = CrAttributeType.cast(clss, o).get();
+				res.add(item);
 			}
+			return res;
 		} else {// singleton
-			try {
-				A res = (A) value;
-				return Optional.of(Collections.singletonList(res));
-			} catch (ClassCastException e) {
-				return Optional.empty();
-			}
+			A res = CrAttributeType.cast(clss, value).get();
+			return Collections.singletonList(res);
 		}
 	}
 
@@ -87,15 +86,24 @@ public abstract class AbstractContent extends AbstractMap<QName, Object> impleme
 
 	@Override
 	public String getPath() {
+//		if (_path != null)
+//			return _path;
 		List<Content> ancestors = new ArrayList<>();
 		collectAncestors(ancestors, this);
 		StringBuilder path = new StringBuilder();
-		for (Content c : ancestors) {
+		ancestors: for (Content c : ancestors) {
 			QName name = c.getName();
-			// FIXME
-			if (!CrName.ROOT.get().equals(name))
-				path.append('/').append(name);
+			if (CrName.root.qName().equals(name))
+				continue ancestors;
+
+			path.append('/');
+			path.append(NamespaceUtils.toPrefixedName(name));
+			int siblingIndex = c.getSiblingIndex();
+			if (siblingIndex != 1)
+				path.append('[').append(siblingIndex).append(']');
 		}
+//		_path = path.toString();
+//		return _path;
 		return path.toString();
 	}
 
@@ -113,6 +121,11 @@ public abstract class AbstractContent extends AbstractMap<QName, Object> impleme
 		return ancestors.size();
 	}
 
+	@Override
+	public boolean isRoot() {
+		return CrName.root.qName().equals(getName());
+	}
+
 	@Override
 	public String getSessionLocalId() {
 		return getPath();
@@ -132,17 +145,17 @@ public abstract class AbstractContent extends AbstractMap<QName, Object> impleme
 	 */
 
 	@Override
-	public List<QName> getTypes() {
+	public List<QName> getContentClasses() {
 		return new ArrayList<>();
 	}
 
 	/*
 	 * UTILITIES
 	 */
-	protected boolean isDefaultAttrTypeRequested(Class<?> clss) {
-		// check whether clss is Object.class
-		return clss.isAssignableFrom(Object.class);
-	}
+//	protected boolean isDefaultAttrTypeRequested(Class<?> clss) {
+//		// check whether clss is Object.class
+//		return clss.isAssignableFrom(Object.class);
+//	}
 
 //	@Override
 //	public String toString() {
@@ -152,9 +165,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();
@@ -176,7 +189,7 @@ public abstract class AbstractContent extends AbstractMap<QName, Object> impleme
 
 	@Override
 	public <A> Optional<A> get(QName key, Class<A> clss) {
-		return null;
+		return Optional.empty();
 	}
 
 	protected void removeAttr(QName key) {
@@ -226,13 +239,16 @@ 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());
 		}
 
 	}
+
+	/*
+	 * OBJECT METHODS
+	 */
+	@Override
+	public String toString() {
+		return "content " + getPath();
+	}
 }