curcuru 00/07/19 07:35:36
Modified: src/org/apache/xalan/xpath/xml FormatterToDOM.java
src/org/apache/xalan/xslt StylesheetRoot.java
Log:
Fix problem initiating output with FormatterToDOM
PR:DMAN4M6PK5
Submitted by:<[EMAIL PROTECTED]>
Revision Changes Path
1.10 +4 -3
xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToDOM.java
Index: FormatterToDOM.java
===================================================================
RCS file:
/home/cvs/xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToDOM.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FormatterToDOM.java 2000/03/16 17:33:36 1.9
+++ FormatterToDOM.java 2000/07/19 14:35:35 1.10
@@ -258,7 +258,8 @@
elem.setAttribute(atts.getName(i), atts.getValue(i));
}
append(elem);
- m_elemStack.push(elem);
+
+ m_elemStack.push(m_currentNode); // PR:DMAN4M6PK5 Submitted by:<[EMAIL
PROTECTED]> m_currentNode instead of elem
m_currentNode = elem;
}
@@ -280,10 +281,10 @@
public void endElement (String name)
throws SAXException
{
- m_elemStack.pop();
+ // m_elemStack.pop(); // PR:DMAN4M6PK5 Submitted by:<[EMAIL PROTECTED]>
comment out line
if(!m_elemStack.isEmpty())
{
- m_currentNode = (Element)m_elemStack.peek();
+ m_currentNode = (Element)m_elemStack.pop(); // PR:DMAN4M6PK5 Submitted
by:<[EMAIL PROTECTED]> instead of peek
}
else
{
1.36 +2 -2 xml-xalan/src/org/apache/xalan/xslt/StylesheetRoot.java
Index: StylesheetRoot.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/StylesheetRoot.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- StylesheetRoot.java 2000/05/10 20:28:03 1.35
+++ StylesheetRoot.java 2000/07/19 14:35:36 1.36
@@ -399,11 +399,11 @@
processor.m_flistener = new
FormatterToDOM((Document)outputTarget.getNode());
break;
case Node.DOCUMENT_FRAGMENT_NODE:
- processor.m_flistener = new
FormatterToDOM(processor.m_parserLiaison.createDocument(),
+ processor.m_flistener = new
FormatterToDOM(outputTarget.getNode().getOwnerDocument(), // PR:DMAN4M6PK5
Submitted by:<[EMAIL PROTECTED]>
(DocumentFragment)outputTarget.getNode());
break;
case Node.ELEMENT_NODE:
- processor.m_flistener = new
FormatterToDOM(processor.m_parserLiaison.createDocument(),
+ processor.m_flistener = new
FormatterToDOM(outputTarget.getNode().getOwnerDocument(), // PR:DMAN4M6PK5
Submitted by:<[EMAIL PROTECTED]>
(Element)outputTarget.getNode());
break;
default:
