cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r280345 - in /cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap: ErrorHandlerHelper.java MountNode.java SerializeNode.java
Date Mon, 12 Sep 2005 14:26:00 GMT
Author: cziegeler
Date: Mon Sep 12 07:25:56 2005
New Revision: 280345

URL: http://svn.apache.org/viewcvs?rev=280345&view=rev
Log:
Convert only once

Modified:
    cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ErrorHandlerHelper.java
    cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java
    cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SerializeNode.java

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ErrorHandlerHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ErrorHandlerHelper.java?rev=280345&r1=280344&r2=280345&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ErrorHandlerHelper.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ErrorHandlerHelper.java
Mon Sep 12 07:25:56 2005
@@ -30,7 +30,6 @@
 import org.apache.cocoon.components.treeprocessor.ProcessingNode;
 import org.apache.cocoon.environment.Environment;
 import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.sitemap.SitemapParameters;
 
 import java.io.IOException;
 import java.util.Map;

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java?rev=280345&r1=280344&r2=280345&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java
Mon Sep 12 07:25:56 2005
@@ -27,7 +27,6 @@
 import org.apache.cocoon.components.treeprocessor.TreeProcessor;
 import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
 import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.util.location.Location;
 import org.apache.commons.lang.BooleanUtils;
 
 /**
@@ -59,7 +58,7 @@
     private final boolean checkReload;
 
     /** The value of the 'pass-through' attribute */
-    private final boolean passThrough;
+    private final Boolean passThrough;
 
     public MountNode(VariableResolver prefix,
                      VariableResolver source,
@@ -70,7 +69,7 @@
         this.source = source;
         this.parentProcessor = parentProcessor;
         this.checkReload = checkReload;
-        this.passThrough = passThrough;
+        this.passThrough = BooleanUtils.toBooleanObject(passThrough);
     }
 
     /* (non-Javadoc)
@@ -97,7 +96,7 @@
         String oldPrefix = env.getURIPrefix();
         String oldURI    = env.getURI();
         Object oldPassThrough = env.getAttribute(COCOON_PASS_THROUGH);
-        env.setAttribute(COCOON_PASS_THROUGH, BooleanUtils.toBooleanObject(passThrough));
+        env.setAttribute(COCOON_PASS_THROUGH, this.passThrough);
 
         try {
             processor.getEnvironmentHelper().changeContext(env);

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SerializeNode.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SerializeNode.java?rev=280345&r1=280344&r2=280345&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SerializeNode.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SerializeNode.java
Mon Sep 12 07:25:56 2005
@@ -19,7 +19,6 @@
 
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.cocoon.Constants;
-import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.components.pipeline.ProcessingPipeline;
 import org.apache.cocoon.components.treeprocessor.InvokeContext;
 import org.apache.cocoon.components.treeprocessor.ParameterizableProcessingNode;
@@ -27,9 +26,8 @@
 import org.apache.cocoon.components.treeprocessor.ProcessingNode;
 import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
 import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.sitemap.PatternException;
 import org.apache.cocoon.sitemap.SitemapExecutor;
-import org.apache.cocoon.util.location.Location;
+
 /**
  *
  * @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>



Mime
View raw message