X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2FAbstractContent.java;h=16f39609e8aafb1c9185dec0a274ef74431cdedf;hb=54df376a9c2dd458a82eaa09bfbb718fe699dd0d;hp=c8ba7311daaa4206a14de8be12a032ed40644c7d;hpb=5c9bae758b5bb13ff3b046ad680886ae540865e8;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 c8ba7311d..16f39609e 100644 --- a/org.argeo.cms/src/org/argeo/cms/acr/AbstractContent.java +++ b/org.argeo.cms/src/org/argeo/cms/acr/AbstractContent.java @@ -14,14 +14,18 @@ import javax.xml.namespace.QName; import org.argeo.api.acr.Content; 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 implements ProvidedContent { private final ProvidedSession session; + // cache +// private String _path = null; + public AbstractContent(ProvidedSession session) { this.session = session; } @@ -51,34 +55,27 @@ public abstract class AbstractContent extends AbstractMap impleme @SuppressWarnings("unchecked") @Override - public Optional> getMultiple(QName key, Class clss) { + public List getMultiple(QName key, Class clss) { Object value = get(key); if (value == null) - return null; + return new ArrayList<>(); if (value instanceof List) { - try { - List res = (List) value; - return Optional.of(res); - } catch (ClassCastException e) { - List 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) value; + List 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(); +// } } } @@ -88,15 +85,24 @@ public abstract class AbstractContent extends AbstractMap impleme @Override public String getPath() { +// if (_path != null) +// return _path; List 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(); } @@ -133,7 +139,7 @@ public abstract class AbstractContent extends AbstractMap impleme */ @Override - public List getTypes() { + public List getContentClasses() { return new ArrayList<>(); } @@ -231,4 +237,12 @@ public abstract class AbstractContent extends AbstractMap impleme } } + + /* + * OBJECT METHODS + */ + @Override + public String toString() { + return "content " + getPath(); + } }