You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by bl...@apache.org on 2003/10/22 20:08:10 UTC

cvs commit: cocoon-2.2/src/java/org/apache/cocoon/sitemap ContentAggregator.java NotifyingGenerator.java

bloritsch    2003/10/22 11:08:10

  Modified:    src/java/org/apache/cocoon/sitemap ContentAggregator.java
                        NotifyingGenerator.java
  Log:
  Update the sitemap core to be resettable/serviceable
  
  Revision  Changes    Path
  1.5       +5 -5      cocoon-2.2/src/java/org/apache/cocoon/sitemap/ContentAggregator.java
  
  Index: ContentAggregator.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/sitemap/ContentAggregator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ContentAggregator.java	5 Sep 2003 11:40:41 -0000	1.4
  +++ ContentAggregator.java	22 Oct 2003 18:08:10 -0000	1.5
  @@ -106,7 +106,7 @@
   
       /** The component manager */
       protected ServiceManager manager;
  -    
  +
       /** This object holds the part parts :) */
       protected final class Part {
           public String uri;
  @@ -290,8 +290,8 @@
       /**
        * Recycle the producer by removing references
        */
  -    public void recycle() {
  -        super.recycle();
  +    public void reset() {
  +        super.reset();
           this.rootElement = null;
           for(int i=0; i<this.parts.size();i++) {
               final Part current = (Part)this.parts.get(i);
  @@ -396,7 +396,7 @@
               this.contentHandler.endElement(namespaceURI, localName, raw);
           }
       }
  -    
  +
       /* (non-Javadoc)
        * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
        */
  
  
  
  1.3       +4 -4      cocoon-2.2/src/java/org/apache/cocoon/sitemap/NotifyingGenerator.java
  
  Index: NotifyingGenerator.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/sitemap/NotifyingGenerator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NotifyingGenerator.java	5 Sep 2003 11:40:41 -0000	1.2
  +++ NotifyingGenerator.java	22 Oct 2003 18:08:10 -0000	1.3
  @@ -72,7 +72,7 @@
    * @version CVS $Id$
    */
   public class NotifyingGenerator extends AbstractGenerator {
  -    
  +
       /**
        * The <code>Notification</code> to report.
        */
  @@ -103,8 +103,8 @@
       /**
        * Recycle
        */
  -    public void recycle() {
  -        super.recycle();
  +    public void reset() {
  +        super.reset();
           this.notification = null;
       }
   }