[Babeldoc-devel] babeldoc/modules/conversion/src/com/babeldoc/conversion ConversionHelper.java,1.1,1.2

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion
In directory sc8-pr-cvs1:/tmp/cvs-serv5825/src/com/babeldoc/conversion

Modified Files:
	ConversionHelper.java 
Log Message:
conversion code now can alter the output xml document

Index: ConversionHelper.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/ConversionHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConversionHelper.java	19 Jul 2003 13:16:47 -0000	1.1
--- ConversionHelper.java	7 Aug 2003 21:09:02 -0000	1.2
***************
*** 22,32 ****
     * @param document dom4j document
     * @param out the output stream to render to
     * @throws ConversionException
     */
!   public static void render(Document document, OutputStream out)
        throws ConversionException {
      try {
        OutputFormat outformat = OutputFormat.createPrettyPrint();
! //      outformat.setEncoding(aEncodingScheme);
        XMLWriter writer = new XMLWriter(out, outformat);
        writer.write(document);
--- 22,35 ----
     * @param document dom4j document
     * @param out the output stream to render to
+    * @param encoding the encoding to use (null for default)
     * @throws ConversionException
     */
!   public static void render(Document document, OutputStream out, String encoding)
        throws ConversionException {
      try {
        OutputFormat outformat = OutputFormat.createPrettyPrint();
!       if(encoding!=null) {
!         outformat.setEncoding(encoding);
!       }
        XMLWriter writer = new XMLWriter(out, outformat);
        writer.write(document);
***************
*** 42,52 ****
     * @param document the dom4j document
     * @param pdoc the parent pipeline document
     * @return new pipeline document
     * @throws ConversionException
     */
!   public static PipelineDocument render(Document document, PipelineDocument pdoc)
        throws ConversionException {
      try {
        OutputFormat outformat = OutputFormat.createCompactFormat();
        StringWriter stringWriter = new StringWriter();
        XMLWriter writer = new XMLWriter(stringWriter, outformat);
--- 45,60 ----
     * @param document the dom4j document
     * @param pdoc the parent pipeline document
+    * @param encoding the output encoding format
     * @return new pipeline document
     * @throws ConversionException
     */
!   public static PipelineDocument render(Document document, PipelineDocument pdoc,
!                                         String encoding)
        throws ConversionException {
      try {
        OutputFormat outformat = OutputFormat.createCompactFormat();
+       if(encoding!=null) {
+         outformat.setEncoding(encoding);
+       }
        StringWriter stringWriter = new StringWriter();
        XMLWriter writer = new XMLWriter(stringWriter, outformat);