compatibility with Saxon 9.6.0-7

w3c · Jan 30, 2017 · 21cd661 · 21cd661
1 parent 8cb8970
commit 21cd661
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -159,7 +159,7 @@
         <dependency>
             <groupId>net.sf.saxon</groupId>
             <artifactId>Saxon-HE</artifactId>
-            <version>9.5.1-5</version>
+            <version>9.6.0-7</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/src/main/java/com/adobe/epubcheck/vocab/PrefixDeclarationParser.java b/src/main/java/com/adobe/epubcheck/vocab/PrefixDeclarationParser.java
@@ -9,7 +9,7 @@
 import java.util.List;
 import java.util.Map;
 
-import net.sf.saxon.om.Name10Checker;
+import net.sf.saxon.om.NameChecker;
 
 import com.adobe.epubcheck.api.EPUBLocation;
 import com.adobe.epubcheck.api.Report;
@@ -102,7 +102,7 @@ public static Map<String, String> parsePrefixMappings(String value, Report repor
           {
             // empty prefix
             report.message(MessageId.OPF_004a, location);
-          } else if (!Name10Checker.getInstance().isValidNCName(chars))
+          } else if (!NameChecker.isValidNCName(chars))
           {
             // bad prefix
             report.message(MessageId.OPF_004b, location, chars);

diff --git a/src/main/java/com/adobe/epubcheck/xml/XMLValidator.java b/src/main/java/com/adobe/epubcheck/xml/XMLValidator.java
@@ -56,6 +56,9 @@
 import net.sf.saxon.TransformerFactoryImpl;
 import net.sf.saxon.sxpath.IndependentContext;
 import net.sf.saxon.sxpath.XPathStaticContext;
+import net.sf.saxon.trans.SymbolicName;
+import net.sf.saxon.om.StandardNames;
+
 
 public class XMLValidator
 {
@@ -171,19 +174,22 @@ static public class ExtendedSaxonSchemaReaderFactory extends NewSaxonSchemaReade
     public void initTransformerFactory(TransformerFactory factory)
     {
       super.initTransformerFactory(factory);
+      SymbolicName lineNumberFn = new SymbolicName(StandardNames.XSL_FUNCTION, LineNumberFunction.QNAME, 0);
+      SymbolicName columnNumberFn = new SymbolicName(StandardNames.XSL_FUNCTION, ColumnNumberFunction.QNAME, 0);
+      SymbolicName systemIdFn = new SymbolicName(StandardNames.XSL_FUNCTION, SystemIdFunction.QNAME, 0);
       if (factory instanceof TransformerFactoryImpl)
       {
         Configuration configuration = ((TransformerFactoryImpl) factory).getConfiguration();
         XPathStaticContext xpathContext = new IndependentContext(configuration);
-        if (!xpathContext.getFunctionLibrary().isAvailable(LineNumberFunction.QNAME, -1))
+        if (!xpathContext.getFunctionLibrary().isAvailable(lineNumberFn))
         {
           configuration.registerExtensionFunction(new LineNumberFunction());
         }
-        if (!xpathContext.getFunctionLibrary().isAvailable(ColumnNumberFunction.QNAME, -1))
+        if (!xpathContext.getFunctionLibrary().isAvailable(columnNumberFn))
         {
           configuration.registerExtensionFunction(new ColumnNumberFunction());
         }
-        if (!xpathContext.getFunctionLibrary().isAvailable(SystemIdFunction.QNAME, -1))
+        if (!xpathContext.getFunctionLibrary().isAvailable(systemIdFn))
         {
           configuration.registerExtensionFunction(new SystemIdFunction());
         }

diff --git a/src/main/java/org/idpf/epubcheck/util/saxon/Int64ValueSequence.java b/src/main/java/org/idpf/epubcheck/util/saxon/Int64ValueSequence.java
@@ -21,7 +21,7 @@ public Item head()
   }
 
   @Override
-  public SequenceIterator<? extends Item> iterate() throws
+  public SequenceIterator iterate() throws
       XPathException
   {
     return item.iterate();

diff --git a/src/main/java/org/idpf/epubcheck/util/saxon/SystemIdFunction.java b/src/main/java/org/idpf/epubcheck/util/saxon/SystemIdFunction.java
@@ -94,7 +94,7 @@ public Item head()
     }
 
     @Override
-    public SequenceIterator<? extends Item> iterate() throws
+    public SequenceIterator iterate() throws
         XPathException
     {
       return item.iterate();