giacomo 00/10/12 21:18:10
Modified: src/org/apache/cocoon/xml Tag: xml-cocoon2
DocumentHandlerWrapper.java
src/org/apache/cocoon/transformation Tag: xml-cocoon2
XalanTransformer.java
Added: src/org/apache/cocoon/xml Tag: xml-cocoon2
ContentHandlerWrapper.java
Log:
Improvements/bug fixed of classes concerning the Xalan2J integration. These
patches were submitted by Sebastien Sahuc and Davanum Srinivas.
Revision Changes Path
No revision
No revision
1.1.2.2 +10 -2
xml-cocoon/src/org/apache/cocoon/xml/Attic/DocumentHandlerWrapper.java
Index: DocumentHandlerWrapper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/xml/Attic/DocumentHandlerWrapper.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- DocumentHandlerWrapper.java 2000/09/27 14:33:45 1.1.2.1
+++ DocumentHandlerWrapper.java 2000/10/13 04:18:07 1.1.2.2
@@ -10,6 +10,7 @@
import java.util.Vector;
+import org.apache.avalon.Recyclable;
import org.apache.cocoon.xml.AbstractXMLConsumer;
import org.apache.cocoon.xml.NamespacesTable;
@@ -31,9 +32,9 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/09/27 14:33:45 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/10/13 04:18:07 $
*/
-public class DocumentHandlerWrapper extends AbstractXMLConsumer {
+public class DocumentHandlerWrapper extends AbstractXMLConsumer /*implements
Recyclable*/ {
/** The current namespaces table. */
private NamespacesTable namespaces=new NamespacesTable();
@@ -56,6 +57,13 @@
public DocumentHandlerWrapper(DocumentHandler document) {
this();
this.setDocumentHandler(document);
+ }
+
+ /**
+ * Implementation of the recycle method
+ */
+ public void recycle() {
+ this.documentHandler = null;
}
/**
No revision
No revision
1.1.2.1 +179 -0
xml-cocoon/src/org/apache/cocoon/xml/Attic/ContentHandlerWrapper.java
No revision
No revision
1.1.2.13 +4 -5
xml-cocoon/src/org/apache/cocoon/transformation/Attic/XalanTransformer.java
Index: XalanTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/XalanTransformer.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- XalanTransformer.java 2000/10/12 16:44:08 1.1.2.12
+++ XalanTransformer.java 2000/10/13 04:18:09 1.1.2.13
@@ -25,8 +25,7 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.store.Store;
import org.apache.cocoon.xml.XMLConsumer;
-import org.apache.cocoon.xml.DocumentHandlerAdapter;
-import org.apache.cocoon.xml.DocumentHandlerWrapper;
+import org.apache.cocoon.xml.ContentHandlerWrapper;
import org.xml.sax.ContentHandler;
import org.xml.sax.EntityResolver;
@@ -40,9 +39,9 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.12 $ $Date: 2000/10/12 16:44:08 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2000/10/13 04:18:09 $
*/
-public class XalanTransformer extends DocumentHandlerWrapper
+public class XalanTransformer extends ContentHandlerWrapper
implements Transformer, Composer, Poolable {
/** The store service instance */
@@ -115,7 +114,7 @@
}
ContentHandler chandler = transformer.getInputContentHandler();
- this.setDocumentHandler(new DocumentHandlerAdapter(chandler));
+ super.setContentHandler(chandler);
if(chandler instanceof org.xml.sax.ext.LexicalHandler)
this.setLexicalHandler((org.xml.sax.ext.LexicalHandler)chandler);
}
