You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by an...@locus.apache.org on 2000/06/23 04:37:05 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/parsers DOMParser.java SAXParser.java
andyc 00/06/22 19:37:04
Modified: java/docs releases.xml
java/src/org/apache/xerces/framework XMLParser.java
java/src/org/apache/xerces/parsers DOMParser.java
SAXParser.java
Log:
Fixed SAXParser so that it would call the registered DeclHandler
and LexicalHandlers for SAX2.
Thanks to Matt Jones <jo...@nceas.ucsb.edu> for the bug report.
Revision Changes Path
1.20 +1 -0 xml-xerces/java/docs/releases.xml
Index: releases.xml
===================================================================
RCS file: /home/cvs/xml-xerces/java/docs/releases.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- releases.xml 2000/06/23 01:55:12 1.19
+++ releases.xml 2000/06/23 02:36:56 1.20
@@ -11,6 +11,7 @@
<li>Fixed StringReader index out of bounds exception bug [andyc]</li>
<li>Turned on namespace support in all parsers, by default [andyc]</li>
<li>Added feature to allow Schema support to be turned off [andyc]</li>
+ <li>Fixed SAX2 DeclHandler, LexicalHandler callbacks [andyc]</li>
<li>Fixed DOM serialization [jeffreyr]</li>
<li>Fixed datatype enumeration bugs [jeffreyr]</li>
<li>Fixed datatype pattern bugs [jeffreyr]</li>
1.19 +4 -2 xml-xerces/java/src/org/apache/xerces/framework/XMLParser.java
Index: XMLParser.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/framework/XMLParser.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XMLParser.java 2000/06/21 19:11:17 1.18
+++ XMLParser.java 2000/06/23 02:36:58 1.19
@@ -90,9 +90,10 @@
/**
* This is the base class of all standard parsers.
*
- * @version $Id: XMLParser.java,v 1.18 2000/06/21 19:11:17 andyc Exp $
+ * @version $Id: XMLParser.java,v 1.19 2000/06/23 02:36:58 andyc Exp $
*/
-public class XMLParser implements XMLErrorReporter {
+public abstract class XMLParser
+ implements XMLErrorReporter, XMLDocumentHandler.DTDHandler {
//
// Constants
@@ -219,6 +220,7 @@
XMLDocumentHandler.DTDHandler dtdHandler)
{
fValidator.initHandlers(sendCharDataAsCharArray, docHandler, dtdHandler);
+ fScanner.setDTDHandler(this);
}
//
1.22 +2 -3 xml-xerces/java/src/org/apache/xerces/parsers/DOMParser.java
Index: DOMParser.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/DOMParser.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- DOMParser.java 2000/06/22 00:05:29 1.21
+++ DOMParser.java 2000/06/23 02:37:01 1.22
@@ -108,11 +108,11 @@
* DOMParser provides a parser which produces a W3C DOM tree as its output
*
*
- * @version $Id: DOMParser.java,v 1.21 2000/06/22 00:05:29 andyc Exp $
+ * @version $Id: DOMParser.java,v 1.22 2000/06/23 02:37:01 andyc Exp $
*/
public class DOMParser
extends XMLParser
- implements XMLDocumentHandler, XMLDocumentHandler.DTDHandler
+ implements XMLDocumentHandler
{
//
@@ -209,7 +209,6 @@
public DOMParser() {
initHandlers(false, this, this);
- fScanner.setDTDHandler(this);
// setup parser state
init();
1.14 +2 -1 xml-xerces/java/src/org/apache/xerces/parsers/SAXParser.java
Index: SAXParser.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/SAXParser.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SAXParser.java 2000/06/21 19:11:23 1.13
+++ SAXParser.java 2000/06/23 02:37:02 1.14
@@ -87,7 +87,7 @@
* SAXParser provides a parser which implements the SAX1 and SAX2
* parser APIs.
*
- * @version $Id: SAXParser.java,v 1.13 2000/06/21 19:11:23 andyc Exp $
+ * @version $Id: SAXParser.java,v 1.14 2000/06/23 02:37:02 andyc Exp $
*/
public class SAXParser
extends XMLParser
@@ -890,6 +890,7 @@
* encountered.
*/
public void startDTD(QName rootElement, int publicId, int systemId) throws Exception {
+ System.out.println("!!! startDTD !!!");
if (fLexicalHandler != null || DEBUG_CALLBACKS) {
// strings