cvs commit: cocoon-2.2/src/java/org/apache/cocoon/components/treeprocessor/sitemap PipelinesNodeBuilder.java PipelinesNode.java

[cziegeler]

cziegeler    2003/10/15 14:03:38

  Modified:    src/java/org/apache/cocoon/environment
                        ForwardRedirector.java
               src/java/org/apache/cocoon/components/treeprocessor/sitemap
                        PipelinesNodeBuilder.java PipelinesNode.java
  Log:
  Cleaning up code
  
  Revision  Changes    Path
  1.9       +2 -3      
cocoon-2.2/src/java/org/apache/cocoon/environment/ForwardRedirector.java
  
  Index: ForwardRedirector.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/environment/ForwardRedirector.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ForwardRedirector.java    15 Oct 2003 20:57:43 -0000      1.8
  +++ ForwardRedirector.java    15 Oct 2003 21:03:38 -0000      1.9
  @@ -75,8 +75,7 @@
       /** The <code>Environment to use for redirection (either internal or 
external) */
       private Environment env;
   
  -    public ForwardRedirector(Environment env,
  -                             boolean internal) {
  +    public ForwardRedirector(Environment env) {
           this.env = env;
       }
   
  
  
  
  1.4       +2 -2      
cocoon-2.2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNodeBuilder.java
  
  Index: PipelinesNodeBuilder.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNodeBuilder.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PipelinesNodeBuilder.java 10 Jul 2003 13:17:00 -0000      1.3
  +++ PipelinesNodeBuilder.java 15 Oct 2003 21:03:38 -0000      1.4
  @@ -80,7 +80,7 @@
               this.checkNamespace(child);
               
this.treeBuilder.getProcessor().setComponentConfigurations(child);
           }
  -        PipelinesNode node = new 
PipelinesNode(this.treeBuilder.getProcessor());
  +        PipelinesNode node = new PipelinesNode();
           this.treeBuilder.setupNode(node, config);
   
                Configuration[] childConfigs = config.getChildren();
  
  
  
  1.6       +3 -6      
cocoon-2.2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNode.java
  
  Index: PipelinesNode.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNode.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- PipelinesNode.java        15 Oct 2003 20:57:43 -0000      1.5
  +++ PipelinesNode.java        15 Oct 2003 21:03:38 -0000      1.6
  @@ -56,7 +56,6 @@
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.logger.Logger;
  -import org.apache.cocoon.Processor;
   import org.apache.cocoon.components.treeprocessor.InvokeContext;
   import org.apache.cocoon.components.treeprocessor.ProcessingNode;
   import org.apache.cocoon.components.treeprocessor.SimpleParentProcessingNode;
  @@ -89,8 +88,7 @@
        * Constructor
        * @param processor The processor for this sitemap
        */
  -    public PipelinesNode(Processor processor) {
  -        //this.processor = processor;
  +    public PipelinesNode() {
       }
   
       /**
  @@ -140,8 +138,7 @@
           context.recompose(this.manager);
   
           // Build a redirector
  -        ForwardRedirector redirector = new ForwardRedirector(
  -            env, context.isBuildingPipelineOnly());
  +        ForwardRedirector redirector = new ForwardRedirector(env);
           this.setupLogger(redirector);
   
           Map objectModel = env.getObjectModel();