You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by bc...@apache.org on 2004/09/27 09:42:27 UTC

cvs commit: xml-fop/src/java/org/apache/fop/tools TestConverter.java

bckfnn      2004/09/27 00:42:27

  Modified:    src/java/org/apache/fop/tools TestConverter.java
  Log:
  Support -rtf output option.
  
  Revision  Changes    Path
  1.22      +17 -2     xml-fop/src/java/org/apache/fop/tools/TestConverter.java
  
  Index: TestConverter.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/tools/TestConverter.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- TestConverter.java	25 Jul 2004 17:04:44 -0000	1.21
  +++ TestConverter.java	27 Sep 2004 07:42:27 -0000	1.22
  @@ -103,6 +103,8 @@
                   tc.setFailOnly(true);
               } else if (args[count].equals("-pdf")) {
                   tc.setRenderType(Fop.RENDER_PDF);
  +            } else if (args[count].equals("-rtf")) {
  +                tc.setRenderType(Fop.RENDER_RTF);
               } else if (args[count].equals("-d")) {
                   tc.setDebug(true);
               } else if (args[count].equals("-b")) {
  @@ -313,8 +315,8 @@
               if (outname.endsWith(".xml") || outname.endsWith(".pdf")) {
                   outname = outname.substring(0, outname.length() - 4);
               }
  -            File outputFile = new File(destdir, // assuming only RENDER_PDF or RENDER_XML here
  -                                 outname + ((renderType==Fop.RENDER_PDF) ? ".pdf" : ".at.xml"));
  +            File outputFile = new File(destdir, 
  +                                       outname + makeResultExtension());
   
               outputFile.getParentFile().mkdirs();
               OutputStream outStream = new java.io.BufferedOutputStream(
  @@ -335,6 +337,19 @@
               }
           } catch (Exception e) {
               getLogger().error("Error while running tests", e);
  +        }
  +    }
  +
  +    /**
  +     * Return a suitable file extension for the output format.
  +     */
  +    private String makeResultExtension() {
  +        if (renderType == Fop.RENDER_PDF) {
  +           return ".pdf";
  +        } else if (renderType == Fop.RENDER_RTF) {
  +           return ".rtf";
  +        } else {
  +            return ".at.xml";
           }
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org