mmidy 00/02/28 14:03:37
Modified: src/org/apache/xalan/xpath/xml FormatterToHTML.java
FormatterToXML.java
src/org/apache/xalan/xslt ElemCopyOf.java
Log:
New constructor in FormatterToXML and FormatterToHTML
Revision Changes Path
1.26 +12 -0
xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToHTML.java
Index: FormatterToHTML.java
===================================================================
RCS file:
/home/cvs/xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToHTML.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- FormatterToHTML.java 2000/02/23 06:07:04 1.25
+++ FormatterToHTML.java 2000/02/28 22:03:37 1.26
@@ -341,6 +341,18 @@
}
/**
+ * Constructor using an output stream, and a simple OutputFormat.
+ * @param writer The character output stream to use.
+ */
+ public FormatterToHTML(java.io.OutputStream os)
+ throws java.io.UnsupportedEncodingException
+ {
+ initEncodings();
+ this.init(os, new org.apache.xml.serialize.OutputFormat( "html",
"UTF-8", false ));
+ }
+
+
+ /**
* Constructor using a writer.
* @param writer The character output stream to use.
*/
1.28 +11 -0
xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToXML.java
Index: FormatterToXML.java
===================================================================
RCS file:
/home/cvs/xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToXML.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- FormatterToXML.java 2000/02/23 17:09:44 1.27
+++ FormatterToXML.java 2000/02/28 22:03:37 1.28
@@ -334,6 +334,17 @@
}
/**
+ * Constructor using an output stream, and a simple OutputFormat.
+ * @param writer The character output stream to use.
+ */
+ public FormatterToXML(java.io.OutputStream os)
+ throws UnsupportedEncodingException
+ {
+ initEncodings();
+ this.init(os, new org.apache.xml.serialize.OutputFormat( "xml", "UTF-8",
false ));
+ }
+
+ /**
* Constructor using a writer.
* @param writer The character output stream to use.
*/
1.11 +0 -9 xml-xalan/src/org/apache/xalan/xslt/ElemCopyOf.java
Index: ElemCopyOf.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/ElemCopyOf.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemCopyOf.java 2000/02/26 00:14:44 1.10
+++ ElemCopyOf.java 2000/02/28 22:03:37 1.11
@@ -110,15 +110,6 @@
{
super.execute(processor, sourceTree, sourceNode, mode);
XPathSupport execContext = processor.getXMLProcessorLiaison();
- /* Where did this come from? -sb
- if(Node.ELEMENT_NODE == sourceNode.getNodeType())
- {
- processor.copyAttributesToAttList( (Element)sourceNode,
- m_stylesheet.m_stylesheetRoot,
- processor.m_pendingAttributes );
- processor.copySourceNSAttrs(sourceNode, processor.m_pendingAttributes);
- }
- */
XObject value = m_selectPattern.execute(execContext, sourceNode, this);
if(null != m_stylesheet.m_stylesheetRoot.m_traceListeners)
