X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2Fxml%2FDomContent.java;h=d2b5188f5fd5f88f93599f4876c72b251f7a0423;hb=55d1a78150b6be0004f6bcb28703bcdd6daf55a1;hp=626f582e515cc40d7e3d9d1f897fbd8812584063;hpb=7d2a002f5dcfe8a8c7b29803b70d4b1aff265ed1;p=lgpl%2Fargeo-commons.git
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/xml/DomContent.java b/org.argeo.cms/src/org/argeo/cms/acr/xml/DomContent.java
index 626f582e5..d2b5188f5 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/xml/DomContent.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/xml/DomContent.java
@@ -1,9 +1,14 @@
package org.argeo.cms.acr.xml;
+import java.nio.CharBuffer;
+import java.nio.file.Files;
+import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.Optional;
import java.util.Set;
+import java.util.concurrent.CompletableFuture;
import javax.xml.XMLConstants;
import javax.xml.namespace.NamespaceContext;
@@ -11,9 +16,11 @@ import javax.xml.namespace.QName;
import org.argeo.api.acr.Content;
import org.argeo.api.acr.ContentName;
-import org.argeo.api.acr.spi.AbstractContent;
+import org.argeo.api.acr.CrName;
import org.argeo.api.acr.spi.ProvidedContent;
import org.argeo.api.acr.spi.ProvidedSession;
+import org.argeo.cms.acr.AbstractContent;
+import org.argeo.cms.acr.ContentUtils;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -22,9 +29,9 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
+/** Content persisted as a DOM element. */
public class DomContent extends AbstractContent implements ProvidedContent {
- private final ProvidedSession session;
private final DomContentProvider provider;
private final Element element;
@@ -32,7 +39,7 @@ public class DomContent extends AbstractContent implements ProvidedContent {
private Boolean hasText = null;
public DomContent(ProvidedSession session, DomContentProvider contentProvider, Element element) {
- this.session = session;
+ super(session);
this.provider = contentProvider;
this.element = element;
}
@@ -43,6 +50,13 @@ public class DomContent extends AbstractContent implements ProvidedContent {
@Override
public QName getName() {
+ if (element.getParentNode() == null) {// root
+ String mountPath = provider.getMountPath();
+ if (mountPath != null) {
+ Content mountPoint = getSession().getMountPoint(mountPath);
+ return mountPoint.getName();
+ }
+ }
return toQName(this.element);
}
@@ -55,27 +69,27 @@ public class DomContent extends AbstractContent implements ProvidedContent {
if (namespaceURI == null) {
return toQName(node, node.getLocalName());
} else {
- String contextPrefix = session.getPrefix(namespaceURI);
+ String contextPrefix = provider.getPrefix(namespaceURI);
if (contextPrefix == null)
throw new IllegalStateException("Namespace " + namespaceURI + " is unbound");
- return toQName(node, namespaceURI, node.getLocalName(), session);
+ return toQName(node, namespaceURI, node.getLocalName(), provider);
}
} else {
String namespaceURI = node.getNamespaceURI();
if (namespaceURI == null)
namespaceURI = node.getOwnerDocument().lookupNamespaceURI(prefix);
if (namespaceURI == null) {
- namespaceURI = session.getNamespaceURI(prefix);
+ namespaceURI = provider.getNamespaceURI(prefix);
if (XMLConstants.NULL_NS_URI.equals(namespaceURI))
throw new IllegalStateException("Prefix " + prefix + " is unbound");
// TODO bind the prefix in the document?
}
- return toQName(node, namespaceURI, node.getLocalName(), session);
+ return toQName(node, namespaceURI, node.getLocalName(), provider);
}
}
protected QName toQName(Node source, String namespaceURI, String localName, NamespaceContext namespaceContext) {
- return new ContentName(namespaceURI, localName, session);
+ return new ContentName(namespaceURI, localName, namespaceContext);
}
protected QName toQName(Node source, String localName) {
@@ -98,6 +112,7 @@ public class DomContent extends AbstractContent implements ProvidedContent {
return result;
}
+ @SuppressWarnings("unchecked")
@Override
public Optional get(QName key, Class clss) {
String namespaceUriOrNull = XMLConstants.NULL_NS_URI.equals(key.getNamespaceURI()) ? null
@@ -117,13 +132,30 @@ public class DomContent extends AbstractContent implements ProvidedContent {
Object previous = get(key);
String namespaceUriOrNull = XMLConstants.NULL_NS_URI.equals(key.getNamespaceURI()) ? null
: key.getNamespaceURI();
+ String prefixToUse = registerPrefixIfNeeded(key);
element.setAttributeNS(namespaceUriOrNull,
- namespaceUriOrNull == null ? key.getLocalPart() : key.getPrefix() + ":" + key.getLocalPart(),
+ namespaceUriOrNull == null ? key.getLocalPart() : prefixToUse + ":" + key.getLocalPart(),
value.toString());
return previous;
}
-
-
+
+ protected String registerPrefixIfNeeded(QName name) {
+ String namespaceUriOrNull = XMLConstants.NULL_NS_URI.equals(name.getNamespaceURI()) ? null
+ : name.getNamespaceURI();
+ String prefixToUse;
+ if (namespaceUriOrNull != null) {
+ String registeredPrefix = provider.getPrefix(namespaceUriOrNull);
+ if (registeredPrefix != null) {
+ prefixToUse = registeredPrefix;
+ } else {
+ provider.registerPrefix(name.getPrefix(), namespaceUriOrNull);
+ prefixToUse = name.getPrefix();
+ }
+ } else {
+ prefixToUse = null;
+ }
+ return prefixToUse;
+ }
@Override
public boolean hasText() {
@@ -169,17 +201,24 @@ public class DomContent extends AbstractContent implements ProvidedContent {
@Override
public Iterator iterator() {
NodeList nodeList = element.getChildNodes();
- return new ElementIterator(session, provider, nodeList);
+ return new ElementIterator(this, getSession(), provider, nodeList);
}
@Override
public Content getParent() {
- Node parent = element.getParentNode();
- if (parent == null)
+ Node parentNode = element.getParentNode();
+ if (parentNode == null) {
+ String mountPath = provider.getMountPath();
+ if (mountPath == null)
+ return null;
+ String[] parent = ContentUtils.getParentPath(mountPath);
+ return getSession().get(parent[0]);
+ }
+ if (parentNode instanceof Document)
return null;
- if (!(parent instanceof Element))
+ if (!(parentNode instanceof Element))
throw new IllegalStateException("Parent is not an element");
- return new DomContent(this, (Element) parent);
+ return new DomContent(this, (Element) parentNode);
}
@Override
@@ -188,8 +227,9 @@ public class DomContent extends AbstractContent implements ProvidedContent {
Document document = this.element.getOwnerDocument();
String namespaceUriOrNull = XMLConstants.NULL_NS_URI.equals(name.getNamespaceURI()) ? null
: name.getNamespaceURI();
+ String prefixToUse = registerPrefixIfNeeded(name);
Element child = document.createElementNS(namespaceUriOrNull,
- namespaceUriOrNull == null ? name.getLocalPart() : name.getPrefix() + ":" + name.getLocalPart());
+ namespaceUriOrNull == null ? name.getLocalPart() : prefixToUse + ":" + name.getLocalPart());
element.appendChild(child);
return new DomContent(this, child);
}
@@ -210,10 +250,52 @@ public class DomContent extends AbstractContent implements ProvidedContent {
}
- public ProvidedSession getSession() {
- return session;
+ @SuppressWarnings("unchecked")
+ @Override
+ public A adapt(Class clss) throws IllegalArgumentException {
+ if (CharBuffer.class.isAssignableFrom(clss)) {
+ String textContent = element.getTextContent();
+ CharBuffer buf = CharBuffer.wrap(textContent);
+ return (A) buf;
+ }
+ return super.adapt(clss);
}
+ @SuppressWarnings("unchecked")
+ public CompletableFuture write(Class clss) {
+ if (String.class.isAssignableFrom(clss)) {
+ CompletableFuture res = new CompletableFuture<>();
+ res.thenAccept((s) -> {
+ getSession().notifyModification(this);
+ element.setTextContent(s);
+ });
+ return (CompletableFuture) res;
+ }
+ return super.write(clss);
+ }
+
+ /*
+ * TYPING
+ */
+ @Override
+ public List getContentClasses() {
+ List res = new ArrayList<>();
+ res.add(getName());
+ return res;
+ }
+
+ /*
+ * MOUNT MANAGEMENT
+ */
+ @Override
+ public ProvidedContent getMountPoint(String relativePath) {
+ // FIXME use qualified names
+ Element childElement = (Element) element.getElementsByTagName(relativePath).item(0);
+ // TODO check that it is a mount
+ return new DomContent(this, childElement);
+ }
+
+ @Override
public DomContentProvider getProvider() {
return provider;
}