This commit is contained in:
Arjen Poutsma
2006-10-15 23:03:20 +00:00
parent f740700d1e
commit c985292b4d
2 changed files with 7 additions and 17 deletions

View File

@@ -17,7 +17,6 @@
package org.springframework.xml.stream;
import java.util.Iterator;
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
@@ -30,12 +29,11 @@ import javax.xml.stream.events.ProcessingInstruction;
import javax.xml.stream.events.StartElement;
import javax.xml.stream.events.XMLEvent;
import org.springframework.xml.namespace.QNameUtils;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
import org.springframework.xml.namespace.QNameUtils;
/**
* SAX <code>XMLReader</code> that reads from a StAX <code>XMLEventReader</code>. Consumes <code>XMLEvents</code> from
* an <code>XMLEventReader</code>, and calls the corresponding methods on the SAX callback interfaces.
@@ -142,8 +140,8 @@ public class StaxEventXmlReader extends StaxXmlReader {
}
private void handleNotationDeclaration(NotationDeclaration declaration) throws SAXException {
if (getDtdHandler() != null) {
getDtdHandler().notationDecl(declaration.getName(), declaration.getPublicId(), declaration.getSystemId());
if (getDTDHandler() != null) {
getDTDHandler().notationDecl(declaration.getName(), declaration.getPublicId(), declaration.getSystemId());
}
}

View File

@@ -57,12 +57,12 @@ public abstract class StaxXmlReader implements XMLReader {
this.contentHandler = contentHandler;
}
public DTDHandler getDtdHandler() {
return dtdHandler;
public void setDTDHandler(DTDHandler dtdHandler) {
this.dtdHandler = dtdHandler;
}
public void setDtdHandler(DTDHandler dtdHandler) {
this.dtdHandler = dtdHandler;
public DTDHandler getDTDHandler() {
return dtdHandler;
}
public EntityResolver getEntityResolver() {
@@ -117,14 +117,6 @@ public abstract class StaxXmlReader implements XMLReader {
throw new SAXNotRecognizedException(name);
}
public void setDTDHandler(DTDHandler dtdHandler) {
this.setDtdHandler(dtdHandler);
}
public DTDHandler getDTDHandler() {
return getDtdHandler();
}
/**
* Parses the StAX XML reader passed at construction-time.
* <p/>