mrglavas 2004/08/08 14:24:10
Modified: java/src/org/apache/xerces/jaxp DocumentBuilderImpl.java
Log:
Allow EntityResolver to be unset. Don't need DefaultHandler to set
ErrorHandler to null. The wrapper on the DOMParser checks for
null.
Revision Changes Path
1.25 +5 -20
xml-xerces/java/src/org/apache/xerces/jaxp/DocumentBuilderImpl.java
Index: DocumentBuilderImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/jaxp/DocumentBuilderImpl.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- DocumentBuilderImpl.java 24 Feb 2004 23:15:58 -0000 1.24
+++ DocumentBuilderImpl.java 8 Aug 2004 21:24:10 -0000 1.25
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-
package org.apache.xerces.jaxp;
import java.io.IOException;
@@ -36,7 +35,6 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.helpers.DefaultHandler;
/**
* @author Rajiv Mordani
@@ -46,8 +44,6 @@
public class DocumentBuilderImpl extends DocumentBuilder
implements JAXPConstants
{
- private EntityResolver er = null;
- private ErrorHandler eh = null;
private DOMParser domParser = null;
DocumentBuilderImpl(DocumentBuilderFactory dbf, Hashtable dbfAttrs)
@@ -162,15 +158,6 @@
DOMMessageFormatter.formatMessage(DOMMessageFormatter.DOM_DOMAIN,
"jaxp-null-input-source", null));
}
-
- if (er != null) {
- domParser.setEntityResolver(er);
- }
-
- if (eh != null) {
- domParser.setErrorHandler(eh);
- }
-
domParser.parse(is);
return domParser.getDocument();
}
@@ -193,14 +180,12 @@
}
}
- public void setEntityResolver(org.xml.sax.EntityResolver er) {
- this.er = er;
+ public void setEntityResolver(EntityResolver er) {
+ domParser.setEntityResolver(er);
}
- public void setErrorHandler(org.xml.sax.ErrorHandler eh) {
- // If app passes in a ErrorHandler of null, then ignore all errors
- // and warnings
- this.eh = (eh == null) ? new DefaultHandler() : eh;
+ public void setErrorHandler(ErrorHandler eh) {
+ domParser.setErrorHandler(eh);
}
// package private
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
