From: Bob Stayton <bobs@sagehill.net>
Date: Wed, 1 Sep 2004 20:55:38 +0000 (+0000)
Subject: Checking in Michael Smith's patch to fix Xalan2 compile.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=848d9bf5831c6dcdf0e72dd44f6827da52dca2ee;p=docbook-dsssl

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 aa5cf1701..4d91366af 100644
--- 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");
       }
     }