You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by bl...@apache.org on 2003/10/22 20:15:49 UTC
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/components/sax XMLByteStreamCompiler.java XMLByteStreamInterpreter.java
bloritsch 2003/10/22 11:15:49
Modified: src/java/org/apache/cocoon/components/sax
XMLByteStreamCompiler.java
XMLByteStreamInterpreter.java
Log:
Update the bytestream stuff to be resettable/serviceable
Revision Changes Path
1.3 +5 -5 cocoon-2.2/src/java/org/apache/cocoon/components/sax/XMLByteStreamCompiler.java
Index: XMLByteStreamCompiler.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/sax/XMLByteStreamCompiler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLByteStreamCompiler.java 9 Jul 2003 17:53:03 -0000 1.2
+++ XMLByteStreamCompiler.java 22 Oct 2003 18:15:49 -0000 1.3
@@ -50,8 +50,8 @@
*/
package org.apache.cocoon.components.sax;
-import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.CascadingRuntimeException;
+import org.apache.excalibur.mpool.Resettable;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
@@ -67,7 +67,7 @@
*/
public final class XMLByteStreamCompiler
-implements XMLSerializer, Recyclable {
+implements XMLSerializer, Resettable {
private HashMap map;
private int count;
@@ -96,7 +96,7 @@
this.bufCount = 6;
}
- public void recycle() {
+ public void reset() {
this.initOutput();
}
@@ -215,7 +215,7 @@
/**
* SAX Event Handling: LexicalHandler
*/
- public void startDTD(String name, String publicId, String systemId)
+ public void startDTD(String name, String publicId, String systemId)
throws SAXException {
this.writeEvent(START_DTD);
this.writeString(name);
1.5 +7 -7 cocoon-2.2/src/java/org/apache/cocoon/components/sax/XMLByteStreamInterpreter.java
Index: XMLByteStreamInterpreter.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/sax/XMLByteStreamInterpreter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLByteStreamInterpreter.java 24 Sep 2003 21:26:51 -0000 1.4
+++ XMLByteStreamInterpreter.java 22 Oct 2003 18:15:49 -0000 1.5
@@ -52,8 +52,8 @@
import java.util.ArrayList;
-import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.cocoon.xml.AbstractXMLProducer;
+import org.apache.excalibur.mpool.Resettable;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
@@ -67,7 +67,7 @@
public final class XMLByteStreamInterpreter
extends AbstractXMLProducer
-implements XMLDeserializer, Recyclable {
+implements XMLDeserializer, Resettable {
private static final int START_DOCUMENT = 0;
private static final int END_DOCUMENT = 1;
@@ -92,8 +92,8 @@
private byte[] input;
private int currentPos;
- public void recycle() {
- super.recycle();
+ public void reset() {
+ super.reset();
this.list.clear();
this.input = null;
}
@@ -174,8 +174,8 @@
}
break;
case START_DTD:
- lexicalHandler.startDTD(this.readString(),
- this.readString(),
+ lexicalHandler.startDTD(this.readString(),
+ this.readString(),
this.readString());
break;
case END_DTD: