cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r510940 - in /cocoon/trunk/core: cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/ cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/core/container/spring/pipeline/ cocoon-sitemap/...
Date Fri, 23 Feb 2007 13:19:16 GMT
Author: cziegeler
Date: Fri Feb 23 05:19:16 2007
New Revision: 510940

URL: http://svn.apache.org/viewvc?view=rev&rev=510940
Log:
Clean up code

Modified:
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/StripNameSpacesTransformer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/core/container/spring/pipeline/PipelineComponentInfoInitializerDecorator.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/generation/StatusGenerator.java

Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/StripNameSpacesTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/StripNameSpacesTransformer.java?view=diff&rev=510940&r1=510939&r2=510940
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/StripNameSpacesTransformer.java
(original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/StripNameSpacesTransformer.java
Fri Feb 23 05:19:16 2007
@@ -22,8 +22,6 @@
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.caching.CacheableProcessingComponent;
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Response;
 import org.apache.cocoon.environment.SourceResolver;
 import org.apache.excalibur.source.SourceValidity;
 import org.apache.excalibur.source.impl.validity.NOPValidity;
@@ -33,23 +31,23 @@
 /**
  * @cocoon.sitemap.component.documentation
  * The <code>StripNameSpacesTransformer</code> is a class that can be plugged
into a pipeline
- * to strip all namespaces from a SAX stream. It is much faster (certainly for larger 
+ * to strip all namespaces from a SAX stream. It is much faster (certainly for larger
  * streams, but easily factor 100) then the conventional stripnamespaces.xsl
- * 
+ *
  * @cocoon.sitemap.component.name  stripnamespaces
  * @cocoon.sitemap.component.logger sitemap.transformer.stripnamespaces
- * 
+ *
  * @cocoon.sitemap.component.pooling.max  32
- * 
+ *
  * @version $Id$
  * @author ard schrijvers
- *  
+ *
  */
 public class StripNameSpacesTransformer extends AbstractTransformer implements
 		CacheableProcessingComponent {
-	
+
 	private static final String EMPTY_NS = "";
-	
+
 	public void setup(SourceResolver resolver, Map objectModel, String src,
 			Parameters params) throws ProcessingException, SAXException,
 			IOException {
@@ -67,7 +65,7 @@
 
 	public void startElement(String uri, String localName, String qName,
 			Attributes attr) throws SAXException {
-		
+
 		super.startElement(EMPTY_NS, localName, localName, attr);
 
 	}

Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/core/container/spring/pipeline/PipelineComponentInfoInitializerDecorator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/core/container/spring/pipeline/PipelineComponentInfoInitializerDecorator.java?view=diff&rev=510940&r1=510939&r2=510940
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/core/container/spring/pipeline/PipelineComponentInfoInitializerDecorator.java
(original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/core/container/spring/pipeline/PipelineComponentInfoInitializerDecorator.java
Fri Feb 23 05:19:16 2007
@@ -23,12 +23,9 @@
 import java.util.List;
 
 import org.apache.cocoon.components.pipeline.impl.PipelineComponentInfo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.BeanDefinitionDecorator;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
@@ -42,8 +39,6 @@
         BeanDefinitionDecorator {
 
     private static final String[] EMPTY_STRING_ARRAY = new String[0];
-    /** Logger  */
-    private final Log logger = LogFactory.getLog(getClass());
 
     /* (non-Javadoc)
      * @see org.springframework.beans.factory.xml.BeanDefinitionDecorator#decorate(org.w3c.dom.Node,
org.springframework.beans.factory.config.BeanDefinitionHolder, org.springframework.beans.factory.xml.ParserContext)
@@ -57,7 +52,7 @@
 
     private void registerPipelineComponentInfo(ParserContext ctx) {
         if (!ctx.getRegistry().containsBeanDefinition(PipelineComponentInfo.ROLE)) {
-            BeanDefinitionBuilder defBuilder = BeanDefinitionBuilder.rootBeanDefinition(PipelineComponentInfoFactoryBean.class);

+            BeanDefinitionBuilder defBuilder = BeanDefinitionBuilder.rootBeanDefinition(PipelineComponentInfoFactoryBean.class);
             defBuilder.setSingleton(true);
             defBuilder.setLazyInit(false);
             defBuilder.setInitMethodName("init");
@@ -70,7 +65,7 @@
         String mimeType = ((Element)source).hasAttribute("mime-type") ? ((Element)source).getAttribute("mime-type")
: null;
         String label = ((Element)source).hasAttribute("label") ? ((Element)source).getAttribute("label")
: null;
         String hint = ((Element)source).hasAttribute("hint") ? ((Element)source).getAttribute("hint")
: null;
-        
+
         BeanDefinitionBuilder initializer = BeanDefinitionBuilder.rootBeanDefinition(PipelineComponentInfoInitializer.class);
         initializer.addPropertyReference("info", PipelineComponentInfo.ROLE);
         initializer.addPropertyValue("componentName", componentName);
@@ -84,7 +79,7 @@
 
         String beanName = componentName + "/info";
         ctx.getRegistry().registerBeanDefinition(beanName, initializer.getBeanDefinition());
-        
+
         return beanName;
     }
 

Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/generation/StatusGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/generation/StatusGenerator.java?view=diff&rev=510940&r1=510939&r2=510940
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/generation/StatusGenerator.java
(original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/generation/StatusGenerator.java
Fri Feb 23 05:19:16 2007
@@ -560,11 +560,6 @@
     }
 
     /** Utility function to begin and end a <code>value</code> tag pair. */
-    private void addValue(String name, int value) throws SAXException {
-        addValue(name, String.valueOf(value), null);
-    }
-
-    /** Utility function to begin and end a <code>value</code> tag pair. */
     private void addValue(String name, long value) throws SAXException {
         addValue(name, String.valueOf(value), null);
     }



Mime
View raw message