mmidy 01/02/13 12:29:01
Modified: java/src/org/apache/xalan/templates ElemCallTemplate.java
ElemChoose.java ElemCopy.java ElemFallback.java
ElemIf.java ElemLiteralResult.java
ElemTemplate.java
java/src/org/apache/xalan/transformer TransformerImpl.java
Log:
Remove extra method/call to TransformerImpl.executeChildTemplates()
Revision Changes Path
1.16 +1 -1
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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ElemCallTemplate.java 2001/01/29 11:47:31 1.15
+++ ElemCallTemplate.java 2001/02/13 20:28:56 1.16
@@ -197,7 +197,7 @@
{
xctxt.setSAXLocator(m_template);
- // template.executeChildTemplates(transformer, sourceNode, mode);
+ // template.executeChildTemplates(transformer, sourceNode, mode,
true);
transformer.pushElemTemplateElement(m_template);
m_template.execute(transformer, sourceNode, mode);
}
1.9 +2 -2
xml-xalan/java/src/org/apache/xalan/templates/ElemChoose.java
Index: ElemChoose.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemChoose.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemChoose.java 2001/01/26 01:26:58 1.8
+++ ElemChoose.java 2001/02/13 20:28:56 1.9
@@ -149,7 +149,7 @@
if ((null != test) && test.bool())
{
- transformer.executeChildTemplates(when, sourceNode, mode);
+ transformer.executeChildTemplates(when, sourceNode, mode, true);
return;
}
@@ -159,7 +159,7 @@
found = true;
// xsl:otherwise
- transformer.executeChildTemplates(childElem, sourceNode, mode);
+ transformer.executeChildTemplates(childElem, sourceNode, mode, true);
return;
}
1.12 +2 -2
xml-xalan/java/src/org/apache/xalan/templates/ElemCopy.java
Index: ElemCopy.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemCopy.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemCopy.java 2000/12/31 09:58:27 1.11
+++ ElemCopy.java 2001/02/13 20:28:57 1.12
@@ -148,7 +148,7 @@
{
super.execute(transformer, sourceNode, mode);
rthandler.processNSDecls(sourceNode);
- transformer.executeChildTemplates(this, sourceNode, mode);
+ transformer.executeChildTemplates(this, sourceNode, mode, true);
DOMHelper dhelper = transformer.getXPathContext().getDOMHelper();
String ns = dhelper.getNamespaceOfNode(sourceNode);
@@ -169,7 +169,7 @@
transformer.getTraceManager().fireTraceEvent(sourceNode, mode,
this);
super.execute(transformer, sourceNode, mode);
- transformer.executeChildTemplates(this, sourceNode, mode);
+ transformer.executeChildTemplates(this, sourceNode, mode, true);
}
}
catch(org.xml.sax.SAXException se)
1.10 +1 -1
xml-xalan/java/src/org/apache/xalan/templates/ElemFallback.java
Index: ElemFallback.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemFallback.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemFallback.java 2001/01/11 10:28:11 1.9
+++ ElemFallback.java 2001/02/13 20:28:57 1.10
@@ -145,7 +145,7 @@
transformer.getTraceManager().fireTraceEvent(sourceNode, mode,
this);
- transformer.executeChildTemplates(this, sourceNode, mode);
+ transformer.executeChildTemplates(this, sourceNode, mode, true);
}
else
1.9 +1 -1 xml-xalan/java/src/org/apache/xalan/templates/ElemIf.java
Index: ElemIf.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemIf.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemIf.java 2001/01/02 03:36:46 1.8
+++ ElemIf.java 2001/02/13 20:28:57 1.9
@@ -163,7 +163,7 @@
if (test.bool())
{
- transformer.executeChildTemplates(this, sourceNode, mode);
+ transformer.executeChildTemplates(this, sourceNode, mode, true);
}
}
}
1.22 +1 -1
xml-xalan/java/src/org/apache/xalan/templates/ElemLiteralResult.java
Index: ElemLiteralResult.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemLiteralResult.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ElemLiteralResult.java 2001/01/29 19:51:05 1.21
+++ ElemLiteralResult.java 2001/02/13 20:28:57 1.22
@@ -736,7 +736,7 @@
// Now process all the elements in this subtree
// TODO: Process m_extensionElementPrefixes && m_attributeSetsNames
- transformer.executeChildTemplates(this, sourceNode, mode);
+ transformer.executeChildTemplates(this, sourceNode, mode, true);
}
catch(TransformerException te)
{
1.12 +1 -1
xml-xalan/java/src/org/apache/xalan/templates/ElemTemplate.java
Index: ElemTemplate.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemTemplate.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemTemplate.java 2001/01/26 01:26:58 1.11
+++ ElemTemplate.java 2001/02/13 20:28:57 1.12
@@ -377,7 +377,7 @@
if (null != sourceNode)
{
- transformer.executeChildTemplates(this, sourceNode, mode);
+ transformer.executeChildTemplates(this, sourceNode, mode, true);
}
else // if(null == sourceNode)
{
1.84 +4 -24
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.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- TransformerImpl.java 2001/02/07 02:07:56 1.83
+++ TransformerImpl.java 2001/02/13 20:28:59 1.84
@@ -1770,7 +1770,7 @@
m_resultTreeHandler.startDocument();
// Do the transformation of the child elements.
- executeChildTemplates(templateParent, sourceNode, mode);
+ executeChildTemplates(templateParent, sourceNode, mode, true);
// Make sure everything is flushed!
this.m_resultTreeHandler.flushPending();
@@ -1870,7 +1870,7 @@
this.m_resultTreeHandler.startDocument();
// Do the transformation of the child elements.
- executeChildTemplates(elem, sourceNode, mode);
+ executeChildTemplates(elem, sourceNode, mode, true);
this.m_resultTreeHandler.endDocument();
result = sw.toString();
@@ -2026,7 +2026,7 @@
if (template.isCompiledTemplate())
template.execute(this, child, mode);
else
- executeChildTemplates(template, child, mode);
+ executeChildTemplates(template, child, mode, true);
}
}
catch(org.xml.sax.SAXException se)
@@ -2065,7 +2065,7 @@
{
getResultTreeHandler().flushPending();
this.setContentHandler(handler);
- executeChildTemplates(elem, sourceNode, mode);
+ executeChildTemplates(elem, sourceNode, mode, true);
}
catch(org.xml.sax.SAXException se)
{
@@ -2075,26 +2075,6 @@
{
this.setContentHandler(savedHandler);
}
- }
-
- /**
- * <meta name="usage" content="advanced"/>
- * Execute each of the children of a template element.
- *
- * @param transformer The XSLT transformer instance.
- *
- * @param elem The ElemTemplateElement that contains the children
- * that should execute.
- * @param sourceNode The current context node.
- * @param mode The current mode.
- *
- * @throws TransformerException
- */
- public void executeChildTemplates(
- ElemTemplateElement elem, Node sourceNode, QName mode)
- throws TransformerException
- {
- executeChildTemplates(elem, sourceNode, mode, true);
}
/**
