You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2007/12/23 06:46:25 UTC
svn commit: r606541 - in
/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor:
AbstractParentProcessingNode.java SimpleParentProcessingNode.java
sitemap/MountNode.java sitemap/PipelineNode.java
Author: vgritsenko
Date: Sat Dec 22 21:46:20 2007
New Revision: 606541
URL: http://svn.apache.org/viewvc?rev=606541&view=rev
Log:
cleanup
Modified:
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/AbstractParentProcessingNode.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/SimpleParentProcessingNode.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/AbstractParentProcessingNode.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/AbstractParentProcessingNode.java?rev=606541&r1=606540&r2=606541&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/AbstractParentProcessingNode.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/AbstractParentProcessingNode.java Sat Dec 22 21:46:20 2007
@@ -48,7 +48,7 @@
throws Exception {
currentMap = this.executor.pushVariables(this, env.getObjectModel(), currentName, currentMap);
- context.pushMap(currentName,currentMap);
+ context.pushMap(currentName, currentMap);
try {
for (int i = 0; i < nodes.length; i++) {
@@ -59,18 +59,19 @@
}
} finally {
this.executor.popVariables(this, env.getObjectModel());
- // No success
context.popMap();
}
+
+ // No success
return false;
}
/**
* Invoke all nodes of a node array in order, until one succeeds.
*/
- protected final boolean invokeNodes (ProcessingNode[] nodes,
- Environment env,
- InvokeContext context)
+ protected final boolean invokeNodes(ProcessingNode[] nodes,
+ Environment env,
+ InvokeContext context)
throws Exception {
for (int i = 0; i < nodes.length; i++) {
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/SimpleParentProcessingNode.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/SimpleParentProcessingNode.java?rev=606541&r1=606540&r2=606541&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/SimpleParentProcessingNode.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/SimpleParentProcessingNode.java Sat Dec 22 21:46:20 2007
@@ -16,9 +16,6 @@
*/
package org.apache.cocoon.components.treeprocessor;
-import org.apache.cocoon.components.treeprocessor.AbstractParentProcessingNode;
-import org.apache.cocoon.components.treeprocessor.ProcessingNode;
-
import org.apache.cocoon.environment.Environment;
/**
@@ -26,8 +23,9 @@
*/
public abstract class SimpleParentProcessingNode extends AbstractParentProcessingNode {
- /** The childrens of this matcher */
+ /** The children of this node */
protected ProcessingNode[] children;
+
public SimpleParentProcessingNode(String type) {
super(type);
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java?rev=606541&r1=606540&r2=606541&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java Sat Dec 22 21:46:20 2007
@@ -111,6 +111,7 @@
}
return false;
}
+
// Processor will create its own pipelines
return processor.process(env);
} catch(Exception e) {
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java?rev=606541&r1=606540&r2=606541&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java Sat Dec 22 21:46:20 2007
@@ -132,8 +132,9 @@
desc.type = this.processingPipeline;
desc.parameters = params;
desc = this.executor.enteringPipeline(this, env.getObjectModel(), desc);
- context.inform(desc.type, desc.parameters, env.getObjectModel());
+ context.inform(desc.type, desc.parameters, env.getObjectModel());
+
try {
if (this.errorHandlerHelper.isInternal()) {
// Set internal error handler in the pipeline