X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2FAbstractContent.java;h=c6e07e638b9b24b7bd0ebee667446b5de25b05ed;hb=e5f2dcdb553b5da76c7727af8aa24c83ed397d35;hp=1cffef40ef5cc77f5be0783bfd5087ba48c1a565;hpb=975fb5e581d0650768afc68a0e839657f318e77a;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 1cffef40e..c6e07e638 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/AbstractContent.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/AbstractContent.java
@@ -17,7 +17,7 @@ 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.util.LangUtils;
+import org.argeo.cms.util.LangUtils;
 
 /** Partial reference implementation of a {@link ProvidedContent}. */
 public abstract class AbstractContent extends AbstractMap<QName, Object> implements ProvidedContent {
@@ -55,34 +55,27 @@ 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 Optional.empty();
+			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 (isDefaultAttrTypeRequested(clss))
+				return (List<A>) value;
+			List<A> res = new ArrayList<>();
+			List<?> lst = (List<?>) value;
+			for (Object o : lst) {
+				A item = clss.isAssignableFrom(String.class) ? (A) o.toString() : (A) o;
+				res.add(item);
 			}
+			return res;
 		} else {// singleton
-			try {
-				A res = (A) value;
-				return Optional.of(Collections.singletonList(res));
-			} catch (ClassCastException e) {
-				return Optional.empty();
-			}
+//			try {
+			A res = (A) value;
+			return Collections.singletonList(res);
+//			} catch (ClassCastException e) {
+//				return Optional.empty();
+//			}
 		}
 	}
 
@@ -127,6 +120,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();