From 2be193a42f76a48ed2ead2c610d7742ff89b6b9b Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Thu, 9 Oct 2003 08:15:33 +0000 Subject: [PATCH] Use encoding for output as well git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275430 13f79535-47bb-0310-9956-ffa450edef68 --- .../tools/ant/taskdefs/optional/ReplaceRegExp.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java index 3b4551c5e..7c1da67c2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java @@ -58,11 +58,14 @@ import java.io.BufferedWriter; import java.io.File; import java.io.FileInputStream; import java.io.FileReader; +import java.io.FileOutputStream; import java.io.FileWriter; import java.io.InputStreamReader; import java.io.IOException; +import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.Reader; +import java.io.Writer; import java.util.Vector; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; @@ -321,15 +324,17 @@ public class ReplaceRegExp extends Task { File temp = fileUtils.createTempFile("replace", ".txt", null); Reader r = null; - FileWriter w = null; + Writer w = null; try { if (encoding == null) { r = new FileReader(f); + w = new FileWriter(temp); } else { r = new InputStreamReader(new FileInputStream(f), encoding); + w = new OutputStreamWriter(new FileOutputStream(temp), + encoding); } - w = new FileWriter(temp); BufferedReader br = new BufferedReader(r); BufferedWriter bw = new BufferedWriter(w);