cvs commit: xml-xalan/java/src/org/apache/xpath/objects XRTreeFrag.java

[sboag]

sboag       00/10/13 16:42:10

  Modified:    java/src/org/apache/xpath/objects XRTreeFrag.java
  Log:
  Renamed nodeset() function to asNodeIterator, and changed it a bit
  to test for NodeList.
  As per Gary Peskin's note on xalan-dev.
  
  Revision  Changes    Path
  1.4       +7 -3      
xml-xalan/java/src/org/apache/xpath/objects/XRTreeFrag.java
  
  Index: XRTreeFrag.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XRTreeFrag.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XRTreeFrag.java   2000/10/04 07:50:06     1.3
  +++ XRTreeFrag.java   2000/10/13 23:42:09     1.4
  @@ -167,9 +167,8 @@
     /**
      * Cast result object to a nodelist.
      */
  -  public NodeIterator nodeset()
  +  public NodeIterator asNodeIterator()
     {
  -    System.out.println("**m_obj: "+((Object)m_obj).getClass().getName());
       if(m_obj instanceof NodeIterator)
         return (NodeIterator)m_obj;
       else 
  @@ -181,7 +180,12 @@
      */
     public NodeList convertToNodeset()
     {
  -    return ((DocumentFragment)m_obj).getChildNodes();
  +    if(m_obj instanceof DocumentFragment)
  +      return ((DocumentFragment)m_obj).getChildNodes();
  +    else if(m_obj instanceof NodeList)
  +      return (NodeList)m_obj;
  +    else
  +      return null;
     }  
     
     /**