You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by an...@apache.org on 2001/07/26 10:19:26 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/xni/parser XMLParseException.java
andyc 01/07/26 01:19:26
Modified: java/src/org/apache/xerces/impl Tag: xerces_j_2
XMLErrorReporter.java
java/src/org/apache/xerces/util Tag: xerces_j_2
ErrorHandlerWrapper.java
java/src/org/apache/xerces/xni/parser Tag: xerces_j_2
XMLParseException.java
Log:
More slight XMLLocator changes.
Revision Changes Path
No revision
No revision
1.1.2.13 +2 -7 xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLErrorReporter.java
Index: XMLErrorReporter.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLErrorReporter.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- XMLErrorReporter.java 2001/07/26 08:03:36 1.1.2.12
+++ XMLErrorReporter.java 2001/07/26 08:19:26 1.1.2.13
@@ -106,7 +106,7 @@
* @author Eric Ye, IBM
* @author Andy Clark, IBM
*
- * @version $Id: XMLErrorReporter.java,v 1.1.2.12 2001/07/26 08:03:36 andyc Exp $
+ * @version $Id: XMLErrorReporter.java,v 1.1.2.13 2001/07/26 08:19:26 andyc Exp $
*/
public class XMLErrorReporter
implements XMLComponent {
@@ -322,12 +322,7 @@
MessageFormatter messageFormatter = getMessageFormatter(domain);
String message = messageFormatter.formatMessage(fLocale, key, arguments);
XMLParseException parseException =
- new XMLParseException(location.getPublicId(),
- location.getSystemId(),
- location.getBaseSystemId(),
- location.getLineNumber(),
- location.getColumnNumber(),
- message);
+ new XMLParseException(location, message);
// get error handler
XMLErrorHandler errorHandler = fErrorHandler;
No revision
No revision
1.1.2.2 +14 -7 xml-xerces/java/src/org/apache/xerces/util/Attic/ErrorHandlerWrapper.java
Index: ErrorHandlerWrapper.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/util/Attic/ErrorHandlerWrapper.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ErrorHandlerWrapper.java 2001/07/24 08:10:35 1.1.2.1
+++ ErrorHandlerWrapper.java 2001/07/26 08:19:26 1.1.2.2
@@ -61,6 +61,7 @@
import java.io.IOException;
import java.io.Reader;
+import org.apache.xerces.xni.XMLLocator;
import org.apache.xerces.xni.XNIException;
import org.apache.xerces.xni.parser.XMLErrorHandler;
import org.apache.xerces.xni.parser.XMLParseException;
@@ -76,7 +77,7 @@
*
* @author Andy Clark, IBM
*
- * @version $Id: ErrorHandlerWrapper.java,v 1.1.2.1 2001/07/24 08:10:35 andyc Exp $
+ * @version $Id: ErrorHandlerWrapper.java,v 1.1.2.2 2001/07/26 08:19:26 andyc Exp $
*/
public class ErrorHandlerWrapper
implements XMLErrorHandler {
@@ -229,12 +230,18 @@
/** Creates a XMLParseException from an SAXParseException. */
protected static XMLParseException createXMLParseException(SAXParseException exception) {
- return new XMLParseException(exception.getPublicId(),
- exception.getSystemId(),
- null,
- exception.getLineNumber(),
- exception.getColumnNumber(),
- exception.getMessage(),
+ final String fPublicId = exception.getPublicId();
+ final String fSystemId = exception.getSystemId();
+ final int fLineNumber = exception.getLineNumber();
+ final int fColumnNumber = exception.getColumnNumber();
+ XMLLocator location = new XMLLocator() {
+ public String getPublicId() { return fPublicId; }
+ public String getSystemId() { return fSystemId; }
+ public String getBaseSystemId() { return null; }
+ public int getColumnNumber() { return fColumnNumber; }
+ public int getLineNumber() { return fLineNumber; }
+ };
+ return new XMLParseException(location, exception.getMessage(),
exception.getException());
} // createXMLParseException(SAXParseException):XMLParseException
No revision
No revision
1.1.2.2 +16 -20 xml-xerces/java/src/org/apache/xerces/xni/parser/Attic/XMLParseException.java
Index: XMLParseException.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/xni/parser/Attic/XMLParseException.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- XMLParseException.java 2001/07/24 08:10:35 1.1.2.1
+++ XMLParseException.java 2001/07/26 08:19:26 1.1.2.2
@@ -57,6 +57,7 @@
package org.apache.xerces.xni.parser;
+import org.apache.xerces.xni.XMLLocator;
import org.apache.xerces.xni.XNIException;
/**
@@ -66,7 +67,7 @@
*
* @author Andy Clark, IBM
*
- * @version $Id: XMLParseException.java,v 1.1.2.1 2001/07/24 08:10:35 andyc Exp $
+ * @version $Id: XMLParseException.java,v 1.1.2.2 2001/07/26 08:19:26 andyc Exp $
*/
public class XMLParseException
extends XNIException {
@@ -95,30 +96,25 @@
//
/** Constructs a parse exception. */
- public XMLParseException(String publicId, String systemId,
- String baseSystemId,
- int lineNumber, int columnNumber,
- String message) {
+ public XMLParseException(XMLLocator locator, String message) {
super(message);
- fPublicId = publicId;
- fSystemId = systemId;
- fBaseSystemId = baseSystemId;
- fLineNumber = lineNumber;
- fColumnNumber = columnNumber;
- } // <init>(String,String,String,int,int,String)
+ fPublicId = locator.getPublicId();
+ fSystemId = locator.getSystemId();
+ fBaseSystemId = locator.getBaseSystemId();
+ fLineNumber = locator.getLineNumber();
+ fColumnNumber = locator.getColumnNumber();
+ } // <init>(XMLLocator,String)
/** Constructs a parse exception. */
- public XMLParseException(String publicId, String systemId,
- String baseSystemId,
- int lineNumber, int columnNumber,
+ public XMLParseException(XMLLocator locator,
String message, Exception exception) {
super(message, exception);
- fPublicId = publicId;
- fSystemId = systemId;
- fBaseSystemId = baseSystemId;
- fLineNumber = lineNumber;
- fColumnNumber = columnNumber;
- } // <init>(String,String,String,int,int,String,Exception)
+ fPublicId = locator.getPublicId();
+ fSystemId = locator.getSystemId();
+ fBaseSystemId = locator.getBaseSystemId();
+ fLineNumber = locator.getLineNumber();
+ fColumnNumber = locator.getColumnNumber();
+ } // <init>(XMLLocator,String,Exception)
//
// Public methods
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org