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=9a1a58c55a7ef3162739d8c7fed32bceed5d0e01;hpb=e3db2eba9a7f8380a6f76d7b0e6cd4825e91893e;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 9a1a58c55..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,11 @@
 package org.argeo.cms.acr.xml;
 
 import java.nio.CharBuffer;
-import java.nio.file.Path;
+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;
@@ -14,12 +16,11 @@ import javax.xml.namespace.QName;
 
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.ContentName;
-import org.argeo.api.acr.ContentUtils;
 import org.argeo.api.acr.CrName;
-import org.argeo.api.acr.spi.AbstractContent;
 import org.argeo.api.acr.spi.ProvidedContent;
 import org.argeo.api.acr.spi.ProvidedSession;
-import org.argeo.cms.acr.fs.FsContent;
+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;
@@ -28,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;
 
@@ -38,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;
 	}
@@ -52,7 +53,7 @@ public class DomContent extends AbstractContent implements ProvidedContent {
 		if (element.getParentNode() == null) {// root
 			String mountPath = provider.getMountPath();
 			if (mountPath != null) {
-				Content mountPoint = session.getMountPoint(mountPath);
+				Content mountPoint = getSession().getMountPoint(mountPath);
 				return mountPoint.getName();
 			}
 		}
@@ -131,12 +132,31 @@ 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() {
 //		return element instanceof Text;
@@ -181,7 +201,7 @@ public class DomContent extends AbstractContent implements ProvidedContent {
 	@Override
 	public Iterator<Content> iterator() {
 		NodeList nodeList = element.getChildNodes();
-		return new ElementIterator(this, session, provider, nodeList);
+		return new ElementIterator(this, getSession(), provider, nodeList);
 	}
 
 	@Override
@@ -192,7 +212,7 @@ public class DomContent extends AbstractContent implements ProvidedContent {
 			if (mountPath == null)
 				return null;
 			String[] parent = ContentUtils.getParentPath(mountPath);
-			return session.get(parent[0]);
+			return getSession().get(parent[0]);
 		}
 		if (parentNode instanceof Document)
 			return null;
@@ -207,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);
 	}
@@ -229,6 +250,7 @@ public class DomContent extends AbstractContent implements ProvidedContent {
 
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public <A> A adapt(Class<A> clss) throws IllegalArgumentException {
 		if (CharBuffer.class.isAssignableFrom(clss)) {
@@ -239,15 +261,29 @@ public class DomContent extends AbstractContent implements ProvidedContent {
 		return super.adapt(clss);
 	}
 
+	@SuppressWarnings("unchecked")
 	public <A> CompletableFuture<A> write(Class<A> clss) {
 		if (String.class.isAssignableFrom(clss)) {
 			CompletableFuture<String> res = new CompletableFuture<>();
-			res.thenAccept((s) -> element.setTextContent(s));// .thenRun(() -> provider.persist(session));
+			res.thenAccept((s) -> {
+				getSession().notifyModification(this);
+				element.setTextContent(s);
+			});
 			return (CompletableFuture<A>) res;
 		}
 		return super.write(clss);
 	}
 
+	/*
+	 * TYPING
+	 */
+	@Override
+	public List<QName> getContentClasses() {
+		List<QName> res = new ArrayList<>();
+		res.add(getName());
+		return res;
+	}
+
 	/*
 	 * MOUNT MANAGEMENT
 	 */
@@ -259,10 +295,7 @@ public class DomContent extends AbstractContent implements ProvidedContent {
 		return new DomContent(this, childElement);
 	}
 
-	public ProvidedSession getSession() {
-		return session;
-	}
-
+	@Override
 	public DomContentProvider getProvider() {
 		return provider;
 	}