--- /home/cpdev/src/classpath/gnu/xml/xpath/NameTest.java	2005-07-10 05:32:35.000000000 +0000
+++ gnu/xml/xpath/NameTest.java	2005-06-30 05:34:23.000000000 +0000
@@ -95,9 +95,7 @@
         return true;
       }
     String uri = qName.getNamespaceURI();
-    String nodeUri = node.getNamespaceURI();
-    String nodeLocalName = node.getLocalName();
-    if (nodeLocalName != null && !equal(uri, nodeUri))
+    if (!equal(uri, node.getNamespaceURI()))
       {
         return false;
       }
@@ -106,11 +104,7 @@
         return true;
       }
     String localName = qName.getLocalPart();
-    if (nodeLocalName != null)
-      {
-        nodeLocalName = node.getNodeName();
-      }
-    return (localName.equals(nodeLocalName));
+    return (localName.equals(node.getLocalName()));
   }
 
   final boolean equal(String s1, String s2)
@@ -125,11 +119,6 @@
     return new NameTest(qName, anyLocalName, any);
   }
 
-  public boolean references(QName var)
-  {
-    return false;
-  }
-
   public String toString ()
   {
     if (any)