elena 2003/11/18 15:08:03
Modified: java/src/org/apache/xerces/parsers AbstractSAXParser.java
java/src/org/apache/xerces/util ErrorHandlerWrapper.java
Log:
Upgrading to SAX 2.0.1. support
Revision Changes Path
1.44 +2 -30
xml-xerces/java/src/org/apache/xerces/parsers/AbstractSAXParser.java
Index: AbstractSAXParser.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/AbstractSAXParser.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- AbstractSAXParser.java 11 Nov 2003 20:15:01 -0000 1.43
+++ AbstractSAXParser.java 18 Nov 2003 23:08:03 -0000 1.44
@@ -1227,10 +1227,6 @@
*/
public void setEntityResolver(EntityResolver resolver) {
- // not per SAX 1, but per SAX 2.0 and JAXP 1.1 expectations
- if(resolver == null) {
- throw new NullPointerException();
- }
try {
fConfiguration.setProperty(ENTITY_RESOLVER,
new EntityResolverWrapper(resolver));
@@ -1280,16 +1276,10 @@
* handler immediately.</p>
*
* @param errorHandler The error handler.
- * @exception java.lang.NullPointerException If the handler
- * argument is null.
* @see #getErrorHandler
*/
public void setErrorHandler(ErrorHandler errorHandler) {
- // not per SAX 1, but per SAX 2.0 and JAXP 1.1 expectations
- if(errorHandler == null) {
- throw new NullPointerException();
- }
try {
fConfiguration.setProperty(ERROR_HANDLER,
new ErrorHandlerWrapper(errorHandler));
@@ -1354,21 +1344,10 @@
*
* @param dtdHandler The DTD handler.
*
- * @exception java.lang.NullPointerException If the handler
- * argument is null.
- *
+
* @see #getDTDHandler
*/
public void setDTDHandler(DTDHandler dtdHandler) {
- // REVISIT: SAX1 doesn't require a null pointer exception
- // to be thrown but SAX2 does. [Q] How do we
- // resolve this? Currently I'm erring on the side
- // of SAX2. -Ac
- // This is what the JCK requires; 2.0 is assumed to supersede the
- // SAX 1 behaviour - neilg
- if (dtdHandler == null) {
- throw new NullPointerException();
- }
fDTDHandler = dtdHandler;
} // setDTDHandler(DTDHandler)
@@ -1411,16 +1390,9 @@
*
* @param contentHandler The content handler.
*
- * @exception java.lang.NullPointerException If the handler
- * argument is null.
- *
* @see #getContentHandler
*/
public void setContentHandler(ContentHandler contentHandler) {
- // not per SAX 1, but per SAX 2.0 and JAXP 1.1 expectations
- if(contentHandler == null) {
- throw new NullPointerException();
- }
fContentHandler = contentHandler;
} // setContentHandler(ContentHandler)
1.9 +40 -31
xml-xerces/java/src/org/apache/xerces/util/ErrorHandlerWrapper.java
Index: ErrorHandlerWrapper.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/util/ErrorHandlerWrapper.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ErrorHandlerWrapper.java 8 May 2003 20:11:59 -0000 1.8
+++ ErrorHandlerWrapper.java 18 Nov 2003 23:08:03 -0000 1.9
@@ -133,17 +133,20 @@
public void warning(String domain, String key,
XMLParseException exception) throws XNIException {
- SAXParseException saxException = createSAXParseException(exception);
- try {
- fErrorHandler.warning(saxException);
+ if (fErrorHandler != null) {
+ SAXParseException saxException = createSAXParseException(exception);
+
+ try {
+ fErrorHandler.warning(saxException);
+ }
+ catch (SAXParseException e) {
+ throw createXMLParseException(e);
+ }
+ catch (SAXException e) {
+ throw createXNIException(e);
+ }
}
- catch (SAXParseException e) {
- throw createXMLParseException(e);
- }
- catch (SAXException e) {
- throw createXNIException(e);
- }
-
+
} // warning(String,String,XMLParseException)
/**
@@ -164,16 +167,19 @@
*/
public void error(String domain, String key,
XMLParseException exception) throws XNIException {
-
- SAXParseException saxException = createSAXParseException(exception);
- try {
- fErrorHandler.error(saxException);
- }
- catch (SAXParseException e) {
- throw createXMLParseException(e);
- }
- catch (SAXException e) {
- throw createXNIException(e);
+
+ if (fErrorHandler != null) {
+ SAXParseException saxException = createSAXParseException(exception);
+
+ try {
+ fErrorHandler.error(saxException);
+ }
+ catch (SAXParseException e) {
+ throw createXMLParseException(e);
+ }
+ catch (SAXException e) {
+ throw createXNIException(e);
+ }
}
} // error(String,String,XMLParseException)
@@ -204,16 +210,19 @@
*/
public void fatalError(String domain, String key,
XMLParseException exception) throws XNIException {
-
- SAXParseException saxException = createSAXParseException(exception);
- try {
- fErrorHandler.fatalError(saxException);
- }
- catch (SAXParseException e) {
- throw createXMLParseException(e);
- }
- catch (SAXException e) {
- throw createXNIException(e);
+
+ if (fErrorHandler != null) {
+ SAXParseException saxException = createSAXParseException(exception);
+
+ try {
+ fErrorHandler.fatalError(saxException);
+ }
+ catch (SAXParseException e) {
+ throw createXMLParseException(e);
+ }
+ catch (SAXException e) {
+ throw createXNIException(e);
+ }
}
} // fatalError(String,String,XMLParseException)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
