X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.api.acr%2Fsrc%2Forg%2Fargeo%2Fapi%2Facr%2FContentNameSupplier.java;h=f7900afd309114bf5a4ef13d4564e6d71ae5baca;hb=c615307d7b87bcb260d8a9f402c6e0a880862f38;hp=e3c721feff1e5e498f0f7c273c148c989e0703e0;hpb=da848d7b6bcf3e509890bdd42c3c59fba1adbe14;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.api.acr/src/org/argeo/api/acr/ContentNameSupplier.java b/org.argeo.api.acr/src/org/argeo/api/acr/ContentNameSupplier.java
index e3c721fef..f7900afd3 100644
--- a/org.argeo.api.acr/src/org/argeo/api/acr/ContentNameSupplier.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/ContentNameSupplier.java
@@ -45,7 +45,7 @@ public interface ContentNameSupplier extends Supplier<ContentName>, NamespaceCon
 
 	@Override
 	default String getNamespaceURI(String prefix) {
-		String namespaceURI = getStandardNamespaceURI(prefix);
+		String namespaceURI = NamespaceUtils.getStandardNamespaceURI(prefix);
 		if (namespaceURI != null)
 			return namespaceURI;
 		if (prefix.equals(getDefaultPrefix()))
@@ -55,7 +55,7 @@ public interface ContentNameSupplier extends Supplier<ContentName>, NamespaceCon
 
 	@Override
 	default String getPrefix(String namespaceURI) {
-		String prefix = getStandardPrefix(namespaceURI);
+		String prefix = NamespaceUtils.getStandardPrefix(namespaceURI);
 		if (prefix != null)
 			return prefix;
 		if (namespaceURI.equals(getNamespaceURI()))
@@ -65,7 +65,7 @@ public interface ContentNameSupplier extends Supplier<ContentName>, NamespaceCon
 
 	@Override
 	default Iterator<String> getPrefixes(String namespaceURI) {
-		Iterator<String> it = getStandardPrefixes(namespaceURI);
+		Iterator<String> it = NamespaceUtils.getStandardPrefixes(namespaceURI);
 		if (it != null)
 			return it;
 		if (namespaceURI.equals(getNamespaceURI()))
@@ -73,34 +73,4 @@ public interface ContentNameSupplier extends Supplier<ContentName>, NamespaceCon
 		return Collections.emptyIterator();
 	}
 
-	/*
-	 * DEFAULT NAMESPACE CONTEXT OPERATIONS as specified in NamespaceContext
-	 */
-	static String getStandardPrefix(String namespaceURI) {
-		if (namespaceURI == null)
-			throw new IllegalArgumentException("Namespace URI cannot be null");
-		if (XMLConstants.XML_NS_URI.equals(namespaceURI))
-			return XMLConstants.XML_NS_PREFIX;
-		else if (XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(namespaceURI))
-			return XMLConstants.XMLNS_ATTRIBUTE;
-		return null;
-	}
-
-	static Iterator<String> getStandardPrefixes(String namespaceURI) {
-		String prefix = ContentNameSupplier.getStandardPrefix(namespaceURI);
-		if (prefix == null)
-			return null;
-		return Collections.singleton(prefix).iterator();
-	}
-
-	static String getStandardNamespaceURI(String prefix) {
-		if (prefix == null)
-			throw new IllegalArgumentException("Prefix cannot be null");
-		if (XMLConstants.XML_NS_PREFIX.equals(prefix))
-			return XMLConstants.XML_NS_URI;
-		else if (XMLConstants.XMLNS_ATTRIBUTE.equals(prefix))
-			return XMLConstants.XMLNS_ATTRIBUTE_NS_URI;
-		return null;
-	}
-
 }