X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fdav%2FDavXmlElement.java;h=06da6792c1d44b889de57a4653e64e74eccd2483;hb=feddb4be70a8304dd4a533efee6e14c22691b500;hp=b980683999a2b15b38478f3a853037ee393902e7;hpb=1d6840195189cbdbf632ca2800b6179d3b6349df;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 b98068399..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,5 +1,8 @@ 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; @@ -21,6 +24,7 @@ enum DavXmlElement implements QNamed { propname, // include, // propstat, // + status, // // locking lockscope, // @@ -36,6 +40,19 @@ 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 @@ enum DavXmlElement implements QNamed { return; } startElement(xsWriter); - xsWriter.writeCData(value); + xsWriter.writeCharacters(value); xsWriter.writeEndElement(); }