Checking in Michael Smith's patch to fix Xalan2 compile.

diff --git a/xsl/extensions/xalan2/com/nwalsh/xalan/FormatCallout.java b/xsl/extensions/xalan2/com/nwalsh/xalan/FormatCallout.java
index aa5cf17010e38761341b808b5b4c91a3a64dfcee..4d91366af5db0ab267d10ab1f014ed0b19106d04 100644 (file)
--- a/xsl/extensions/xalan2/com/nwalsh/xalan/FormatCallout.java
+++ b/xsl/extensions/xalan2/com/nwalsh/xalan/FormatCallout.java
@@ -3,9 +3,7 @@ package com.nwalsh.xalan;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 import org.w3c.dom.*;
-import org.apache.xml.utils.DOMHelper;
 import org.apache.xml.utils.DOMBuilder;
-import org.apache.xml.utils.AttList;
 import com.nwalsh.xalan.Callout;
 
 /**
@@ -33,29 +31,24 @@ public abstract class FormatCallout {
   protected static final String foURI = "http://www.w3.org/1999/XSL/Format";
   protected static final String xhURI = "http://www.w3.org/1999/xhtml";
   protected boolean stylesheetFO = false;
-  protected DOMHelper dh = null;
 
   public FormatCallout() {
     //nop;
   }
 
   public String areaLabel(Element area) {
-    NamedNodeMap domAttr = area.getAttributes();
-    AttList attr = new AttList(domAttr, dh);
     String label = null;
 
-    if (attr.getValue("label") != null) {
+    if (area.getAttribute("label") != null) {
       // If this area has a label, use it
-      label = attr.getValue("label");
+      label = area.getAttribute("label");
     } else {
       // Otherwise, if its parent is an areaset and it has a label, use that
       Element parent = (Element) area.getParentNode();
-      NamedNodeMap pdomAttr = parent.getAttributes();
-      AttList pAttr = new AttList(pdomAttr, dh);
       if (parent != null
          && parent.getNodeName().equals("areaset")
-         && pAttr.getValue("label") != null) {
-       label = pAttr.getValue("label");
+         && parent.getAttribute("label") != null) {
+       label = parent.getAttribute("label");
       }
     }