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 2003/10/24 15:36:40 UTC
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/components/treeprocessor/sitemap CallFunctionNode.java ComponentsSelector.java ContinueNode.java PipelinesNode.java
vgritsenko 2003/10/24 06:36:40
Modified: src/java/org/apache/cocoon/components/treeprocessor/sitemap
CallFunctionNode.java ComponentsSelector.java
ContinueNode.java PipelinesNode.java
src/java/org/apache/cocoon/components/treeprocessor/sitemap
CallFunctionNode.java ComponentsSelector.java
ContinueNode.java PipelinesNode.java
Log:
Minor style changes. Null component manager on dispose.
Revision Changes Path
1.4 +5 -3 cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/CallFunctionNode.java
Index: CallFunctionNode.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/CallFunctionNode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CallFunctionNode.java 16 Aug 2003 20:38:30 -0000 1.3
+++ CallFunctionNode.java 24 Oct 2003 13:36:40 -0000 1.4
@@ -147,8 +147,9 @@
List params = null;
// Resolve parameters
- if (parameters != null)
+ if (parameters != null) {
params = resolveList(parameters, manager, context, env.getObjectModel());
+ }
String continuation;
if (continuationResolver != null) {
@@ -174,8 +175,9 @@
if (functionNameResolver != null) {
// Need to resolve the function name at runtime
name = functionNameResolver.resolve(context, env.getObjectModel());
- } else
+ } else {
name = functionName;
+ }
if (name != null) {
interpreter.callFunction(name, params, env);
1.6 +2 -8 cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ComponentsSelector.java
Index: ComponentsSelector.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ComponentsSelector.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ComponentsSelector.java 12 Aug 2003 15:48:02 -0000 1.5
+++ ComponentsSelector.java 24 Oct 2003 13:36:40 -0000 1.6
@@ -178,7 +178,7 @@
if (getLogger().isDebugEnabled()) {
getLogger().debug("Setting up sitemap component selector for " +
- role + " (role id = " + this.roleId + ")");
+ role + " (role id = " + this.roleId + ")");
}
// Only matchers and serializers can have a MIME type
@@ -353,9 +353,3 @@
this.parentSitemapSelector = null;
}
}
-
-
-
-
-
-
1.3 +3 -2 cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ContinueNode.java
Index: ContinueNode.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ContinueNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContinueNode.java 16 Mar 2003 17:49:13 -0000 1.2
+++ ContinueNode.java 24 Oct 2003 13:36:40 -0000 1.3
@@ -118,9 +118,10 @@
List params = null;
// Resolve parameters
- if (this.parameters != null)
+ if (this.parameters != null) {
params = CallFunctionNode.resolveList(this.parameters, this.manager,
context, env.getObjectModel());
+ }
String contId = continuationId;
1.6 +24 -27 cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNode.java
Index: PipelinesNode.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/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 21:02:24 -0000 1.5
+++ PipelinesNode.java 24 Oct 2003 13:36:40 -0000 1.6
@@ -80,9 +80,9 @@
private ComponentManager manager;
- private ErrorHandlerHelper errorHandlerHelper = new ErrorHandlerHelper();
+ private ErrorHandlerHelper errorHandlerHelper = new ErrorHandlerHelper();
- private ProcessingNode errorHandler;
+ private ProcessingNode errorHandler;
/**
* Constructor
@@ -96,22 +96,19 @@
*/
public void compose(ComponentManager manager) {
this.manager = manager;
- errorHandlerHelper.compose(manager);
+ this.errorHandlerHelper.compose(manager);
}
- public void enableLogging(Logger logger)
- {
- super.enableLogging(logger);
- errorHandlerHelper.enableLogging(logger);
- }
-
- public void setErrorHandler(ProcessingNode node)
- {
- errorHandler = node;
- }
+ public void enableLogging(Logger logger) {
+ super.enableLogging(logger);
+ this.errorHandlerHelper.enableLogging(logger);
+ }
+
+ public void setErrorHandler(ProcessingNode node) {
+ this.errorHandler = node;
+ }
- public void setChildren(ProcessingNode[] nodes)
- {
+ public void setChildren(ProcessingNode[] nodes) {
// Mark the last pipeline so that it can throw a ResourceNotFoundException
((PipelineNode)nodes[nodes.length - 1]).setLast(true);
@@ -128,8 +125,8 @@
* redirector, if any, are restored before return.
*/
public final boolean invoke(Environment env, InvokeContext context)
- throws Exception {
-
+ throws Exception {
+
// Perform any common invoke functionality
super.invoke(env, context);
@@ -138,7 +135,7 @@
// Build a redirector
ForwardRedirector redirector = new ForwardRedirector(env);
- this.setupLogger(redirector);
+ setupLogger(redirector);
Map objectModel = env.getObjectModel();
@@ -154,18 +151,17 @@
return invokeNodes(this.children, env, context);
} catch (Exception ex) {
- if (errorHandler != null) {
- // Invoke pipelines handler
- return errorHandlerHelper.invokeErrorHandler(errorHandler, ex, env);
- } else {
- // No handler : propagate
- throw ex;
- }
+ if (this.errorHandler != null) {
+ // Invoke pipelines handler
+ return this.errorHandlerHelper.invokeErrorHandler(this.errorHandler, ex, env);
+ } else {
+ // No handler : propagate
+ throw ex;
+ }
} finally {
// Restore old redirector and resolver
env.setAttribute(REDIRECTOR_ATTR, oldRedirector);
objectModel.put(OBJECT_SOURCE_RESOLVER, oldResolver);
-
}
}
@@ -176,5 +172,6 @@
if (this.manager instanceof Disposable) {
((Disposable)this.manager).dispose();
}
+ this.manager = null;
}
}
1.4 +5 -3 cocoon-2.2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/CallFunctionNode.java
Index: CallFunctionNode.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/CallFunctionNode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CallFunctionNode.java 16 Aug 2003 20:38:30 -0000 1.3
+++ CallFunctionNode.java 24 Oct 2003 13:36:40 -0000 1.4
@@ -147,8 +147,9 @@
List params = null;
// Resolve parameters
- if (parameters != null)
+ if (parameters != null) {
params = resolveList(parameters, manager, context, env.getObjectModel());
+ }
String continuation;
if (continuationResolver != null) {
@@ -174,8 +175,9 @@
if (functionNameResolver != null) {
// Need to resolve the function name at runtime
name = functionNameResolver.resolve(context, env.getObjectModel());
- } else
+ } else {
name = functionName;
+ }
if (name != null) {
interpreter.callFunction(name, params, env);
1.6 +2 -8 cocoon-2.2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ComponentsSelector.java
Index: ComponentsSelector.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ComponentsSelector.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ComponentsSelector.java 12 Aug 2003 15:48:02 -0000 1.5
+++ ComponentsSelector.java 24 Oct 2003 13:36:40 -0000 1.6
@@ -178,7 +178,7 @@
if (getLogger().isDebugEnabled()) {
getLogger().debug("Setting up sitemap component selector for " +
- role + " (role id = " + this.roleId + ")");
+ role + " (role id = " + this.roleId + ")");
}
// Only matchers and serializers can have a MIME type
@@ -353,9 +353,3 @@
this.parentSitemapSelector = null;
}
}
-
-
-
-
-
-
1.3 +3 -2 cocoon-2.2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ContinueNode.java
Index: ContinueNode.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ContinueNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContinueNode.java 16 Mar 2003 17:49:13 -0000 1.2
+++ ContinueNode.java 24 Oct 2003 13:36:40 -0000 1.3
@@ -118,9 +118,10 @@
List params = null;
// Resolve parameters
- if (this.parameters != null)
+ if (this.parameters != null) {
params = CallFunctionNode.resolveList(this.parameters, this.manager,
context, env.getObjectModel());
+ }
String contId = continuationId;
1.7 +24 -28 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PipelinesNode.java 15 Oct 2003 21:03:38 -0000 1.6
+++ PipelinesNode.java 24 Oct 2003 13:36:40 -0000 1.7
@@ -80,13 +80,12 @@
private ComponentManager manager;
- private ErrorHandlerHelper errorHandlerHelper = new ErrorHandlerHelper();
+ private ErrorHandlerHelper errorHandlerHelper = new ErrorHandlerHelper();
- private ProcessingNode errorHandler;
+ private ProcessingNode errorHandler;
/**
* Constructor
- * @param processor The processor for this sitemap
*/
public PipelinesNode() {
}
@@ -97,22 +96,19 @@
*/
public void compose(ComponentManager manager) {
this.manager = manager;
- errorHandlerHelper.compose(manager);
+ this.errorHandlerHelper.compose(manager);
}
- public void enableLogging(Logger logger)
- {
- super.enableLogging(logger);
- errorHandlerHelper.enableLogging(logger);
- }
-
- public void setErrorHandler(ProcessingNode node)
- {
- errorHandler = node;
- }
+ public void enableLogging(Logger logger) {
+ super.enableLogging(logger);
+ this.errorHandlerHelper.enableLogging(logger);
+ }
+
+ public void setErrorHandler(ProcessingNode node) {
+ this.errorHandler = node;
+ }
- public void setChildren(ProcessingNode[] nodes)
- {
+ public void setChildren(ProcessingNode[] nodes) {
// Mark the last pipeline so that it can throw a ResourceNotFoundException
((PipelineNode)nodes[nodes.length - 1]).setLast(true);
@@ -129,8 +125,8 @@
* redirector, if any, are restored before return.
*/
public final boolean invoke(Environment env, InvokeContext context)
- throws Exception {
-
+ throws Exception {
+
// Perform any common invoke functionality
super.invoke(env, context);
@@ -139,7 +135,7 @@
// Build a redirector
ForwardRedirector redirector = new ForwardRedirector(env);
- this.setupLogger(redirector);
+ setupLogger(redirector);
Map objectModel = env.getObjectModel();
@@ -155,18 +151,17 @@
return invokeNodes(this.children, env, context);
} catch (Exception ex) {
- if (errorHandler != null) {
- // Invoke pipelines handler
- return errorHandlerHelper.invokeErrorHandler(errorHandler, ex, env);
- } else {
- // No handler : propagate
- throw ex;
- }
+ if (this.errorHandler != null) {
+ // Invoke pipelines handler
+ return this.errorHandlerHelper.invokeErrorHandler(this.errorHandler, ex, env);
+ } else {
+ // No handler : propagate
+ throw ex;
+ }
} finally {
// Restore old redirector and resolver
env.setAttribute(REDIRECTOR_ATTR, oldRedirector);
objectModel.put(OBJECT_SOURCE_RESOLVER, oldResolver);
-
}
}
@@ -177,5 +172,6 @@
if (this.manager instanceof Disposable) {
((Disposable)this.manager).dispose();
}
+ this.manager = null;
}
}