cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: xml-cocoon2/src/java/org/apache/cocoon/generation HTMLGenerator.java
Date Wed, 13 Feb 2002 07:07:52 GMT
cziegeler    02/02/12 23:07:52

  Modified:    src/java/org/apache/cocoon/generation HTMLGenerator.java
  Log:
  Minor clean up
  
  Revision  Changes    Path
  1.10      +9 -7      xml-cocoon2/src/java/org/apache/cocoon/generation/HTMLGenerator.java
  
  Index: HTMLGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/HTMLGenerator.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- HTMLGenerator.java	13 Feb 2002 07:06:06 -0000	1.9
  +++ HTMLGenerator.java	13 Feb 2002 07:07:52 -0000	1.10
  @@ -57,7 +57,7 @@
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.Composable;
  +import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.ProcessingException;
  @@ -93,10 +93,10 @@
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
    * @author <a href="mailto:barozzi@nicolaken.com">Nicola Ken Barozzi</a>
  - * @version CVS $Id: HTMLGenerator.java,v 1.9 2002/02/13 07:06:06 cziegeler Exp $
  + * @version CVS $Id: HTMLGenerator.java,v 1.10 2002/02/13 07:07:52 cziegeler Exp $
    */
   public class HTMLGenerator extends ComposerGenerator
  -implements Cacheable, Composable, Disposable {
  +implements Cacheable, Disposable {
   
       /** The  source */
       private Source inputSource;
  @@ -107,7 +107,8 @@
       /** XPath Processor */
       private XPathProcessor processor = null;
   
  -    public void compose(ComponentManager manager) {
  +    public void compose(ComponentManager manager)
  +    throws ComponentException {
           super.compose( manager );
           try {
               this.processor = (XPathProcessor)this.manager.lookup(XPathProcessor.ROLE);
  @@ -272,9 +273,10 @@
           }
       }
   
  -    public void dispose()
  -    {
  -        this.manager.release(this.processor);
  +    public void dispose() {
  +        if (this.manager != null) {
  +            this.manager.release(this.processor);
  +        }
           this.processor = null;
           super.dispose();
       }
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message