svn commit: r1414172 - in /cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline: AbstractPipeline.java CachingPipeline.java

[il...@apache.org]

Author: ilgrosso
Date: Tue Nov 27 13:16:45 2012
New Revision: 1414172

URL: http://svn.apache.org/viewvc?rev=1414172&view=rev
Log:
White noise again, please ignore

Modified:
    cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/AbstractPipeline.java
    cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/CachingPipeline.java

Modified: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/AbstractPipeline.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/AbstractPipeline.java?rev=1414172&r1=1414171&r2=1414172&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/AbstractPipeline.java (original)
+++ cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/AbstractPipeline.java Tue Nov 27 13:16:45 2012
@@ -41,6 +41,12 @@ public abstract class AbstractPipeline<T
      */
     private static final Logger LOG = LoggerFactory.getLogger(AbstractPipeline.class);
 
+    private static final String ERR_MSG_FIRST_NOT_STARTER =
+            "Cannot execute pipeline, first pipeline component is not starter";
+
+    private static final String ERR_MSG_LAST_NOT_FINISHER =
+            "Cannot execute pipeline, last pipeline component is not finisher";
+
     private final LinkedList<T> components = new LinkedList<T>();
 
     private boolean setupDone;
@@ -98,7 +104,7 @@ public abstract class AbstractPipeline<T
      * @see org.apache.cocoon.pipeline.Pipeline#setConfiguration(java.util.Map)
      */
     @Override
-    public void setConfiguration(Map<String, ? extends Object> parameters) {
+    public void setConfiguration(final Map<String, ? extends Object> parameters) {
         // do nothing
     }
 
@@ -108,7 +114,7 @@ public abstract class AbstractPipeline<T
      * @see org.apache.cocoon.pipeline.Pipeline#setup(java.io.OutputStream, java.util.Map)
      */
     @Override
-    public void setup(OutputStream outputStream) {
+    public void setup(final OutputStream outputStream) {
         this.setup(outputStream, null);
     }
 
@@ -158,17 +164,15 @@ public abstract class AbstractPipeline<T
 
         // first component must be a Starter
         if (!(first instanceof Starter)) {
-            final String msg = "Cannot execute pipeline, first pipeline component is no starter";
-            LOG.error(msg);
-            throw new SetupException(new IllegalStateException(msg));
+            LOG.error(ERR_MSG_FIRST_NOT_STARTER);
+            throw new SetupException(new IllegalStateException(ERR_MSG_FIRST_NOT_STARTER));
         }
 
         // last component must be a Finisher
         final PipelineComponent last = this.components.getLast();
         if (!(last instanceof Finisher)) {
-            final String msg = "Cannot execute pipeline, last pipeline component is no finisher";
-            LOG.error(msg);
-            throw new SetupException(new IllegalStateException(msg));
+            LOG.error(ERR_MSG_LAST_NOT_FINISHER);
+            throw new SetupException(new IllegalStateException(ERR_MSG_LAST_NOT_FINISHER));
         }
 
         // now try to link the components, always two components at a time
@@ -179,7 +183,7 @@ public abstract class AbstractPipeline<T
         // next component to link is the second in the list
         for (final ListIterator<T> itor = this.components.listIterator(1); itor.hasNext();) {
             // link the current with the next component
-            PipelineComponent nextComponent = itor.next();
+            final PipelineComponent nextComponent = itor.next();
             this.linkComponents(currentComponent, nextComponent);
 
             // now advance to the next component

Modified: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/CachingPipeline.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/CachingPipeline.java?rev=1414172&r1=1414171&r2=1414172&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/CachingPipeline.java (original)
+++ cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/CachingPipeline.java Tue Nov 27 13:16:45 2012
@@ -70,12 +70,12 @@ public class CachingPipeline<T extends P
 
         for (PipelineComponent pipelineComponent : this.getComponents()) {
             if (pipelineComponent instanceof CachingPipelineComponent) {
-                final CachingPipelineComponent cachablePipelineComponent = (CachingPipelineComponent) pipelineComponent;
+                final CachingPipelineComponent component = (CachingPipelineComponent) pipelineComponent;
 
-                final CacheKey cacheKey = cachablePipelineComponent.constructCacheKey();
-                if (cacheKey != null) {
-                    result.addCacheKey(cacheKey);
-                    LOG.debug("  ~ adding " + cacheKey + " for component " + pipelineComponent);
+                final CacheKey componentKey = component.constructCacheKey();
+                if (componentKey != null) {
+                    result.addCacheKey(componentKey);
+                    LOG.debug("  ~ adding " + componentKey + " for component " + pipelineComponent);
 
                     continue;
                 }