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/05/18 00:43:36 UTC
cvs commit: xml-xalan/src/org/apache/xalan/xslt ElemCallTemplate.java ElemChoose.java ElemCopy.java ElemElement.java ElemFallback.java ElemIf.java ElemLiteralResult.java ElemTemplate.java ElemTemplateElement.java XSLProcessorContext.java XSLTEngineImpl.java
sboag 00/05/17 15:43:35
Modified: src/org/apache/xalan/xslt ElemCallTemplate.java
ElemChoose.java ElemCopy.java ElemElement.java
ElemFallback.java ElemIf.java
ElemLiteralResult.java ElemTemplate.java
ElemTemplateElement.java XSLProcessorContext.java
XSLTEngineImpl.java
Log:
transformChildren rename of executeChildren undone.
Revision Changes Path
1.15 +1 -1 xml-xalan/src/org/apache/xalan/xslt/ElemCallTemplate.java
Index: ElemCallTemplate.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/ElemCallTemplate.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ElemCallTemplate.java 2000/05/10 20:28:01 1.14
+++ ElemCallTemplate.java 2000/05/17 22:43:28 1.15
@@ -136,7 +136,7 @@
vars.setCurrentStackFrameIndex(vars.size());
try
{
- // template.transformChildren(processor, sourceTree, sourceNode, mode);
+ // template.executeChildren(processor, sourceTree, sourceNode, mode);
m_template.execute(processor, sourceTree, sourceNode, mode);
}
finally
1.10 +2 -2 xml-xalan/src/org/apache/xalan/xslt/ElemChoose.java
Index: ElemChoose.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/ElemChoose.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemChoose.java 2000/05/10 20:28:01 1.9
+++ ElemChoose.java 2000/05/17 22:43:28 1.10
@@ -129,7 +129,7 @@
if((null != test) && test.bool())
{
- when.transformChildren(processor, sourceTree,
+ when.executeChildren(processor, sourceTree,
sourceNode, mode);
return;
}
@@ -138,7 +138,7 @@
{
found = true;
// xsl:otherwise
- node.transformChildren(processor, sourceTree,
+ node.executeChildren(processor, sourceTree,
sourceNode, mode);
return;
}
1.7 +2 -2 xml-xalan/src/org/apache/xalan/xslt/ElemCopy.java
Index: ElemCopy.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/ElemCopy.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemCopy.java 2000/05/10 20:28:01 1.6
+++ ElemCopy.java 2000/05/17 22:43:28 1.7
@@ -117,7 +117,7 @@
{
super.execute(processor, sourceTree, sourceNode, mode);
processor.copySourceNSAttrs(sourceNode, processor.m_pendingAttributes);
- transformChildren(processor, sourceTree, sourceNode, mode);
+ executeChildren(processor, sourceTree, sourceNode, mode);
processor.m_resultTreeHandler.endElement(sourceNode.getNodeName());
}
else
@@ -142,7 +142,7 @@
mode,
this));
}
- transformChildren(processor, sourceTree, sourceNode, mode);
+ executeChildren(processor, sourceTree, sourceNode, mode);
}
}
1.13 +1 -1 xml-xalan/src/org/apache/xalan/xslt/ElemElement.java
Index: ElemElement.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/ElemElement.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ElemElement.java 2000/05/10 20:28:02 1.12
+++ ElemElement.java 2000/05/17 22:43:29 1.13
@@ -198,7 +198,7 @@
// and stylesheet root declarations).
processResultNS(processor);
- transformChildren(processor, sourceTree,
+ executeChildren(processor, sourceTree,
sourceNode, mode);
}
// Now end the element if name was valid
1.8 +1 -1 xml-xalan/src/org/apache/xalan/xslt/ElemFallback.java
Index: ElemFallback.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/ElemFallback.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemFallback.java 2000/05/10 20:28:02 1.7
+++ ElemFallback.java 2000/05/17 22:43:29 1.8
@@ -118,7 +118,7 @@
{
super.execute(processor, sourceTree, sourceNode, mode);
// XPathSupport execContext = processor.getXMLProcessorLiaison();
- transformChildren(processor, sourceTree,
+ executeChildren(processor, sourceTree,
sourceNode, mode);
}
}
1.7 +1 -1 xml-xalan/src/org/apache/xalan/xslt/ElemIf.java
Index: ElemIf.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/ElemIf.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemIf.java 2000/05/10 20:28:02 1.6
+++ ElemIf.java 2000/05/17 22:43:29 1.7
@@ -134,7 +134,7 @@
}
if(test.bool())
{
- transformChildren(processor, sourceTree,
+ executeChildren(processor, sourceTree,
sourceNode, mode);
}
}
1.22 +1 -1 xml-xalan/src/org/apache/xalan/xslt/ElemLiteralResult.java
Index: ElemLiteralResult.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/ElemLiteralResult.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ElemLiteralResult.java 2000/05/10 20:28:02 1.21
+++ ElemLiteralResult.java 2000/05/17 22:43:30 1.22
@@ -251,7 +251,7 @@
// Now process all the elements in this subtree
// TODO: Process m_extensionElementPrefixes && m_attributeSetsNames
- transformChildren(processor, sourceTree, sourceNode, mode);
+ executeChildren(processor, sourceTree, sourceNode, mode);
processor.m_resultTreeHandler.endElement (m_qname);
}
1.10 +1 -1 xml-xalan/src/org/apache/xalan/xslt/ElemTemplate.java
Index: ElemTemplate.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/ElemTemplate.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemTemplate.java 2000/05/10 20:28:02 1.9
+++ ElemTemplate.java 2000/05/17 22:43:30 1.10
@@ -142,7 +142,7 @@
super.execute(processor, sourceTree, sourceNode, mode);
if(null != sourceNode)
{
- transformChildren(processor, sourceTree, sourceNode, mode);
+ executeChildren(processor, sourceTree, sourceNode, mode);
}
else // if(null == sourceNode)
{
1.34 +5 -4 xml-xalan/src/org/apache/xalan/xslt/ElemTemplateElement.java
Index: ElemTemplateElement.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/ElemTemplateElement.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ElemTemplateElement.java 2000/05/10 20:28:03 1.33
+++ ElemTemplateElement.java 2000/05/17 22:43:30 1.34
@@ -637,7 +637,7 @@
* @exception SAXException Might be thrown from the document() function, or
* from xsl:include or xsl:import.
*/
- public void transformChildren(XSLTEngineImpl processor,
+ public void executeChildren(XSLTEngineImpl processor,
Node sourceTree,
Node sourceNode,
QName mode)
@@ -716,7 +716,7 @@
MutableAttrListImpl savedPendingAttributes = processor.m_pendingAttributes;
processor.m_pendingAttributes = new MutableAttrListImpl();
- transformChildren(processor, sourceTree, sourceNode, mode);
+ executeChildren(processor, sourceTree, sourceNode, mode);
processor.m_pendingElementName = savedPendingName;
processor.m_pendingAttributes = savedPendingAttributes;
@@ -894,7 +894,8 @@
XObject result = selectPattern.execute(execContext, sourceNodeContext,
xslInstruction, callback,
callbackContext, false);
- sourceNodes = result.nodeset();
+ if(null != result)
+ sourceNodes = result.nodeset();
if(null != m_stylesheet.m_stylesheetRoot.m_traceListeners)
{
m_stylesheet.m_stylesheetRoot.fireSelectedEvent(new SelectionEvent(tcontext,
@@ -1191,7 +1192,7 @@
template);
m_stylesheet.m_stylesheetRoot.fireTraceEvent(te);
}
- template.transformChildren(transformContext, sourceTree, child, mode);
+ template.executeChildren(transformContext, sourceTree, child, mode);
}
}
}
1.5 +1 -1 xml-xalan/src/org/apache/xalan/xslt/XSLProcessorContext.java
Index: XSLProcessorContext.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/XSLProcessorContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSLProcessorContext.java 2000/05/10 20:28:03 1.4
+++ XSLProcessorContext.java 2000/05/17 22:43:30 1.5
@@ -90,7 +90,7 @@
* user can call to process the transformation of a node but not
* serialize out automatically. ????????????????
*
- * Does ElemTemplateElement.transformChildren() cut it? It sends
+ * Does ElemTemplateElement.executeChildren() cut it? It sends
* results out to the stream directly, so that could be a problem.
*/
}
1.63 +2 -2 xml-xalan/src/org/apache/xalan/xslt/XSLTEngineImpl.java
Index: XSLTEngineImpl.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/XSLTEngineImpl.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- XSLTEngineImpl.java 2000/05/10 20:28:03 1.62
+++ XSLTEngineImpl.java 2000/05/17 22:43:31 1.63
@@ -2092,7 +2092,7 @@
m_flistener = new FormatterToDOM(getDOMFactory(), resultFragment);
- templateParent.transformChildren(this, sourceTree, sourceNode, mode);
+ templateParent.executeChildren(this, sourceTree, sourceNode, mode);
// flushPending();
this.m_pendingElementName = savedPendingName;
@@ -2138,7 +2138,7 @@
m_pendingAttributes = new MutableAttrListImpl();
m_flistener = flistener;
- templateParent.transformChildren(this, sourceTree, sourceNode, mode);
+ templateParent.executeChildren(this, sourceTree, sourceNode, mode);
flushPending();
m_flistener = savedFormatterListener;