X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fdav%2FDavXmlElement.java;h=06da6792c1d44b889de57a4653e64e74eccd2483;hb=2ddf8219c721df80456d99848cc25ce69238297d;hp=452a24f446201daf9fa8b4ca55fbee7f1470990a;hpb=6832a0807e45e70c23b22598874807a3a9373475;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/dav/DavXmlElement.java b/org.argeo.cms/src/org/argeo/cms/dav/DavXmlElement.java index 452a24f44..06da6792c 100644 --- a/org.argeo.cms/src/org/argeo/cms/dav/DavXmlElement.java +++ b/org.argeo.cms/src/org/argeo/cms/dav/DavXmlElement.java @@ -1,12 +1,15 @@ package org.argeo.cms.dav; +import java.util.Comparator; +import java.util.Objects; + import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import org.argeo.api.acr.QNamed; -public enum DavXmlElement implements QNamed { +enum DavXmlElement implements QNamed { response, // multistatus, // href, // @@ -21,6 +24,7 @@ public enum DavXmlElement implements QNamed { propname, // include, // propstat, // + status, // // locking lockscope, // @@ -36,6 +40,19 @@ public enum DavXmlElement implements QNamed { final static String WEBDAV_NAMESPACE_URI = "DAV:"; final static String WEBDAV_DEFAULT_PREFIX = "D"; + final static Comparator QNAME_COMPARATOR = new Comparator() { + + @Override + public int compare(QName qn1, QName qn2) { + if (Objects.equals(qn1.getNamespaceURI(), qn2.getNamespaceURI())) {// same namespace + return qn1.getLocalPart().compareTo(qn2.getLocalPart()); + } else { + return qn1.getNamespaceURI().compareTo(qn2.getNamespaceURI()); + } + } + + }; + // private final QName value; // // private DavXmlElement() { @@ -71,7 +88,7 @@ public enum DavXmlElement implements QNamed { return; } startElement(xsWriter); - xsWriter.writeCData(value); + xsWriter.writeCharacters(value); xsWriter.writeEndElement(); }