neilg 2002/08/16 14:18:52
Modified: java/src/org/apache/xerces/impl/dtd XMLDTDLoader.java
Log:
for external subset preparsing, set an XMLErrorReporter on the EntityManager so that
it can create a locale-sensitive reader. Also, eliminate a spurious, synthetic
endDTD call.
Revision Changes Path
1.5 +2 -4 xml-xerces/java/src/org/apache/xerces/impl/dtd/XMLDTDLoader.java
Index: XMLDTDLoader.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dtd/XMLDTDLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLDTDLoader.java 27 Jun 2002 21:23:08 -0000 1.4
+++ XMLDTDLoader.java 16 Aug 2002 21:18:52 -0000 1.5
@@ -176,6 +176,7 @@
fDTDScanner = new XMLDTDScannerImpl(fSymbolTable, fErrorReporter,
fEntityManager);
fDTDScanner.setDTDHandler(this);
fDTDScanner.setDTDContentModelHandler(this);
+ fEntityManager.setProperty(ERROR_REPORTER, fErrorReporter);
reset();
} // init(SymbolTable, XMLGrammarPool, XMLErrorReporter, XMLEntityResolver)
@@ -371,9 +372,6 @@
} catch (EOFException e) {
// expected behaviour...
}
- // since we're not really in a DTD, the endDTD call never
- // gets fired by the scanner... This fakes it:
- endDTD(null);
if(fDTDGrammar != null && fGrammarPool != null) {
fGrammarPool.cacheGrammars(XMLDTDDescription.XML_DTD, new Grammar[]
{fDTDGrammar});
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
