elena 2003/11/14 15:19:36
Modified: java/src/org/apache/xerces/parsers XML11Configuration.java
Log:
Fixing a bug in XML10 configurePipeline: we should always setup DTD pipeline (was
only
setup if scanner has not been changed)
Revision Changes Path
1.9 +15 -17
xml-xerces/java/src/org/apache/xerces/parsers/XML11Configuration.java
Index: XML11Configuration.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/XML11Configuration.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XML11Configuration.java 13 Nov 2003 05:41:28 -0000 1.8
+++ XML11Configuration.java 14 Nov 2003 23:19:36 -0000 1.9
@@ -1104,22 +1104,22 @@
// setup DTD pipeline
if (fCurrentDTDScanner != fDTDScanner) {
- fCurrentDTDScanner = fDTDScanner;
+ fCurrentDTDScanner = fDTDScanner;
setProperty(DTD_SCANNER, fCurrentDTDScanner);
setProperty(DTD_PROCESSOR, fDTDProcessor);
- fDTDScanner.setDTDHandler(fDTDProcessor);
- fDTDProcessor.setDTDSource(fDTDScanner);
- fDTDProcessor.setDTDHandler(fDTDHandler);
- if (fDTDHandler != null) {
- fDTDHandler.setDTDSource(fDTDProcessor);
- }
+ }
+ fDTDScanner.setDTDHandler(fDTDProcessor);
+ fDTDProcessor.setDTDSource(fDTDScanner);
+ fDTDProcessor.setDTDHandler(fDTDHandler);
+ if (fDTDHandler != null) {
+ fDTDHandler.setDTDSource(fDTDProcessor);
+ }
- fDTDScanner.setDTDContentModelHandler(fDTDProcessor);
- fDTDProcessor.setDTDContentModelSource(fDTDScanner);
- fDTDProcessor.setDTDContentModelHandler(fDTDContentModelHandler);
- if (fDTDContentModelHandler != null) {
- fDTDContentModelHandler.setDTDContentModelSource(fDTDProcessor);
- }
+ fDTDScanner.setDTDContentModelHandler(fDTDProcessor);
+ fDTDProcessor.setDTDContentModelSource(fDTDScanner);
+ fDTDProcessor.setDTDContentModelHandler(fDTDContentModelHandler);
+ if (fDTDContentModelHandler != null) {
+ fDTDContentModelHandler.setDTDContentModelSource(fDTDProcessor);
}
// setup document pipeline
@@ -1169,7 +1169,7 @@
// add schema component
setProperty(SCHEMA_VALIDATOR, fSchemaValidator);
addCommonComponent(fSchemaValidator);
- fSchemaValidator.reset(this);
+ fSchemaValidator.reset(this);
// add schema message formatter
if
(fErrorReporter.getMessageFormatter(XSMessageFormatter.SCHEMA_DOMAIN) == null) {
XSMessageFormatter xmft = new XSMessageFormatter();
@@ -1375,7 +1375,6 @@
* @param component The component to add.
*/
protected void addComponent(XMLComponent component) {
- //System.out.println("==>Adding XML 1.0: "+component);
// don't add a component more than once
if (fComponents.contains(component)) {
return;
@@ -1464,7 +1463,6 @@
* @param component The component to add.
*/
protected void addXML11Component(XMLComponent component) {
- //System.out.println("Adding XML 1.1: " + component);
// don't add a component more than once
if (fXML11Components.contains(component)) {
return;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
