sboag 01/01/09 16:01:50
Modified: java/src/org/apache/xalan/transformer TransformerImpl.java
Log:
Change exception handling to use SAXSourceLocator(SAXParseException spe)
and call the m_errorHandler, in transform(Source source).
Somewhat changed from the patch that David Eisenberg <[EMAIL PROTECTED]>
sent in, 01/09/2001 03:55 PM.
Revision Changes Path
1.74 +7 -13
xml-xalan/java/src/org/apache/xalan/transformer/TransformerImpl.java
Index: TransformerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TransformerImpl.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- TransformerImpl.java 2001/01/09 22:41:38 1.73
+++ TransformerImpl.java 2001/01/10 00:01:49 1.74
@@ -97,6 +97,7 @@
import org.apache.xml.utils.QName;
import org.apache.xml.utils.PrefixResolver;
import org.apache.xml.utils.ObjectPool;
+import org.apache.xml.utils.SAXSourceLocator;
import org.apache.xpath.XPathContext;
import org.apache.xpath.NodeSet;
import org.apache.xpath.objects.XObject;
@@ -633,25 +634,18 @@
// Patch attributed to David Eisenberg <[EMAIL PROTECTED]>
catch (org.xml.sax.SAXParseException spe)
{
- String msg = spe.getMessage();
- if (spe.getLineNumber() >= 0 && spe.getColumnNumber() >= 0)
- {
- msg += "\nLine " + spe.getLineNumber() +
- " Column " + spe.getColumnNumber();
- }
- else
- {
- msg += "\n(no line number info available)";
- }
- throw new TransformerException( msg );
+ String msg = spe.getMessage();
+ SAXSourceLocator loc = new SAXSourceLocator(spe);
+
+ m_errorHandler.fatalError(new TransformerException( msg, loc ));
}
catch(org.xml.sax.SAXException se)
{
- throw new TransformerException(se);
+ m_errorHandler.fatalError(new TransformerException( se ));
}
catch (IOException ioe)
{
- throw new TransformerException(ioe);
+ m_errorHandler.fatalError(new TransformerException( ioe ));
}
finally
{
