You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by jk...@locus.apache.org on 2000/10/23 17:24:39 UTC

cvs commit: xml-xalan/java/src/org/apache/xpath/axes LocPathIterator.java SelfWalker.java

jkesselm    00/10/23 08:24:39

  Modified:    java/src/org/apache/xpath Expression.java XPath.java
               java/src/org/apache/xpath/axes LocPathIterator.java
                        SelfWalker.java
  Log:
  Serializability clean-up and jarfile generation
  
  Revision  Changes    Path
  1.3       +1 -0      xml-xalan/java/src/org/apache/xpath/Expression.java
  
  Index: Expression.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/Expression.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Expression.java	2000/10/13 02:33:18	1.2
  +++ Expression.java	2000/10/23 15:24:38	1.3
  @@ -9,6 +9,7 @@
   import org.apache.trax.ProcessorException;
   
   public abstract class Expression
  +	implements java.io.Serializable
   {
     protected XPath m_xpath;
     
  
  
  
  1.7       +6 -2      xml-xalan/java/src/org/apache/xpath/XPath.java
  
  Index: XPath.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/XPath.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XPath.java	2000/10/13 02:33:19	1.6
  +++ XPath.java	2000/10/23 15:24:38	1.7
  @@ -118,7 +118,9 @@
     
     public void setLocator(Locator l)
     {
  -    m_locator = l;
  +	// Note potential hazards -- l may not be serializable, or may be changed
  +	  // after being assigned here.
  +	m_locator = l;
     }
     
     String m_patternString;
  @@ -140,8 +142,10 @@
       throws org.xml.sax.SAXException
     {
       // TODO: would like not to clone the locator...
  +	  // but it may not be serializable, and it may be changed after being
  +	  // passed in.
       if(null != locator)
  -      m_locator = new org.xml.sax.helpers.LocatorImpl(locator); 
  +      m_locator = new org.apache.xalan.utils.SerializableLocatorImpl(locator); 
         
       m_patternString = exprString;
       XPathParser parser = new XPathParser();
  
  
  
  1.5       +1 -1      xml-xalan/java/src/org/apache/xpath/axes/LocPathIterator.java
  
  Index: LocPathIterator.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/LocPathIterator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- LocPathIterator.java	2000/10/17 19:40:14	1.4
  +++ LocPathIterator.java	2000/10/23 15:24:39	1.5
  @@ -101,7 +101,7 @@
    * in which case the UnionPathIterator will cache the nodes.</p>
    */
   public class LocPathIterator extends Expression 
  -  implements Cloneable, NodeIterator, ContextNodeList, NodeList
  +implements Cloneable, NodeIterator, ContextNodeList, java.io.Serializable, NodeList
   { 
     /**
      * Create a LocPathIterator object.
  
  
  
  1.2       +1 -0      xml-xalan/java/src/org/apache/xpath/axes/SelfWalker.java
  
  Index: SelfWalker.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/SelfWalker.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SelfWalker.java	2000/07/05 14:45:15	1.1
  +++ SelfWalker.java	2000/10/23 15:24:39	1.2
  @@ -66,6 +66,7 @@
    * @see <a href="http://www.w3.org/TR/xpath#axes">XPath axes descriptions</a>
    */
   public class SelfWalker extends AxesWalker
  +	implements java.io.Serializable
   {
     /**
      * Construct a SelfWalker using a LocPathIterator.