You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2008/12/22 16:04:30 UTC
svn commit: r728707 - in
/cocoon/whiteboard/xml-utils/src/main/java/org/apache/cocoon/xml/util:
AbstractXMLProducer.java EmbeddedXMLPipe.java dom/DOMBuilder.java
dom/DOMStreamer.java
Author: cziegeler
Date: Mon Dec 22 07:04:30 2008
New Revision: 728707
URL: http://svn.apache.org/viewvc?rev=728707&view=rev
Log:
Only support content handler or a content handler also implementing LexicalHandler
Modified:
cocoon/whiteboard/xml-utils/src/main/java/org/apache/cocoon/xml/util/AbstractXMLProducer.java
cocoon/whiteboard/xml-utils/src/main/java/org/apache/cocoon/xml/util/EmbeddedXMLPipe.java
cocoon/whiteboard/xml-utils/src/main/java/org/apache/cocoon/xml/util/dom/DOMBuilder.java
cocoon/whiteboard/xml-utils/src/main/java/org/apache/cocoon/xml/util/dom/DOMStreamer.java
Modified: cocoon/whiteboard/xml-utils/src/main/java/org/apache/cocoon/xml/util/AbstractXMLProducer.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/xml-utils/src/main/java/org/apache/cocoon/xml/util/AbstractXMLProducer.java?rev=728707&r1=728706&r2=728707&view=diff
==============================================================================
--- cocoon/whiteboard/xml-utils/src/main/java/org/apache/cocoon/xml/util/AbstractXMLProducer.java (original)
+++ cocoon/whiteboard/xml-utils/src/main/java/org/apache/cocoon/xml/util/AbstractXMLProducer.java Mon Dec 22 07:04:30 2008
@@ -48,23 +48,9 @@
public void setContentHandler(ContentHandler handler) {
this.contentHandler = handler;
if ( handler instanceof LexicalHandler ) {
- this.setLexicalHandler((LexicalHandler)handler);
- }
- }
-
- /**
- * Set the <code>LexicalHandler</code> that will receive XML data.
- *
- * <p>Subclasses may retrieve this <code>LexicalHandler</code> instance
- * accessing the protected <code>super.lexicalHandler</code> field.
- *
- * @param handler lexical handler, should never be null.
- */
- public void setLexicalHandler(LexicalHandler handler) {
- if ( handler == null ) {
- this.lexicalHandler = DefaultLexicalHandler.NULL_HANDLER;
+ this.lexicalHandler = (LexicalHandler)handler;
} else {
- this.lexicalHandler = handler;
+ this.lexicalHandler = DefaultLexicalHandler.NULL_HANDLER;
}
}
Modified: cocoon/whiteboard/xml-utils/src/main/java/org/apache/cocoon/xml/util/EmbeddedXMLPipe.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/xml-utils/src/main/java/org/apache/cocoon/xml/util/EmbeddedXMLPipe.java?rev=728707&r1=728706&r2=728707&view=diff
==============================================================================
--- cocoon/whiteboard/xml-utils/src/main/java/org/apache/cocoon/xml/util/EmbeddedXMLPipe.java (original)
+++ cocoon/whiteboard/xml-utils/src/main/java/org/apache/cocoon/xml/util/EmbeddedXMLPipe.java Mon Dec 22 07:04:30 2008
@@ -18,7 +18,6 @@
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-import org.xml.sax.ext.LexicalHandler;
/**
* This class implements a ContentHandler for embedding a full SAX
@@ -39,17 +38,6 @@
*/
public EmbeddedXMLPipe(ContentHandler handler) {
setContentHandler(handler);
- if (handler instanceof LexicalHandler) {
- setLexicalHandler((LexicalHandler) handler);
- }
- }
-
- /**
- * Creates an EmbeddedXMLPipe that writes into the given ContentHandler.
- */
- public EmbeddedXMLPipe(ContentHandler contentHandler, LexicalHandler lexicalHandler) {
- setContentHandler(contentHandler);
- setLexicalHandler(lexicalHandler);
}
/**
Modified: cocoon/whiteboard/xml-utils/src/main/java/org/apache/cocoon/xml/util/dom/DOMBuilder.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/xml-utils/src/main/java/org/apache/cocoon/xml/util/dom/DOMBuilder.java?rev=728707&r1=728706&r2=728707&view=diff
==============================================================================
--- cocoon/whiteboard/xml-utils/src/main/java/org/apache/cocoon/xml/util/dom/DOMBuilder.java (original)
+++ cocoon/whiteboard/xml-utils/src/main/java/org/apache/cocoon/xml/util/dom/DOMBuilder.java Mon Dec 22 07:04:30 2008
@@ -106,7 +106,6 @@
try {
TransformerHandler handler = this.factory.newTransformerHandler();
setContentHandler(handler);
- setLexicalHandler(handler);
if (this.parentNode != null) {
this.result = new DOMResult(this.parentNode);
} else {
Modified: cocoon/whiteboard/xml-utils/src/main/java/org/apache/cocoon/xml/util/dom/DOMStreamer.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/xml-utils/src/main/java/org/apache/cocoon/xml/util/dom/DOMStreamer.java?rev=728707&r1=728706&r2=728707&view=diff
==============================================================================
--- cocoon/whiteboard/xml-utils/src/main/java/org/apache/cocoon/xml/util/dom/DOMStreamer.java (original)
+++ cocoon/whiteboard/xml-utils/src/main/java/org/apache/cocoon/xml/util/dom/DOMStreamer.java Mon Dec 22 07:04:30 2008
@@ -39,7 +39,6 @@
import org.w3c.dom.Text;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.helpers.AttributesImpl;
/**
@@ -84,17 +83,8 @@
/**
* Create a new <code>DOMStreamer</code> instance.
*/
- public DOMStreamer(ContentHandler content, LexicalHandler lexical) {
- this();
- setContentHandler(content);
- setLexicalHandler(lexical);
- }
-
- /**
- * Create a new <code>DOMStreamer</code> instance.
- */
public DOMStreamer(ContentHandler content) {
- this(content, content instanceof LexicalHandler ? (LexicalHandler) content : null);
+ setContentHandler(content);
}
/**
@@ -106,14 +96,6 @@
}
/**
- * Set the <code>LexicalHandler</code> that will receive XML data.
- */
- public void setLexicalHandler(LexicalHandler handler) {
- defaultDOMStreamer.setLexicalHandler(handler);
- namespaceNormalizingDOMStreamer.setLexicalHandler(handler);
- }
-
- /**
* Start the production of SAX events.
*/
public void stream(Node node) throws SAXException {