Improve ACR

[lgpl/argeo-commons.git] / org.argeo.api.acr / src / org / argeo / api / acr / NamespaceUtils.java

diff --git a/org.argeo.api.acr/src/org/argeo/api/acr/NamespaceUtils.java b/org.argeo.api.acr/src/org/argeo/api/acr/NamespaceUtils.java
index a1b4062aa3e4277e5b47606d81a2d992a1766b7f..df582868b349798da88d124264d5f846c432feec 100644 (file)
--- a/org.argeo.api.acr/src/org/argeo/api/acr/NamespaceUtils.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/NamespaceUtils.java
@@ -1,6 +1,7 @@
 package org.argeo.api.acr;
 
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.Objects;
 import java.util.Set;
@@ -12,6 +13,10 @@ import javax.xml.namespace.QName;
 
 public class NamespaceUtils {
 
+       public static ContentName parsePrefixedName(String nameWithPrefix) {
+               return parsePrefixedName(RuntimeNamespaceContext.getNamespaceContext(), nameWithPrefix);
+       }
+
        public static ContentName parsePrefixedName(NamespaceContext nameSpaceContext, String nameWithPrefix) {
                Objects.requireNonNull(nameWithPrefix, "Name cannot be null");
                if (nameWithPrefix.charAt(0) == '{') {
@@ -30,6 +35,10 @@ public class NamespaceUtils {
                return new ContentName(namespaceURI, localName, prefix);
        }
 
+       public static String toPrefixedName(QName name) {
+               return toPrefixedName(RuntimeNamespaceContext.getNamespaceContext(), name);
+       }
+
        public static String toPrefixedName(NamespaceContext nameSpaceContext, QName name) {
                if (XMLConstants.NULL_NS_URI.equals(name.getNamespaceURI()))
                        return name.getLocalPart();
@@ -39,8 +48,32 @@ public class NamespaceUtils {
                return prefix + ":" + name.getLocalPart();
        }
 
-       /** singleton */
-       private NamespaceUtils() {
+       public final static Comparator<QName> QNAME_COMPARATOR = new Comparator<QName>() {
+
+               @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());
+                       }
+               }
+
+       };
+
+       public static boolean hasNamespace(QName qName) {
+               return !qName.getNamespaceURI().equals(XMLConstants.NULL_NS_URI);
+       }
+
+       public static void checkNoPrefix(String unqualified) {
+               if (unqualified.indexOf(':') >= 0)
+                       throw new IllegalArgumentException("Name " + unqualified + " has a prefix");
+       }
+
+       public static QName unqualified(String name) {
+               checkNoPrefix(name);
+               return new ContentName(XMLConstants.NULL_NS_URI, name, XMLConstants.DEFAULT_NS_PREFIX);
+
        }
 
        /*
@@ -105,4 +138,8 @@ public class NamespaceUtils {
                return prefixes.iterator();
        }
 
+       /** singleton */
+       private NamespaceUtils() {
+       }
+
 }