X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2FTypesManager.java;h=731c6d5624488d07ac04277471fe815c52489954;hb=4c7e1885b8bf3c93fa0919ace122e3f289a925ea;hp=62335d3617a1cc47d8d22111139a3ac3358d2252;hpb=da9d144b6b241e1526a3bd255dff905a7969a5bc;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/TypesManager.java b/org.argeo.cms/src/org/argeo/cms/acr/TypesManager.java
index 62335d361..731c6d562 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/TypesManager.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/TypesManager.java
@@ -42,6 +42,7 @@ import org.apache.xerces.xs.XSSimpleTypeDefinition;
 import org.apache.xerces.xs.XSTerm;
 import org.apache.xerces.xs.XSTypeDefinition;
 import org.argeo.api.acr.CrAttributeType;
+import org.argeo.api.acr.NamespaceUtils;
 import org.argeo.api.cms.CmsLog;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
@@ -72,13 +73,7 @@ class TypesManager {
 		schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
 
 		// types
-		types = new TreeMap<>((qn1, qn2) -> {
-			if (Objects.equals(qn1.getNamespaceURI(), qn2.getNamespaceURI())) {// same namespace
-				return qn1.getLocalPart().compareTo(qn2.getLocalPart());
-			} else {
-				return qn1.getNamespaceURI().compareTo(qn2.getNamespaceURI());
-			}
-		});
+		types = new TreeMap<>(NamespaceUtils.QNAME_COMPARATOR);
 
 	}