cvs commit: cocoon-2.2/src/java/org/apache/cocoon/xml AbstractXMLProducer.java ContentHandlerWrapper.java

[bloritsch]

bloritsch    2003/10/22 11:04:23

  Modified:    src/java/org/apache/cocoon/xml/dom DOMBuilder.java
                        DOMStreamer.java
               src/java/org/apache/cocoon/xml AbstractXMLProducer.java
                        ContentHandlerWrapper.java
  Log:
  Update the xml base stuff to be resettable/serviceable
  
  Revision  Changes    Path
  1.2       +3 -3      
cocoon-2.2/src/java/org/apache/cocoon/xml/dom/DOMBuilder.java
  
  Index: DOMBuilder.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/xml/dom/DOMBuilder.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DOMBuilder.java   9 Mar 2003 00:09:48 -0000       1.1
  +++ DOMBuilder.java   22 Oct 2003 18:04:22 -0000      1.2
  @@ -154,8 +154,8 @@
       /**
        * Recycling
        */
  -    public void recycle() {
  -        super.recycle();
  +    public void reset() {
  +        super.reset();
   
           try {
               TransformerHandler handler = factory.newTransformerHandler();
  
  
  
  1.13      +6 -6      
cocoon-2.2/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java
  
  Index: DOMStreamer.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- DOMStreamer.java  15 Oct 2003 16:09:35 -0000      1.12
  +++ DOMStreamer.java  22 Oct 2003 18:04:22 -0000      1.13
  @@ -184,9 +184,9 @@
           this.normalizeNamespaces = normalizeNamespaces;
       }
   
  -    public void recycle() {
  -        defaultDOMStreamer.recycle();
  -        namespaceNormalizingDOMStreamer.recycle();
  +    public void reset() {
  +        defaultDOMStreamer.reset();
  +        namespaceNormalizingDOMStreamer.reset();
           normalizeNamespaces = DEFAULT_NORMALIZE_NAMESPACES;
       }
   
  @@ -220,8 +220,8 @@
           /** Counter used when generating new namespace prefixes. */
           protected int newPrefixCounter = 0;
   
  -        public void recycle() {
  -            super.recycle();
  +        public void reset() {
  +            super.reset();
               currentElementInfo = null;
               newPrefixCounter = 0;
           }
  
  
  
  1.2       +4 -4      
cocoon-2.2/src/java/org/apache/cocoon/xml/AbstractXMLProducer.java
  
  Index: AbstractXMLProducer.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/xml/AbstractXMLProducer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractXMLProducer.java  9 Mar 2003 00:09:45 -0000       1.1
  +++ AbstractXMLProducer.java  22 Oct 2003 18:04:23 -0000      1.2
  @@ -50,8 +50,8 @@
   */
   package org.apache.cocoon.xml;
   
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  +import org.apache.excalibur.mpool.Resettable;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.ext.LexicalHandler;
   
  @@ -65,7 +65,7 @@
    */
   public abstract class AbstractXMLProducer
   extends AbstractLogEnabled
  -implements XMLProducer, Recyclable {
  +implements XMLProducer, Resettable {
   
       /** The <code>XMLConsumer</code> receiving SAX events. */
       protected XMLConsumer xmlConsumer;
  @@ -115,7 +115,7 @@
       /**
        * Recycle the producer by removing references
        */
  -    public void recycle() {
  +    public void reset() {
           this.xmlConsumer = null;
           this.contentHandler = null;
           this.lexicalHandler = null;
  
  
  
  1.2       +4 -4      
cocoon-2.2/src/java/org/apache/cocoon/xml/ContentHandlerWrapper.java
  
  Index: ContentHandlerWrapper.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/xml/ContentHandlerWrapper.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ContentHandlerWrapper.java        9 Mar 2003 00:09:45 -0000       1.1
  +++ ContentHandlerWrapper.java        22 Oct 2003 18:04:23 -0000      1.2
  @@ -50,12 +50,12 @@
   */
   package org.apache.cocoon.xml;
   
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.xml.sax.Attributes;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.Locator;
   import org.xml.sax.SAXException;
   import org.xml.sax.ext.LexicalHandler;
  +import org.apache.excalibur.mpool.Resettable;
   
   /**
    * This class is an utility class &quot;wrapping&quot; around a SAX version 
2.0
  @@ -67,7 +67,7 @@
    *         (Apache Software Foundation, Computer Associates)
    * @version CVS $Id$
    */
  -public class ContentHandlerWrapper extends AbstractXMLConsumer implements 
Recyclable {
  +public class ContentHandlerWrapper extends AbstractXMLConsumer implements 
Resettable {
   
       /** The current <code>ContentHandler</code>. */
       protected ContentHandler contentHandler;
  @@ -124,7 +124,7 @@
           this.lexicalHandler=lexicalHandler;
       }
   
  -    public void recycle () {
  +    public void reset () {
           this.contentHandler = null;
           this.lexicalHandler = null;
       }