You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by si...@apache.org on 2010/12/10 12:05:47 UTC
svn commit: r1044286 - in
/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder:
LinkedSAXPipelineBuilder.java LinkedSAXPipelineComponentBuilder.java
LinkedSAXPipelineStarterBuilder.java
Author: simonetripodi
Date: Fri Dec 10 11:05:47 2010
New Revision: 1044286
URL: http://svn.apache.org/viewvc?rev=1044286&view=rev
Log:
no needs to have SAX Pipeline EDSL with generics, the default type IS SAXPipelineComponent
Modified:
cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineBuilder.java
cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineComponentBuilder.java
cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineStarterBuilder.java
Modified: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineBuilder.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineBuilder.java?rev=1044286&r1=1044285&r2=1044286&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineBuilder.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineBuilder.java Fri Dec 10 11:05:47 2010
@@ -16,18 +16,16 @@
*/
package org.apache.cocoon.sax.builder;
-import org.apache.cocoon.sax.SAXPipelineComponent;
-
/**
*
* @version: $Id$
*/
-public interface LinkedSAXPipelineBuilder<SPC extends SAXPipelineComponent> {
+public interface LinkedSAXPipelineBuilder {
- LinkedSAXPipelineStarterBuilder<SPC> newAsyncCachePipeline();
+ LinkedSAXPipelineStarterBuilder newAsyncCachePipeline();
- LinkedSAXPipelineStarterBuilder<SPC> newCachingPipeline();
+ LinkedSAXPipelineStarterBuilder newCachingPipeline();
- LinkedSAXPipelineStarterBuilder<SPC> newNonCachingPipeline();
+ LinkedSAXPipelineStarterBuilder newNonCachingPipeline();
}
Modified: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineComponentBuilder.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineComponentBuilder.java?rev=1044286&r1=1044285&r2=1044286&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineComponentBuilder.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineComponentBuilder.java Fri Dec 10 11:05:47 2010
@@ -29,34 +29,34 @@ import org.apache.cocoon.sax.SAXPipeline
*
* @version $Id$
*/
-public interface LinkedSAXPipelineComponentBuilder<SPC extends SAXPipelineComponent> {
+public interface LinkedSAXPipelineComponentBuilder {
- LinkedSAXPipelineComponentBuilder<SPC> addCleaningTransformer();
+ LinkedSAXPipelineComponentBuilder addCleaningTransformer();
- LinkedSAXPipelineComponentBuilder<SPC> addIncludeTransformer();
+ LinkedSAXPipelineComponentBuilder addIncludeTransformer();
- LinkedSAXPipelineComponentBuilder<SPC> addLogAsXMLTransformer();
+ LinkedSAXPipelineComponentBuilder addLogAsXMLTransformer();
- LinkedSAXPipelineComponentBuilder<SPC> addLogAsXMLTransformer(File logFile);
+ LinkedSAXPipelineComponentBuilder addLogAsXMLTransformer(File logFile);
- LinkedSAXPipelineComponentBuilder<SPC> addLogTransformer(File logFile);
+ LinkedSAXPipelineComponentBuilder addLogTransformer(File logFile);
- LinkedSAXPipelineComponentBuilder<SPC> addLogTransformer(File logFile, boolean append);
+ LinkedSAXPipelineComponentBuilder addLogTransformer(File logFile, boolean append);
- LinkedSAXPipelineComponentBuilder<SPC> addLogTransformer(File logFile, boolean append, String datePattern);
+ LinkedSAXPipelineComponentBuilder addLogTransformer(File logFile, boolean append, String datePattern);
- LinkedSAXPipelineComponentBuilder<SPC> addLogTransformer(File logFile, boolean append, SimpleDateFormat dateFormat);
+ LinkedSAXPipelineComponentBuilder addLogTransformer(File logFile, boolean append, SimpleDateFormat dateFormat);
- LinkedSAXPipelineComponentBuilder<SPC> addSchemaProcessorTransformer(URL source);
+ LinkedSAXPipelineComponentBuilder addSchemaProcessorTransformer(URL source);
- LinkedSAXPipelineComponentBuilder<SPC> addXIncludeTransformer(URL baseUrl);
+ LinkedSAXPipelineComponentBuilder addXIncludeTransformer(URL baseUrl);
- LinkedSAXPipelineComponentBuilder<SPC> addXSLTTransformer(URL source);
+ LinkedSAXPipelineComponentBuilder addXSLTTransformer(URL source);
- LinkedSAXPipelineComponentBuilder<SPC> addXSLTTransformer(URL source, Map<String, Object> attributes);
+ LinkedSAXPipelineComponentBuilder addXSLTTransformer(URL source, Map<String, Object> attributes);
- LinkedSAXPipelineComponentBuilder<SPC> addComponent(SPC pipelineComponent);
+ <SPC extends SAXPipelineComponent> LinkedSAXPipelineComponentBuilder addComponent(SPC pipelineComponent);
- LinkedPipelineConfigurationBuilder<SPC> addSerializer();
+ LinkedPipelineConfigurationBuilder<SAXPipelineComponent> addSerializer();
}
Modified: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineStarterBuilder.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineStarterBuilder.java?rev=1044286&r1=1044285&r2=1044286&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineStarterBuilder.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineStarterBuilder.java Fri Dec 10 11:05:47 2010
@@ -29,24 +29,24 @@ import org.w3c.dom.Node;
*
* @version $Id$
*/
-public interface LinkedSAXPipelineStarterBuilder<SPC extends SAXPipelineComponent> {
+public interface LinkedSAXPipelineStarterBuilder {
- LinkedSAXPipelineComponentBuilder<SPC> setByteArrayGenerator(byte[] bytes);
+ LinkedSAXPipelineComponentBuilder setByteArrayGenerator(byte[] bytes);
- LinkedSAXPipelineComponentBuilder<SPC> setByteArrayGenerator(byte[] bytes, String encoding);
+ LinkedSAXPipelineComponentBuilder setByteArrayGenerator(byte[] bytes, String encoding);
- LinkedSAXPipelineComponentBuilder<SPC> setFileGenerator(File file);
+ LinkedSAXPipelineComponentBuilder setFileGenerator(File file);
- LinkedSAXPipelineComponentBuilder<SPC> setInputStreamGenerator(InputStream inputStream);
+ LinkedSAXPipelineComponentBuilder setInputStreamGenerator(InputStream inputStream);
- LinkedSAXPipelineComponentBuilder<SPC> setNodeGenerator(Node node);
+ LinkedSAXPipelineComponentBuilder setNodeGenerator(Node node);
- LinkedSAXPipelineComponentBuilder<SPC> setSAXBufferGenerator(SAXBuffer saxBuffer);
+ LinkedSAXPipelineComponentBuilder setSAXBufferGenerator(SAXBuffer saxBuffer);
- LinkedSAXPipelineComponentBuilder<SPC> setStringGenerator(String xmlString);
+ LinkedSAXPipelineComponentBuilder setStringGenerator(String xmlString);
- LinkedSAXPipelineComponentBuilder<SPC> setURLGenerator(URL url);
+ LinkedSAXPipelineComponentBuilder setURLGenerator(URL url);
- LinkedSAXPipelineComponentBuilder<SPC> setStarter(SPC starter);
+ <SPC extends SAXPipelineComponent> LinkedSAXPipelineComponentBuilder setStarter(SPC starter);
}