sylvain 02/04/26 13:26:54
Modified:
src/scratchpad/schecoon/src/org/apache/cocoon/components/treeprocessor/sitemap
ContinueNode.java CallFunctionNode.java
Log:
Some help to cut dependencies of Interpreter on TreeProcessor
Revision Changes Path
1.5 +6 -1
xml-cocoon2/src/scratchpad/schecoon/src/org/apache/cocoon/components/treeprocessor/sitemap/ContinueNode.java
Index: ContinueNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/schecoon/src/org/apache/cocoon/components/treeprocessor/sitemap/ContinueNode.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ContinueNode.java 19 Apr 2002 07:00:20 -0000 1.4
+++ ContinueNode.java 26 Apr 2002 20:26:54 -0000 1.5
@@ -14,7 +14,9 @@
import org.apache.cocoon.components.treeprocessor.AbstractProcessingNode;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
import org.apache.cocoon.components.treeprocessor.MapStackResolver;
+import org.apache.cocoon.components.treeprocessor.sitemap.PipelinesNode;
import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.sitemap.PatternException;
public class ContinueNode
@@ -88,9 +90,12 @@
// Obtain the Interpreter instance for this language
Interpreter interpreter = (Interpreter)selector.select(language);
+
+ // Obtain the redirector
+ Redirector redirector = PipelinesNode.getRedirector(env);
try {
- interpreter.handleContinuation(contId, params, env);
+ interpreter.handleContinuation(contId, params, env /*, redirector*/);
}
finally {
selector.release((Component)interpreter);
1.9 +6 -1
xml-cocoon2/src/scratchpad/schecoon/src/org/apache/cocoon/components/treeprocessor/sitemap/CallFunctionNode.java
Index: CallFunctionNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/schecoon/src/org/apache/cocoon/components/treeprocessor/sitemap/CallFunctionNode.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CallFunctionNode.java 25 Apr 2002 21:17:45 -0000 1.8
+++ CallFunctionNode.java 26 Apr 2002 20:26:54 -0000 1.9
@@ -19,7 +19,9 @@
import org.apache.cocoon.components.treeprocessor.MapStackResolver;
import org.apache.cocoon.components.treeprocessor.ParameterizableProcessingNode;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
+import org.apache.cocoon.components.treeprocessor.sitemap.PipelinesNode;
import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.sitemap.PatternException;
public class CallFunctionNode extends AbstractProcessingNode
@@ -131,8 +133,11 @@
// Obtain the Interpreter instance for this language
Interpreter interpreter = (Interpreter)selector.select(language);
+ // Obtain the redirector
+ Redirector redirector = PipelinesNode.getRedirector(env);
+
try {
- interpreter.callFunction(name, params, env);
+ interpreter.callFunction(name, params, env /*, redirector*/);
}
finally {
selector.release((Component)interpreter);
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
