You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by sb...@locus.apache.org on 2000/07/23 19:45:06 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/templates ElemCallTemplate.java ElemExtensionCall.java
sboag 00/07/23 10:45:05
Modified: java/src/org/apache/xalan/templates ElemCallTemplate.java
ElemExtensionCall.java
Log:
Push and pop the template for TransformerClient support.
Revision Changes Path
1.3 +2 -0 xml-xalan/java/src/org/apache/xalan/templates/ElemCallTemplate.java
Index: ElemCallTemplate.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemCallTemplate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ElemCallTemplate.java 2000/07/05 14:39:57 1.2
+++ ElemCallTemplate.java 2000/07/23 17:45:05 1.3
@@ -160,10 +160,12 @@
{
xctxt.setSAXLocator(m_template);
// template.executeChildTemplates(transformer, sourceNode, mode);
+ transformer.pushElemTemplateElement(m_template, sourceNode);
m_template.execute(transformer, sourceNode, mode);
}
finally
{
+ transformer.popElemTemplateElement();
xctxt.setSAXLocator(savedLocator);
vars.popCurrentContext();
vars.setCurrentStackFrameIndex(selectStackFrameIndex);
1.3 +9 -1 xml-xalan/java/src/org/apache/xalan/templates/ElemExtensionCall.java
Index: ElemExtensionCall.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemExtensionCall.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ElemExtensionCall.java 2000/07/05 14:40:07 1.2
+++ ElemExtensionCall.java 2000/07/23 17:45:05 1.3
@@ -167,7 +167,15 @@
{
if(child.getXSLToken() == Constants.ELEMNAME_FALLBACK)
{
- child.execute(transformer, sourceNode, mode);
+ try
+ {
+ transformer.pushElemTemplateElement(child, sourceNode);
+ child.execute(transformer, sourceNode, mode);
+ }
+ finally
+ {
+ transformer.popElemTemplateElement();
+ }
}
}
}
Re: cvs commit: xml-xalan/java/src/org/apache/xalan/templates
ElemCallTemplate.java ElemExtensionCall.java
Posted by Dirk-Willem van Gulik <di...@covalent.net>.
On 23 Jul 2000 sboag@locus.apache.org wrote:
> sboag 00/07/23 10:45:05
>
> Modified: java/src/org/apache/xalan/templates ElemCallTemplate.java
> ElemExtensionCall.java
> Log:
> Push and pop the template for TransformerClient support.
>
> Revision Changes Path
> 1.3 +2 -0 xml-xalan/java/src/org/apache/xalan/templates/ElemCallTemplate.java
>
> Index: ElemCallTemplate.java
> ===================================================================
> RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemCallTemplate.java,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- ElemCallTemplate.java 2000/07/05 14:39:57 1.2
> +++ ElemCallTemplate.java 2000/07/23 17:45:05 1.3
> @@ -160,10 +160,12 @@
> {
> xctxt.setSAXLocator(m_template);
> // template.executeChildTemplates(transformer, sourceNode, mode);
> + transformer.pushElemTemplateElement(m_template, sourceNode);
> m_template.execute(transformer, sourceNode, mode);
> }
> finally
> {
> + transformer.popElemTemplateElement();
> xctxt.setSAXLocator(savedLocator);
> vars.popCurrentContext();
> vars.setCurrentStackFrameIndex(selectStackFrameIndex);
>
>
>
> 1.3 +9 -1 xml-xalan/java/src/org/apache/xalan/templates/ElemExtensionCall.java
>
> Index: ElemExtensionCall.java
> ===================================================================
> RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemExtensionCall.java,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- ElemExtensionCall.java 2000/07/05 14:40:07 1.2
> +++ ElemExtensionCall.java 2000/07/23 17:45:05 1.3
> @@ -167,7 +167,15 @@
> {
> if(child.getXSLToken() == Constants.ELEMNAME_FALLBACK)
> {
> - child.execute(transformer, sourceNode, mode);
> + try
> + {
> + transformer.pushElemTemplateElement(child, sourceNode);
> + child.execute(transformer, sourceNode, mode);
> + }
> + finally
> + {
> + transformer.popElemTemplateElement();
> + }
> }
> }
> }
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
> For additional commands, e-mail: xalan-cvs-help@xml.apache.org
>
Re: cvs commit: xml-xalan/java/src/org/apache/xalan/templates
ElemCallTemplate.java ElemExtensionCall.java
Posted by Dirk-Willem van Gulik <di...@covalent.net>.
On 23 Jul 2000 sboag@locus.apache.org wrote:
> sboag 00/07/23 10:45:05
>
> Modified: java/src/org/apache/xalan/templates ElemCallTemplate.java
> ElemExtensionCall.java
> Log:
> Push and pop the template for TransformerClient support.
>
> Revision Changes Path
> 1.3 +2 -0 xml-xalan/java/src/org/apache/xalan/templates/ElemCallTemplate.java
>
> Index: ElemCallTemplate.java
> ===================================================================
> RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemCallTemplate.java,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- ElemCallTemplate.java 2000/07/05 14:39:57 1.2
> +++ ElemCallTemplate.java 2000/07/23 17:45:05 1.3
> @@ -160,10 +160,12 @@
> {
> xctxt.setSAXLocator(m_template);
> // template.executeChildTemplates(transformer, sourceNode, mode);
> + transformer.pushElemTemplateElement(m_template, sourceNode);
> m_template.execute(transformer, sourceNode, mode);
> }
> finally
> {
> + transformer.popElemTemplateElement();
> xctxt.setSAXLocator(savedLocator);
> vars.popCurrentContext();
> vars.setCurrentStackFrameIndex(selectStackFrameIndex);
>
>
>
> 1.3 +9 -1 xml-xalan/java/src/org/apache/xalan/templates/ElemExtensionCall.java
>
> Index: ElemExtensionCall.java
> ===================================================================
> RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemExtensionCall.java,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- ElemExtensionCall.java 2000/07/05 14:40:07 1.2
> +++ ElemExtensionCall.java 2000/07/23 17:45:05 1.3
> @@ -167,7 +167,15 @@
> {
> if(child.getXSLToken() == Constants.ELEMNAME_FALLBACK)
> {
> - child.execute(transformer, sourceNode, mode);
> + try
> + {
> + transformer.pushElemTemplateElement(child, sourceNode);
> + child.execute(transformer, sourceNode, mode);
> + }
> + finally
> + {
> + transformer.popElemTemplateElement();
> + }
> }
> }
> }
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
> For additional commands, e-mail: xalan-cvs-help@xml.apache.org
>