Rename XMLChar as XML10Char

Author: afs

jena-cmds/src/main/java/jena/schemagen.java

@@ -42,7 +42,7 @@
 import org.apache.jena.riot.RDFFormat;
 import org.apache.jena.riot.RDFWriter;
 import org.apache.jena.shared.JenaException;
-import org.apache.jena.util.XMLChar;
+import org.apache.jena.util.XML10Char;
 import org.apache.jena.util.iterator.ExtendedIterator;
 import org.apache.jena.util.iterator.WrappedIterator;
 import org.apache.jena.vocabulary.OWL;
@@ -800,7 +800,7 @@ protected String getOntologyElementNamespace() {
 
             // ensure ends with namespace separator char
             char ch = uri.charAt( uri.length() - 1 );
-            boolean endsWithNCNameCh = XMLChar.isNCName( ch );
+            boolean endsWithNCNameCh = XML10Char.isNCName( ch );
             uri = endsWithNCNameCh ? uri + "#" : uri;
 
             // check for ambiguous answers

jena-core/src/main/java/org/apache/jena/rdfxml/arp1/JenaHandler.java

@@ -25,7 +25,7 @@
 import org.apache.jena.rdfxml.arp1.impl.ARPSaxErrorHandler;
 import org.apache.jena.shared.JenaException ;
 import org.apache.jena.shared.PrefixMapping ;
-import org.apache.jena.util.XMLChar;
+import org.apache.jena.util.XML10Char;
 
 /**
  * Interface between Jena and ARP.
@@ -96,7 +96,7 @@ static boolean isNiceURI(String uri) {
         if ( uri.equals("") )
             return false;
         char last = uri.charAt(uri.length() - 1);
-        return !XMLChar.isNCName(last);
+        return !XML10Char.isNCName(last);
     }
 
     @Override

jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ParserSupport.java

@@ -30,7 +30,7 @@
 import org.apache.jena.irix.IRIx;
 import org.apache.jena.rdfxml.arp1.ARPErrorNumbers;
 import org.apache.jena.util.XML11Char;
-import org.apache.jena.util.XMLChar;
+import org.apache.jena.util.XML10Char;
 import org.xml.sax.SAXParseException ;
 
 public class ParserSupport implements ARPErrorNumbers, Names {
@@ -84,7 +84,7 @@ protected void checkIdSymbol(Taint taintMe, AbsXMLContext ctxt, String str)
 	}
 
 	protected void checkNodeID_XMLName( Taint taintMe, String str) throws SAXParseException {
-	    if ( ! XMLChar.isValidNCName(str) ) {
+	    if ( ! XML10Char.isValidNCName(str) ) {
             warning(taintMe,
                 WARN_BAD_NAME,
                 "Not an XML Name: '" + str + "'");

jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/BaseXMLWriter.java

@@ -38,7 +38,7 @@
 import org.apache.jena.util.CharEncoding ;
 import org.apache.jena.util.FileUtils ;
 import org.apache.jena.util.SystemUtils;
-import org.apache.jena.util.XMLChar;
+import org.apache.jena.util.XML10Char;
 import org.apache.jena.vocabulary.* ;
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
@@ -184,7 +184,7 @@ private String shortAnonId(Resource r)  {
 
 	private String longAnonId(Resource r)  {
 		String rid = r.getId().toString();
-        return XMLChar.isValidNCName( rid ) ? rid : escapedId( rid );
+        return XML10Char.isValidNCName( rid ) ? rid : escapedId( rid );
 	}
 
     /**
@@ -385,7 +385,7 @@ String splitTag(String uriref, int type) {
 
 	String tag( String namespace, String local, int type, boolean localIsQname) {
 		if (type != FAST && type != FASTATTR) {
-			if ((!localIsQname) && !XMLChar.isValidNCName(local))
+			if ((!localIsQname) && !XML10Char.isValidNCName(local))
 				return splitTag(namespace + local, type);
 			if (namespace.equals(RDFNS)) {
 				// Description, ID, nodeID, about, aboutEach, aboutEachPrefix, li
@@ -579,7 +579,7 @@ static private String escapedId(String id) {
 		for (int i = 0; i < id.length(); i++) {
 			char ch = id.charAt(i);
 			if (ch != ESCAPE
-				&& (i == 0 ? XMLChar.isNCNameStart(ch) : XMLChar.isNCName(ch))) {
+				&& (i == 0 ? XML10Char.isNCNameStart(ch) : XML10Char.isNCName(ch))) {
 				result.append( ch );
 			} else {
 				escape( result, ch );
@@ -789,7 +789,7 @@ private boolean checkLegalPrefix( String prefix ) {
             return true;
         if (prefix.toLowerCase().startsWith( "xml" ))
             logger.warn( "Namespace prefix '" + prefix + "' is reserved by XML." );
-        else if (!XMLChar.isValidNCName(prefix))
+        else if (!XML10Char.isValidNCName(prefix))
             logger.warn( "'" + prefix + "' is not a legal namespace prefix." );
         else if (jenaNamespace.matcher(prefix).matches())
             logger.warn( "Namespace prefix '" + prefix + "' is reserved by Jena." );

jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/Unparser.java

@@ -127,7 +127,7 @@
 import org.apache.jena.shared.BrokenException ;
 import org.apache.jena.shared.JenaException ;
 import org.apache.jena.shared.PropertyNotFoundException ;
-import org.apache.jena.util.XMLChar;
+import org.apache.jena.util.XML10Char;
 import org.apache.jena.util.iterator.* ;
 import org.apache.jena.vocabulary.RDF ;
 import org.slf4j.Logger ;
@@ -1205,7 +1205,7 @@ private boolean isGenuineAnon(Resource r) {
 
     private boolean isLocalReference(Resource r) {
         return (!r.isAnon()) && getXMLNameSpace(r).equals(outputName + "#")
-                && XMLChar.isValidNCName(getXMLLocalName(r));
+                && XML10Char.isValidNCName(getXMLLocalName(r));
     }
 
     /*

jena-core/src/main/java/org/apache/jena/util/SplitIRI.java

@@ -486,7 +486,7 @@ private static int splitNamespaceXML10(String uri) {
         int i = lg-1;
         for (; i >= 1; i--) {
             ch = uri.charAt(i);
-            if ( !XMLChar.isNCName(ch) )
+            if ( !XML10Char.isNCName(ch) )
                 break;
         }
 
@@ -512,7 +512,7 @@ private static int splitNamespaceXML10(String uri) {
         // The split must start with NCNameStart.
         for (; j < lg; j++) {
             ch = uri.charAt(j);
-            if (XMLChar.isNCNameStart(ch))
+            if (XML10Char.isNCNameStart(ch))
             {
                 // "mailto:" is special.
                 // split "mailto:me" as "mailto:m" and "e" !