Author: sletellier Date: 2011-08-18 14:24:08 +0200 (Thu, 18 Aug 2011) New Revision: 610 Url: http://nuiton.org/repositories/revision/jrst/610 Log: Retrieve outputEncoding and inputEncoding for generate method Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-08-18 12:11:06 UTC (rev 609) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-08-18 12:24:08 UTC (rev 610) @@ -27,20 +27,7 @@ import java.awt.GraphicsDevice; import java.awt.GraphicsEnvironment; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.Reader; -import java.io.StringReader; -import java.io.StringWriter; -import java.io.Writer; +import java.io.*; import java.net.URL; import java.util.HashMap; import java.util.List; @@ -284,10 +271,11 @@ public static void generate(String xslListOrOutType, File fileIn, File fileOut, Overwrite overwrite) throws Exception { - generate(xslListOrOutType, fileIn, fileOut, UTF_8, overwrite); + + generate(xslListOrOutType, fileIn, UTF_8, fileOut, UTF_8, overwrite); } - public static void generate(String xslListOrOutType, File fileIn, + public static void generate(String xslListOrOutType, File fileIn, String inputEncoding, File fileOut, String outputEncoding, Overwrite overwrite) throws Exception { if (fileOut != null @@ -299,12 +287,20 @@ log.info("Don't generate file " + fileOut + ", because already exists"); } else { + + // In URL url = fileIn.toURI().toURL(); - Reader reader = new InputStreamReader(url.openStream(), outputEncoding); - FileWriter writer = new FileWriter(fileOut); + Reader reader = new InputStreamReader(url.openStream(), inputEncoding); + + // Out + FileOutputStream outputStream = new FileOutputStream(fileOut); + OutputStreamWriter writer = new OutputStreamWriter(outputStream, outputEncoding); + + // Generate String result = generateString(xslListOrOutType, reader); fileOut.getAbsoluteFile().getParentFile().mkdirs(); + // generation PDF if (xslListOrOutType.equals("pdf")) { FopFactory fopFactory = FopFactory.newInstance();