cvs commit: xml-xalan/java/src/org/apache/xpath/patterns NodeTest.java

[sboag]

sboag       00/10/17 14:35:04

  Modified:    java/src/org/apache/xpath/patterns NodeTest.java
  Log:
  I think I got in trouble... adding back in use of DOMHelper functions for 
namespace and name.
  
  Revision  Changes    Path
  1.9       +7 -5      
xml-xalan/java/src/org/apache/xpath/patterns/NodeTest.java
  
  Index: NodeTest.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xpath/patterns/NodeTest.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- NodeTest.java     2000/10/17 19:49:41     1.8
  +++ NodeTest.java     2000/10/17 21:35:04     1.9
  @@ -233,10 +233,11 @@
           int isNamespace = (whatToShow & SHOW_NAMESPACE);
           if(0 == isNamespace)
           {
  -          if(!xctxt.getDOMHelper().isNamespaceNode(context))
  +          DOMHelper dh = xctxt.getDOMHelper();
  +          if(!dh.isNamespaceNode(context))
               return (m_isTotallyWild ||
  -                    (subPartMatch(context.getNamespaceURI(), m_namespace) 
  -                    && subPartMatch(context.getLocalName(), m_name))) ?
  +                    (subPartMatch(dh.getNamespaceOfNode(context), 
m_namespace) 
  +                     && subPartMatch(dh.getLocalNameOfNode(context), 
m_name))) ?
                      m_score : SCORE_NONE;
             else
               return SCORE_NONE;
  @@ -256,9 +257,10 @@
         
       case NodeFilter.SHOW_ELEMENT:
         {
  +        DOMHelper dh = xctxt.getDOMHelper();
           return (m_isTotallyWild ||
  -                (subPartMatch(context.getNamespaceURI(), m_namespace) 
  -                && subPartMatch(context.getLocalName(), m_name))) ?
  +                (subPartMatch(dh.getNamespaceOfNode(context), m_namespace) 
  +                && subPartMatch(dh.getLocalNameOfNode(context), m_name))) ?
                  m_score : SCORE_NONE;
         }