Return-Path: 
 <cvs-return-21561-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 80285 invoked from network); 31 Dec 2004 10:18:42 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 31 Dec 2004 10:18:42 -0000
Received: (qmail 46607 invoked by uid 500); 31 Dec 2004 10:18:41 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 46553 invoked by uid 500); 31 Dec 2004 10:18:41 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
list-post: <mailto:cvs@cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 46540 invoked by uid 99); 31 Dec 2004 10:18:41 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Fri, 31 Dec 2004 02:18:41 -0800
Received: (qmail 80242 invoked by uid 65534); 31 Dec 2004 10:18:39 -0000
Date: 31 Dec 2004 10:18:39 -0000
Message-ID: <20041231101839.80240.qmail@minotaur.apache.org>
From: antonio@apache.org
To: cvs@cocoon.apache.org
Subject: svn commit: r123779 -
 /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/pipeline/impl/CachingPointProcessingPipeline.java
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: antonio
Date: Fri Dec 31 02:18:38 2004
New Revision: 123779

URL: http://svn.apache.org/viewcvs?view=rev&rev=123779
Log:
Don't create a new Boolean + Use BooleanUtils +  formatting
Modified:
   cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/pipeline/impl/CachingPointProcessingPipeline.java

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/pipeline/impl/CachingPointProcessingPipeline.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/pipeline/impl/CachingPointProcessingPipeline.java?view=diff&rev=123779&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/pipeline/impl/CachingPointProcessingPipeline.java&r1=123778&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/pipeline/impl/CachingPointProcessingPipeline.java&r2=123779
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/pipeline/impl/CachingPointProcessingPipeline.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/pipeline/impl/CachingPointProcessingPipeline.java	Fri Dec 31 02:18:38 2004
@@ -28,6 +28,7 @@
 import org.apache.cocoon.environment.Environment;
 import org.apache.cocoon.xml.XMLConsumer;
 import org.apache.cocoon.xml.XMLProducer;
+import org.apache.commons.lang.BooleanUtils;
 import org.apache.excalibur.source.SourceValidity;
 
 import java.io.OutputStream;
@@ -52,7 +53,6 @@
     protected String autoCachingPointSwitch;
     protected boolean autoCachingPoint = true;
 
-
    /**
     * The <code>CachingPointProcessingPipeline</code> is configurable.
     * The autoCachingPoint algorithm can be switced on/off
@@ -67,15 +67,10 @@
         }
 
         // Default is that auto caching-point is on
-        if (this.autoCachingPointSwitch == null){
-            this.autoCachingPoint=true;
-            return;
-        }
-
-        if (this.autoCachingPointSwitch.toLowerCase().equals("on")) {
+        if (this.autoCachingPointSwitch == null) {
             this.autoCachingPoint=true;
         } else {
-            this.autoCachingPoint=false;
+            this.autoCachingPoint = BooleanUtils.toBoolean(this.autoCachingPointSwitch);
         }
     }
 
@@ -102,12 +97,9 @@
 
         // if this generator is manually set to "caching-point" (via pipeline-hint)
         // then ensure the next component is caching.
-        if ( "true".equals(pipelinehint)) {
-            this.nextIsCachePoint=true;
-        }
+        this.nextIsCachePoint = BooleanUtils.toBoolean(pipelinehint);
     }
 
-
     /**
      * Add a transformer.
      */
@@ -131,17 +123,13 @@
 
         // add caching point flag
         // default value is false
-        this.isCachePoint.add(new Boolean(this.nextIsCachePoint));
-        this.nextIsCachePoint = false;
+        this.isCachePoint.add(BooleanUtils.toBooleanObject(this.nextIsCachePoint));
 
         // if this transformer is manually set to "caching-point" (via pipeline-hint)
         // then ensure the next component is caching.
-        if ( "true".equals(pipelinehint)) {
-            this.nextIsCachePoint=true;
-        }
+        this.nextIsCachePoint = BooleanUtils.toBoolean(pipelinehint);
     }
 
-
     /**
      * Determine if the given branch-point
      * is a caching-point
@@ -150,27 +138,21 @@
      * and is of no consequence when auto caching-point is switched off
      */
     public void informBranchPoint() {
-
-        if (this.generator == null) {
-            return;
-        }
-        if (!this.autoCachingPoint) {
-            return;
-        }
-
-        this.nextIsCachePoint = true;
-        if (this.getLogger().isDebugEnabled()) {
-            this.getLogger().debug("Informed Pipeline of branch point");
+        if (this.autoCachingPoint && this.generator != null) {
+            this.nextIsCachePoint = true;
+            if (this.getLogger().isDebugEnabled()) {
+                this.getLogger().debug("Informed Pipeline of branch point");
+            }
         }
     }
 
     /**
      * Cache longest cacheable path plus cache points.
      */
-    protected void cacheResults(Environment environment, OutputStream os)  throws Exception {
+    protected void cacheResults(Environment environment, OutputStream os) throws Exception {
 
         if (this.toCacheKey != null) {
-            if ( this.cacheCompleteResponse ) {
+            if (this.cacheCompleteResponse) {
                 if (this.getLogger().isDebugEnabled()) {
                     this.getLogger().debug("Cached: caching complete response; pSisze"
                                            + this.toCacheKey.size() + " Key " + this.toCacheKey);
@@ -178,8 +160,7 @@
                 CachedResponse response = new CachedResponse(this.toCacheSourceValidities,
                                           ((CachingOutputStream)os).getContent());
                 response.setContentType(environment.getContentType());
-                this.cache.store(this.toCacheKey.copy(),
-                                 response);
+                this.cache.store(this.toCacheKey.copy(), response);
                 //
                 // Scan back along the pipelineCacheKey for
                 // for any cachepoint(s)
@@ -192,22 +173,20 @@
                 //
                 // REVISIT: Is it enough to simply reduce the length of the validities array?
                 //
-                if (this.toCacheKey.size()>0) {
+                if (this.toCacheKey.size() > 0) {
                     SourceValidity[] copy = new SourceValidity[this.toCacheKey.size()];
-                    System.arraycopy(this.toCacheSourceValidities, 0,
-                                     copy, 0, copy.length);
+                    System.arraycopy(this.toCacheSourceValidities, 0, copy, 0, copy.length);
                     this.toCacheSourceValidities = copy;
                 }
             }
 
-            if (this.toCacheKey.size()>0) {
+            if (this.toCacheKey.size() > 0) {
                 ListIterator itt = this.xmlSerializerArray.listIterator(this.xmlSerializerArray.size());
                 while (itt.hasPrevious()) {
                     XMLSerializer serializer = (XMLSerializer) itt.previous();
                     CachedResponse response = new CachedResponse(this.toCacheSourceValidities,
                                               (byte[])serializer.getSAXFragment());
-                    this.cache.store(this.toCacheKey.copy(),
-                                     response);
+                    this.cache.store(this.toCacheKey.copy(), response);
 
                     if (this.getLogger().isDebugEnabled()) {
                         this.getLogger().debug("Caching results for the following key: "
@@ -226,11 +205,9 @@
                     // re-calculate validities array
                     //
                     SourceValidity[] copy = new SourceValidity[this.toCacheKey.size()];
-                    System.arraycopy(this.toCacheSourceValidities, 0,
-                                     copy, 0, copy.length);
+                    System.arraycopy(this.toCacheSourceValidities, 0, copy, 0, copy.length);
                     this.toCacheSourceValidities = copy;
                 } //end serializer loop
-
             }
         }
     }
@@ -248,11 +225,9 @@
         } else if (type == ComponentCacheKey.ComponentType_Serializer) {
             cachePoint = this.nextIsCachePoint;
         }
-
         return new ComponentCacheKey(type, role, key, cachePoint);
     }
 
-
     /**
      * Connect the caching point pipeline.
      */
@@ -274,13 +249,13 @@
                     int currentTransformerIndex = 0; //start with the first transformer
 
                     Iterator itt = this.transformers.iterator();
-                    while ( itt.hasNext() ) {
+                    while (itt.hasNext()) {
                         next = (XMLConsumer) itt.next();
 
                         // if we have cacheable transformers,
                         // check the tranformers for cachepoints
                         if (cacheableTransformerCount > 0) {
-                            if ( (this.isCachePoint.get(currentTransformerIndex) != null)  &&
+                            if ((this.isCachePoint.get(currentTransformerIndex) != null)  &&
                                     ((Boolean)this.isCachePoint.get(currentTransformerIndex)).booleanValue()) {
 
                                 cachePointXMLSerializer = ((XMLSerializer)
@@ -290,7 +265,6 @@
                             }
                         }
 
-
                         // Serializer is not cacheable,
                         // but we  have the longest cacheable key. Do default longest key caching
                         if (localXMLSerializer != null) {
@@ -309,7 +283,6 @@
                     }
                     next = super.lastConsumer;
 
-
                     // if the serializer is not cacheable, but all the transformers are:
                     // (this is default longest key caching)
                     if (localXMLSerializer != null) {
@@ -326,8 +299,6 @@
                         this.xmlSerializerArray.add(cachePointXMLSerializer);
                     }
                     this.connect(environment, prev, next);
-
-
                 } else {
                     // Here the first part of the pipeline has been retrived from cache
                     // we now check if any part of the rest of the pipeline can be cached
@@ -337,7 +308,7 @@
                     XMLConsumer next;
                     int cacheableTransformerCount = 0;
                     Iterator itt = this.transformers.iterator();
-                    while ( itt.hasNext() ) {
+                    while (itt.hasNext()) {
                         next = (XMLConsumer) itt.next();
 
                         if (cacheableTransformerCount >= this.firstProcessedTransformerIndex) {
@@ -345,7 +316,7 @@
                             // if we have cacheable transformers left,
                             // then check the tranformers for cachepoints
                             if (cacheableTransformerCount < this.firstNotCacheableTransformerIndex) {
-                                if ( !(prev instanceof XMLDeserializer) &&
+                                if (!(prev instanceof XMLDeserializer) &&
                                         (this.isCachePoint.get(cacheableTransformerCount) != null)  &&
                                         ((Boolean)this.isCachePoint.get(cacheableTransformerCount)).booleanValue()) {
                                     cachePointXMLSerializer = ((XMLSerializer)this.manager.lookup( XMLSerializer.ROLE ));
@@ -374,7 +345,6 @@
                         next = new XMLTeePipe(next, localXMLSerializer);
                         this.xmlSerializerArray.add(localXMLSerializer);
                         localXMLSerializer = null;
-
             }
             //	else the serializer is cacheable but has views
             else if (this.nextIsCachePoint && !(prev instanceof XMLDeserializer) &&
@@ -386,12 +356,11 @@
                     this.connect(environment, prev, next);
                 }
 
-            } catch ( ComponentException e ) {
+            } catch (ComponentException e) {
                 throw new ProcessingException("Could not connect pipeline.", e);
             }
     }
 
-
     /**
      * Recyclable Interface
      */
@@ -407,5 +376,4 @@
         this.nextIsCachePoint = false;
         this.autoCachingPointSwitch=null;
     }
-
 }