You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mm...@apache.org on 2001/02/02 20:17:48 UTC
cvs commit: xml-xalan/java/compat_src/org/apache/xalan/xslt XSLTEngineImpl.java
mmidy 01/02/02 11:17:47
Modified: java/compat_src/org/apache/xalan/xslt XSLTEngineImpl.java
Log:
Fix problem with calling the processor with a liaison
Revision Changes Path
1.20 +15 -12 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- XSLTEngineImpl.java 2001/01/26 18:21:53 1.19
+++ XSLTEngineImpl.java 2001/02/02 19:17:42 1.20
@@ -214,15 +214,15 @@
public XSLTEngineImpl(String liaisonClassName)
throws SAXException
{
- TransformerFactory m_tfactory = TransformerFactory.newInstance();
+ m_tfactory = TransformerFactory.newInstance();
m_problemListener = new ProblemListenerDefault();
try
{
m_liaison = (DOM2Helper)(Class.forName(liaisonClassName).newInstance());
- org.apache.xpath.XPathContext xctxt = this.getTransformer().getXPathContext();
+ //org.apache.xpath.XPathContext xctxt = this.getTransformer().getXPathContext();
- xctxt.setDOMHelper(m_liaison);
+ //xctxt.setDOMHelper(m_liaison);
}
catch (ClassNotFoundException e1)
{
@@ -264,13 +264,13 @@
public XSLTEngineImpl(XMLParserLiaison parserLiaison)
throws org.xml.sax.SAXException
{
- TransformerFactory m_tfactory = TransformerFactory.newInstance();
+ m_tfactory = TransformerFactory.newInstance();
m_problemListener = new ProblemListenerDefault();
m_liaison = (DOM2Helper)parserLiaison;
- org.apache.xpath.XPathContext xctxt = this.getTransformer().getXPathContext();
+ // org.apache.xpath.XPathContext xctxt = this.getTransformer().getXPathContext();
- xctxt.setDOMHelper(m_liaison);
+ //xctxt.setDOMHelper(m_liaison);
}
/**
@@ -290,9 +290,9 @@
m_problemListener = new ProblemListenerDefault();
m_liaison = (DOM2Helper)parserLiaison;
- org.apache.xpath.XPathContext xctxt = this.getTransformer().getXPathContext();
+ // org.apache.xpath.XPathContext xctxt = this.getTransformer().getXPathContext();
- xctxt.setDOMHelper(m_liaison);
+ //xctxt.setDOMHelper(m_liaison);
}
/**
@@ -454,6 +454,9 @@
m_transformerImpl = (TransformerImpl)templates.newTransformer();
if (m_problemListener != null)
m_transformerImpl.setErrorListener(m_problemListener);
+ if (m_liaison != null)
+ m_transformerImpl.getXPathContext().setDOMHelper(m_liaison);
+
}
catch (TransformerConfigurationException tce)
{
@@ -583,12 +586,12 @@
stylesheetProcessor.pushStylesheet(m_stylesheetRoot.getObject());
diag("========= Parsing "+xslIdentifier+" ==========");
pushTime(xslIdentifier);
- String liaisonClassName = System.getProperty("org.apache.xalan.source.liaison");
+ //String liaisonClassName = System.getProperty("org.apache.xalan.source.liaison");
- if(null != liaisonClassName)
+ if(null != m_liaison)
{
- DOM2Helper liaison = (DOM2Helper)(Class.forName(liaisonClassName).newInstance());
- liaison.parse(SAXSource.sourceToInputSource(ssSource));
+ // DOM2Helper liaison = (DOM2Helper)(Class.forName(liaisonClassName).newInstance());
+ m_liaison.parse(SAXSource.sourceToInputSource(ssSource));
}
if(null != m_diagnosticsPrintWriter)
displayDuration("Parse of "+xslIdentifier, xslIdentifier);