cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ovi...@apache.org
Subject cvs commit: xml-cocoon2/src/scratchpad/schecoon/src/org/apache/cocoon/components/flow AbstractInterpreter.java
Date Thu, 25 Apr 2002 21:16:41 GMT
ovidiu      02/04/25 14:16:41

  Modified:    src/scratchpad/schecoon/src/org/apache/cocoon/components/flow
                        AbstractInterpreter.java
  Log:
  Remove the setResources() method.
  
  Revision  Changes    Path
  1.9       +5 -13     xml-cocoon2/src/scratchpad/schecoon/src/org/apache/cocoon/components/flow/AbstractInterpreter.java
  
  Index: AbstractInterpreter.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/schecoon/src/org/apache/cocoon/components/flow/AbstractInterpreter.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- AbstractInterpreter.java	19 Apr 2002 06:56:53 -0000	1.8
  +++ AbstractInterpreter.java	25 Apr 2002 21:16:41 -0000	1.9
  @@ -4,7 +4,6 @@
   import java.util.ArrayList;
   import java.util.HashMap;
   import java.util.Iterator;
  -import java.util.Map;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
  @@ -15,12 +14,10 @@
   import org.apache.avalon.framework.thread.ThreadSafe;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.components.source.SourceFactory;
  -import org.apache.cocoon.components.treeprocessor.CategoryNode;
  -import org.apache.cocoon.components.treeprocessor.MapStackResolver;
  -import org.apache.cocoon.components.treeprocessor.ProcessingNode;
   import org.apache.cocoon.components.treeprocessor.sitemap.PipelinesNode;
   import org.apache.cocoon.environment.Context;
   import org.apache.cocoon.environment.Environment;
  +import org.apache.cocoon.environment.ForwardRedirector;
   
   /**
    * Abstract superclass for various scripting languages used by Cocoon
  @@ -67,8 +64,6 @@
      */
     protected long checkTime;
   
  -  protected CategoryNode resources;
  -
     public void compose(ComponentManager manager)
       throws ComponentException
     {
  @@ -96,11 +91,6 @@
       checkTime = time;
     }
   
  -  public void setResources(CategoryNode resources)
  -  {
  -    this.resources = resources;
  -  }
  -
     /**
      * Registers a source file with the interpreter. Using this method
      * an implementation keeps track of all the script files which are
  @@ -217,7 +207,8 @@
       throws Exception
     {
       environment.setAttribute("bean-dict", bizData);
  -    environment.setAttribute("kont", continuation);
  +    if (continuation != null)
  +      environment.setAttribute("kont", continuation);
   
       try {
         PipelinesNode.getRedirector(environment)
  @@ -225,7 +216,8 @@
       }
       finally {
         environment.removeAttribute("bean-dict");
  -      environment.removeAttribute("kont");
  +      if (continuation != null)
  +        environment.removeAttribute("kont");
       }
     }
   }
  
  
  

----------------------------------------------------------------------
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