You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2002/02/05 21:58:03 UTC
cvs commit: xml-cocoon2/src/java/org/apache/cocoon/components/parser XercesParser.java
vgritsenko 02/02/05 12:58:03
Modified: src/java/org/apache/cocoon/components/parser
XercesParser.java
Log:
Life cycle interfaces CONFLICT
Revision Changes Path
1.6 +7 -8 xml-cocoon2/src/java/org/apache/cocoon/components/parser/XercesParser.java
Index: XercesParser.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/parser/XercesParser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XercesParser.java 4 Feb 2002 12:25:11 -0000 1.5
+++ XercesParser.java 5 Feb 2002 20:58:03 -0000 1.6
@@ -59,7 +59,6 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.thread.SingleThreaded;
import org.apache.cocoon.components.resolver.Resolver;
import org.apache.cocoon.xml.AbstractXMLProducer;
import org.apache.xerces.dom.DocumentImpl;
@@ -78,10 +77,10 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Id: XercesParser.java,v 1.5 2002/02/04 12:25:11 cziegeler Exp $
+ * @version CVS $Id: XercesParser.java,v 1.6 2002/02/05 20:58:03 vgritsenko Exp $
*/
public class XercesParser extends AbstractXMLProducer
-implements Parser, ErrorHandler, Composable, Disposable, SingleThreaded {
+implements Parser, ErrorHandler, Composable, Disposable {
/** the SAX Parser */
final SAXParser parser;
@@ -96,8 +95,8 @@
throws SAXException {
this.parser = new SAXParser();
- this.parser.setFeature("http://xml.org/sax/features/validation",false);
- this.parser.setFeature("http://xml.org/sax/features/namespaces",true);
+ this.parser.setFeature("http://xml.org/sax/features/validation", false);
+ this.parser.setFeature("http://xml.org/sax/features/namespaces", true);
}
/**
@@ -122,12 +121,12 @@
public void parse(InputSource in)
throws SAXException, IOException {
- this.parser.setProperty("http://xml.org/sax/properties/lexical-handler",
- super.lexicalHandler);
+ this.parser.setProperty("http://xml.org/sax/properties/lexical-handler",
+ super.lexicalHandler);
this.parser.setErrorHandler(this);
this.parser.setContentHandler(super.contentHandler);
if(this.resolver != null)
- this.parser.setEntityResolver(this.resolver);
+ this.parser.setEntityResolver(this.resolver);
this.parser.parse(in);
}
----------------------------------------------------------------------
In case of troubles, e-mail: webmaster@xml.apache.org
To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org