Fix attribute test

diff --git a/xsl/extensions/saxon642/com/nwalsh/saxon/FormatCallout.java b/xsl/extensions/saxon642/com/nwalsh/saxon/FormatCallout.java
index ed22d1b6fc60ee9b74f768292dd5c4eb6ad36244..256a3b513aeffa798c6a876982356afa7f2b2070 100644 (file)
--- a/xsl/extensions/saxon642/com/nwalsh/saxon/FormatCallout.java
+++ b/xsl/extensions/saxon642/com/nwalsh/saxon/FormatCallout.java
@@ -46,7 +46,7 @@ public abstract class FormatCallout {
   public String areaLabel(Element area) {
     String label = null;
 
-    if (area.getAttribute("label") != null) {
+    if (area.hasAttribute("label")) {
       // If this area has a label, use it
       label = area.getAttribute("label");
     } else {
@@ -54,7 +54,7 @@ public abstract class FormatCallout {
       Element parent = (Element) area.getParentNode();
       if (parent != null
          && parent.getLocalName().equalsIgnoreCase("areaset")
-         && parent.getAttribute("label") != null) {
+         && parent.hasAttribute("label")) {
        label = parent.getAttribute("label");
       }
     }

diff --git a/xsl/extensions/saxon643/com/nwalsh/saxon/FormatCallout.java b/xsl/extensions/saxon643/com/nwalsh/saxon/FormatCallout.java
index ed22d1b6fc60ee9b74f768292dd5c4eb6ad36244..256a3b513aeffa798c6a876982356afa7f2b2070 100644 (file)
--- a/xsl/extensions/saxon643/com/nwalsh/saxon/FormatCallout.java
+++ b/xsl/extensions/saxon643/com/nwalsh/saxon/FormatCallout.java
@@ -46,7 +46,7 @@ public abstract class FormatCallout {
   public String areaLabel(Element area) {
     String label = null;
 
-    if (area.getAttribute("label") != null) {
+    if (area.hasAttribute("label")) {
       // If this area has a label, use it
       label = area.getAttribute("label");
     } else {
@@ -54,7 +54,7 @@ public abstract class FormatCallout {
       Element parent = (Element) area.getParentNode();
       if (parent != null
          && parent.getLocalName().equalsIgnoreCase("areaset")
-         && parent.getAttribute("label") != null) {
+         && parent.hasAttribute("label")) {
        label = parent.getAttribute("label");
       }
     }