cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stevend...@apache.org
Subject svn commit: r742982 - in /cocoon/cocoon3/trunk: cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/component/ cocoon-sax/src/main/java/org/apache/cocoon/sax/util/ cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/util/
Date Tue, 10 Feb 2009 14:32:23 GMT
Author: stevendolg
Date: Tue Feb 10 14:31:46 2009
New Revision: 742982

URL: http://svn.apache.org/viewvc?rev=742982&view=rev
Log:
COCOON3-16

Modified:
    cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/component/Consumer.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/IncludeSAXConsumer.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/SAXConsumerAdapter.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/SaxBuffer.java
    cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/util/StAXEventContentHandler.java

Modified: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/component/Consumer.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/component/Consumer.java?rev=742982&r1=742981&r2=742982&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/component/Consumer.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/component/Consumer.java
Tue Feb 10 14:31:46 2009
@@ -18,6 +18,6 @@
  */
 package org.apache.cocoon.pipeline.component;
 
-public interface Consumer {
+public interface Consumer extends PipelineComponent {
 
 }

Modified: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/IncludeSAXConsumer.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/IncludeSAXConsumer.java?rev=742982&r1=742981&r2=742982&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/IncludeSAXConsumer.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/IncludeSAXConsumer.java
Tue Feb 10 14:31:46 2009
@@ -16,6 +16,8 @@
  */
 package org.apache.cocoon.sax.util;
 
+import java.util.Map;
+
 import org.apache.cocoon.sax.SAXConsumer;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
@@ -49,12 +51,14 @@
     private boolean ignoreRootElement;
     private int ignoreRootElementCount;
     private boolean inDTD;
+    private SAXConsumer consumer;
 
     /**
      * Constructor
      */
     public IncludeSAXConsumer(SAXConsumer consumer) {
         this(consumer, consumer);
+        this.consumer = consumer;
     }
 
     /**
@@ -195,4 +199,22 @@
             this.lexicalHandler.comment(ary, start, length);
         }
     }
+
+    public void finish() {
+        if (this.consumer != null) {
+            this.consumer.finish();
+        }
+    }
+
+    public void setConfiguration(Map<String, ? extends Object> configuration) {
+        if (this.consumer != null) {
+            this.consumer.setConfiguration(configuration);
+        }
+    }
+
+    public void setup(Map<String, Object> parameters) {
+        if (this.consumer != null) {
+            this.consumer.setup(parameters);
+        }
+    }
 }

Modified: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/SAXConsumerAdapter.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/SAXConsumerAdapter.java?rev=742982&r1=742981&r2=742982&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/SAXConsumerAdapter.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/SAXConsumerAdapter.java
Tue Feb 10 14:31:46 2009
@@ -16,6 +16,8 @@
  */
 package org.apache.cocoon.sax.util;
 
+import java.util.Map;
+
 import org.apache.cocoon.sax.SAXConsumer;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
@@ -123,4 +125,22 @@
     public void startPrefixMapping(String prefix, String uri) throws SAXException {
         this.contentHandler.startPrefixMapping(prefix, uri);
     }
+
+    public void finish() {
+        if (this.consumer != null) {
+            this.consumer.finish();
+        }
+    }
+
+    public void setConfiguration(Map<String, ? extends Object> configuration) {
+        if (this.consumer != null) {
+            this.consumer.setConfiguration(configuration);
+        }
+    }
+
+    public void setup(Map<String, Object> parameters) {
+        if (this.consumer != null) {
+            this.consumer.setup(parameters);
+        }
+    }
 }

Modified: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/SaxBuffer.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/SaxBuffer.java?rev=742982&r1=742981&r2=742982&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/SaxBuffer.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/SaxBuffer.java
Tue Feb 10 14:31:46 2009
@@ -23,6 +23,7 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.cocoon.sax.SAXConsumer;
 import org.xml.sax.Attributes;
@@ -578,4 +579,13 @@
             writer.write("[IgnorableWhitespace] ch=" + new String(this.ch) + "\n");
         }
     }
+
+    public void finish() {
+    }
+
+    public void setConfiguration(Map<String, ? extends Object> configuration) {
+    }
+
+    public void setup(Map<String, Object> parameters) {
+    }
 }
\ No newline at end of file

Modified: cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/util/StAXEventContentHandler.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/util/StAXEventContentHandler.java?rev=742982&r1=742981&r2=742982&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/util/StAXEventContentHandler.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/util/StAXEventContentHandler.java
Tue Feb 10 14:31:46 2009
@@ -568,4 +568,19 @@
             return this.systemId;
         }
     }
+
+    @Override
+    public void finish() {
+        // do nothing
+    }
+
+    @Override
+    public void setConfiguration(Map<String, ? extends Object> configuration) {
+        // do nothing
+    }
+
+    @Override
+    public void setup(Map<String, Object> parameters) {
+        // do nothing
+    }
 }



Mime
View raw message