Updates for Saxon 6.3 API

diff --git a/xsl/extensions/saxon63/com/nwalsh/saxon/CalloutEmitter.java b/xsl/extensions/saxon63/com/nwalsh/saxon/CalloutEmitter.java
index 693c6e8632f6bac28e51ec07cf79797d3fbd8477..8da0da2d7bfc57aa160d6162c0ba231c82dba0d5 100644 (file)
--- a/xsl/extensions/saxon63/com/nwalsh/saxon/CalloutEmitter.java
+++ b/xsl/extensions/saxon63/com/nwalsh/saxon/CalloutEmitter.java
@@ -5,14 +5,12 @@ import java.util.StringTokenizer;
 import org.xml.sax.*;
 import org.w3c.dom.*;
 import javax.xml.transform.TransformerException;
-import com.icl.saxon.Builder;
 import com.icl.saxon.Context;
 import com.icl.saxon.expr.*;
 import com.icl.saxon.functions.Extensions;
 import com.icl.saxon.om.*;
 import com.icl.saxon.output.*;
 import com.icl.saxon.pattern.*;
-import com.icl.saxon.tinytree.TinyBuilder;
 import com.icl.saxon.tree.*;
 
 /**
@@ -121,7 +119,7 @@ public class CalloutEmitter extends CopyEmitter {
    * @param areaspecNodeSet The source document <areaspec> element.
    *
    */
-  public void setupCallouts (NodeSetIntent areaspecNodeSet) {
+  public void setupCallouts (NodeList areaspecNodeList) {
     callout = new Callout[10];
     calloutCount = 0;
     calloutPos = 0;
@@ -138,45 +136,41 @@ public class CalloutEmitter extends CopyEmitter {
     //  <area id="ex.plco.ret" coords="12"/>
     //  <area id="ex.plco.dest" coords="12"/>
     //  </areaspec>
-    try {
-      int pos = 0;
-      int coNum = 0;
-      boolean inAreaSet = false;
-      NodeInfo areaspec = areaspecNodeSet.getFirst();
-      NodeInfo children[] = areaspec.getAllChildNodes();
-
-      for (int count = 0; count < children.length; count++) {
-       NodeInfo node = children[count];
-       if (node.getNodeType() == NodeInfo.ELEMENT) {
-         if (node.getNodeName().equalsIgnoreCase("areaset")) {
-           coNum++;
-           NodeInfo areas[] = node.getAllChildNodes();
-           for (int acount = 0; acount < areas.length; acount++) {
-             NodeInfo area = areas[acount];
-             if (area.getNodeType() == NodeInfo.ELEMENT) {
-               if (area.getNodeName().equalsIgnoreCase("area")) {
-                 addCallout(coNum, area, defaultColumn);
-               } else {
-                 System.out.println("Unexpected element in areaset: "
-                                    + area.getNodeName());
-               }
+    int pos = 0;
+    int coNum = 0;
+    boolean inAreaSet = false;
+    Node areaspec = areaspecNodeList.item(0);
+    NodeList children = areaspec.getChildNodes();
+
+    for (int count = 0; count < children.getLength(); count++) {
+      Node node = children.item(count);
+      if (node.getNodeType() == Node.ELEMENT_NODE) {
+       if (node.getNodeName().equalsIgnoreCase("areaset")) {
+         coNum++;
+         NodeList areas = node.getChildNodes();
+         for (int acount = 0; acount < areas.getLength(); acount++) {
+           Node area = areas.item(acount);
+           if (area.getNodeType() == Node.ELEMENT_NODE) {
+             if (area.getNodeName().equalsIgnoreCase("area")) {
+               addCallout(coNum, area, defaultColumn);
+             } else {
+               System.out.println("Unexpected element in areaset: "
+                                  + area.getNodeName());
              }
            }
-         } else if (node.getNodeName().equalsIgnoreCase("area")) {
-           coNum++;
-           addCallout(coNum, node, defaultColumn);
-         } else {
-           System.out.println("Unexpected element in areaspec: "
-                              + node.getNodeName());
          }
+       } else if (node.getNodeName().equalsIgnoreCase("area")) {
+         coNum++;
+         addCallout(coNum, node, defaultColumn);
+       } else {
+         System.out.println("Unexpected element in areaspec: "
+                            + node.getNodeName());
        }
       }
-
-      // Now sort them
-      java.util.Arrays.sort(callout, 0, calloutCount);
-    } catch (TransformerException e) {
-      //nop;
     }
+
+    // Now sort them
+    java.util.Arrays.sort(callout, 0, calloutCount);
   }
 
   /** Process characters. */
@@ -296,7 +290,7 @@ public class CalloutEmitter extends CopyEmitter {
    * @param defaultColumn The default column for callouts.
    */
   protected void addCallout (int coNum,
-                            NodeInfo node,
+                            Node node,
                             int defaultColumn) {
 
     ElementInfo area = (ElementInfo) node;

diff --git a/xsl/extensions/saxon63/com/nwalsh/saxon/ColumnScanEmitter.java b/xsl/extensions/saxon63/com/nwalsh/saxon/ColumnScanEmitter.java
index 0b7c3c99ab6a6d27836cccb3e094a501f2788586..0b96f8bed1a4e2b3ebf2c08fd5c4bf60ed9600aa 100644 (file)
--- a/xsl/extensions/saxon63/com/nwalsh/saxon/ColumnScanEmitter.java
+++ b/xsl/extensions/saxon63/com/nwalsh/saxon/ColumnScanEmitter.java
@@ -4,9 +4,7 @@ import org.xml.sax.*;
 import javax.xml.transform.TransformerException;
 import com.icl.saxon.output.*;
 import com.icl.saxon.om.*;
-import com.icl.saxon.tinytree.TinyBuilder;
 import com.icl.saxon.expr.FragmentValue;
-import com.icl.saxon.Builder;
 
 /**
  * <p>Saxon extension to scan the column widthsin a result tree fragment.</p>

diff --git a/xsl/extensions/saxon63/com/nwalsh/saxon/ColumnUpdateEmitter.java b/xsl/extensions/saxon63/com/nwalsh/saxon/ColumnUpdateEmitter.java
index 99b43c8c1c1793bdd6bdb32386e0fd41273a1372..91290e819b541e3019d2d9790fab3c32febad976 100644 (file)
--- a/xsl/extensions/saxon63/com/nwalsh/saxon/ColumnUpdateEmitter.java
+++ b/xsl/extensions/saxon63/com/nwalsh/saxon/ColumnUpdateEmitter.java
@@ -4,9 +4,7 @@ import org.xml.sax.*;
 import com.icl.saxon.output.*;
 import com.icl.saxon.om.*;
 import javax.xml.transform.TransformerException;
-import com.icl.saxon.tinytree.TinyBuilder;
 import com.icl.saxon.expr.FragmentValue;
-import com.icl.saxon.Builder;
 import com.icl.saxon.tree.AttributeCollection;
 
 /**

diff --git a/xsl/extensions/saxon63/com/nwalsh/saxon/CopyEmitter.java b/xsl/extensions/saxon63/com/nwalsh/saxon/CopyEmitter.java
index ee15c9b65aabe9b887da548ae9583be0f8e37c78..66b30d19a0ce730dd269e393e3381d3ee95c5d83 100644 (file)
--- a/xsl/extensions/saxon63/com/nwalsh/saxon/CopyEmitter.java
+++ b/xsl/extensions/saxon63/com/nwalsh/saxon/CopyEmitter.java
@@ -5,14 +5,12 @@ import java.util.StringTokenizer;
 import org.xml.sax.*;
 import org.w3c.dom.*;
 import javax.xml.transform.TransformerException;
-import com.icl.saxon.Builder;
 import com.icl.saxon.Context;
 import com.icl.saxon.expr.*;
 import com.icl.saxon.functions.Extensions;
 import com.icl.saxon.om.*;
 import com.icl.saxon.output.*;
 import com.icl.saxon.pattern.*;
-import com.icl.saxon.tinytree.TinyBuilder;
 import com.icl.saxon.tree.*;
 
 /**

diff --git a/xsl/extensions/saxon63/com/nwalsh/saxon/LineCountEmitter.java b/xsl/extensions/saxon63/com/nwalsh/saxon/LineCountEmitter.java
index 99d7b2d5441f5788b60a643e2d8022887c1886d4..5febeda3d80c3e6d2f39c0c673e25ab9b14ea3d8 100644 (file)
--- a/xsl/extensions/saxon63/com/nwalsh/saxon/LineCountEmitter.java
+++ b/xsl/extensions/saxon63/com/nwalsh/saxon/LineCountEmitter.java
@@ -4,9 +4,7 @@ import org.xml.sax.*;
 import javax.xml.transform.TransformerException;
 import com.icl.saxon.output.*;
 import com.icl.saxon.om.*;
-import com.icl.saxon.tinytree.TinyBuilder;
 import com.icl.saxon.expr.FragmentValue;
-import com.icl.saxon.Builder;
 
 /**
  * <p>Saxon extension to count the lines in a result tree fragment.</p>

diff --git a/xsl/extensions/saxon63/com/nwalsh/saxon/NumberLinesEmitter.java b/xsl/extensions/saxon63/com/nwalsh/saxon/NumberLinesEmitter.java
index f8065e37074e227948deab35bad9ac14b1192ce7..d2cc9333c15e468897444e1877453d69b9a468b8 100644 (file)
--- a/xsl/extensions/saxon63/com/nwalsh/saxon/NumberLinesEmitter.java
+++ b/xsl/extensions/saxon63/com/nwalsh/saxon/NumberLinesEmitter.java
@@ -8,9 +8,7 @@ import javax.xml.transform.TransformerException;
 import com.icl.saxon.output.*;
 import com.icl.saxon.om.*;
 import com.icl.saxon.tree.AttributeCollection;
-import com.icl.saxon.tinytree.TinyBuilder;
 import com.icl.saxon.expr.FragmentValue;
-import com.icl.saxon.Builder;
 
 /**
  * <p>Saxon extension to decorate a result tree fragment with line numbers.</p>

diff --git a/xsl/extensions/saxon63/com/nwalsh/saxon/Verbatim.java b/xsl/extensions/saxon63/com/nwalsh/saxon/Verbatim.java
index 5823d88b7c11cd724a4d3ffebf3a38d27d3a530c..8c08809251d83878bbc90649b78047e40e889e3d 100644 (file)
--- a/xsl/extensions/saxon63/com/nwalsh/saxon/Verbatim.java
+++ b/xsl/extensions/saxon63/com/nwalsh/saxon/Verbatim.java
@@ -220,8 +220,10 @@ public class Verbatim {
    *
    * @return The modified result tree fragment.
    */
-  public static FragmentValue numberLines (Context context,
-                                          FragmentValue rtf) {
+  public static NodeSetValue numberLines (Context context,
+                                         NodeSetValue rtf_ns) {
+
+    FragmentValue rtf = (FragmentValue) rtf_ns;
 
     setupLineNumbering(context);
 
@@ -434,9 +436,11 @@ public class Verbatim {
    * @return The modified result tree fragment.
    */
 
-  public static FragmentValue insertCallouts (Context context,
-                                             NodeSetIntent areaspecNodeSet,
-                                             FragmentValue rtf) {
+  public static NodeSetValue insertCallouts (Context context,
+                                            NodeList areaspecNodeList,
+                                            NodeSetValue rtf_ns) {
+
+    FragmentValue rtf = (FragmentValue) rtf_ns;
 
     setupCallouts(context);
 
@@ -446,7 +450,7 @@ public class Verbatim {
                                                   defaultColumn,
                                                   foStylesheet,
                                                   fCallout);
-      cEmitter.setupCallouts(areaspecNodeSet);
+      cEmitter.setupCallouts(areaspecNodeList);
       rtf.replay(cEmitter);
       return cEmitter.getResultTreeFragment();
     } catch (TransformerException e) {