mmidy 01/01/22 14:33:21
Modified: java/compat_src/org/apache/xalan/xslt XSLTEngineImpl.java
Log:
Fix problemListener interface and displayDuration()
Revision Changes Path
1.8 +27 -8
xml-xalan/java/compat_src/org/apache/xalan/xslt/XSLTEngineImpl.java
Index: XSLTEngineImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/compat_src/org/apache/xalan/xslt/XSLTEngineImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XSLTEngineImpl.java 2001/01/22 21:03:43 1.7
+++ XSLTEngineImpl.java 2001/01/22 22:33:20 1.8
@@ -1400,7 +1400,11 @@
{
}
- DefaultErrorHandler handler =
(DefaultErrorHandler)m_tfactory.getErrorListener();
+ DefaultErrorHandler handler;
+ if (m_problemListener == null)
+ handler = (DefaultErrorHandler)m_tfactory.getErrorListener();
+ else
+ handler = (DefaultErrorHandler)m_problemListener.getErrorHandler();
TransformerException te = (null == e) ? new TransformerException(fmsg,
locator) :
new TransformerException(fmsg,
locator, e);
if(null != handler)
@@ -1435,7 +1439,11 @@
catch (TransformerConfigurationException tce)
{
}
- DefaultErrorHandler handler =
(DefaultErrorHandler)m_tfactory.getErrorListener();
+ DefaultErrorHandler handler;
+ if (m_problemListener == null)
+ handler = (DefaultErrorHandler)m_tfactory.getErrorListener();
+ else
+ handler = (DefaultErrorHandler)m_problemListener.getErrorHandler();
TransformerException te = (null == e) ? new TransformerException(msg,
locator) :
new TransformerException(msg,
locator, e);
if(null != handler)
@@ -1509,7 +1517,11 @@
catch (TransformerConfigurationException tce)
{
}
- DefaultErrorHandler handler =
(DefaultErrorHandler)m_tfactory.getErrorListener();
+ DefaultErrorHandler handler;
+ if (m_problemListener == null)
+ handler = (DefaultErrorHandler)m_tfactory.getErrorListener();
+ else
+ handler = (DefaultErrorHandler)m_problemListener.getErrorHandler();
TransformerException te = (null == e) ? new TransformerException(fmsg,
locator) :
new TransformerException(fmsg,
locator, e);
if(null != handler)
@@ -1558,7 +1570,11 @@
catch (TransformerConfigurationException tce)
{
}
- DefaultErrorHandler handler =
(DefaultErrorHandler)m_tfactory.getErrorListener();
+ DefaultErrorHandler handler;
+ if (m_problemListener == null)
+ handler = (DefaultErrorHandler)m_tfactory.getErrorListener();
+ else
+ handler = (DefaultErrorHandler)m_problemListener.getErrorHandler();
TransformerException te = (null == e) ? new TransformerException(fmsg,
locator) :
new TransformerException(fmsg,
locator, e);
if(null != handler)
@@ -1614,9 +1630,9 @@
long millisecondsDuration = 0;
if(null != key)
{
- Date date1 = (Date)m_durationsTable.get(key);
- Date date2 = new Date();
- millisecondsDuration = date2.getTime() - date1.getTime();
+ long start = ((Long)m_durationsTable.get(key)).longValue();
+ long stop = System.currentTimeMillis();
+ millisecondsDuration = stop - start;
if(null != m_diagnosticsPrintWriter)
{
m_diagnosticsPrintWriter.println(info + " took " +
millisecondsDuration + " milliseconds");
@@ -2368,7 +2384,10 @@
*/
public void setProblemListener(ProblemListener l)
{
- m_problemListener = new
ProblemListenerDefault((DefaultErrorHandler)m_tfactory.getErrorListener(), l);
+ if (l instanceof ProblemListenerDefault)
+ m_problemListener = (ProblemListenerDefault)l;
+ else
+ m_problemListener = new
ProblemListenerDefault((DefaultErrorHandler)m_tfactory.getErrorListener(), l);
}
/**
