You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by dl...@apache.org on 2002/06/18 17:31:02 UTC

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

dleslie     2002/06/18 08:31:02

  Modified:    java/src/org/apache/xpath/objects XRTreeFrag.java
  Added:       java/src/org/apache/xpath/axes RTFIterator.java
  Log:
  Added RTFIterator (extends OneStepIteratorForward);
  created fromRTFFragment so EXSLT object-type function
  can identify an RTF with certainty.
  
  Revision  Changes    Path
  1.1                  xml-xalan/java/src/org/apache/xpath/axes/RTFIterator.java
  
  Index: RTFIterator.java
  ===================================================================
  /**
   * <meta name="usage" content="advanced"/>
   * This class implements an RTF Iterator. Currently exists for sole
   * purpose of enabling EXSLT object-type function to return "RTF".
   * 
    */
  package org.apache.xpath.axes;
  
  import javax.xml.transform.TransformerException;
  import org.apache.xpath.compiler.Compiler;
  
  public class RTFIterator extends OneStepIteratorForward {
  
  	/**
  	 * Constructor for RTFIterator
  	 */
  	RTFIterator(Compiler compiler, int opPos, int analysis)
  		throws TransformerException {
  		super(compiler, opPos, analysis);
  	}
  
  	/**
  	 * Constructor for RTFIterator
  	 */
  	public RTFIterator(int axis) {
  		super(axis);
  	}
  
  }
  
  
  
  
  1.24      +9 -2      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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- XRTreeFrag.java	31 May 2002 20:44:02 -0000	1.23
  +++ XRTreeFrag.java	18 Jun 2002 15:31:02 -0000	1.24
  @@ -66,6 +66,9 @@
   import org.apache.xpath.XPathContext;
   import org.w3c.dom.NodeList;
   
  +import org.apache.xml.dtm.Axis;
  +import org.apache.xpath.axes.RTFIterator;
  +
   /**
    * <meta name="usage" content="general"/>
    * This class represents an XPath result tree fragment object, and is capable of
  @@ -337,12 +340,16 @@
   
     /**
      * Cast result object to a DTMIterator.
  -   *
  +   * dml - modified to return an RTFIterator for
  +   * benefit of EXSLT object-type function in 
  +   * {@link org.apache.xalan.lib.ExsltCommon}.
      * @return The document fragment as a DTMIterator
      */
     public DTMIterator asNodeIterator()
     {
  -    return m_xctxt.createDTMIterator(m_dtmRoot);
  +    DTMIterator iter = new RTFIterator(Axis.SELF);
  +    iter.setRoot(m_dtmRoot, m_xctxt);    
  +    return iter;
     }
   
     /**
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org