Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 24550 invoked from network); 9 Oct 2003 08:30:43 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 9 Oct 2003 08:30:43 -0000 Received: (qmail 37541 invoked by uid 500); 9 Oct 2003 08:30:15 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 37430 invoked by uid 500); 9 Oct 2003 08:30:15 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 37417 invoked by uid 500); 9 Oct 2003 08:30:15 -0000 Received: (qmail 37413 invoked from network); 9 Oct 2003 08:30:15 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 9 Oct 2003 08:30:15 -0000 Received: (qmail 24513 invoked by uid 1146); 9 Oct 2003 08:30:39 -0000 Date: 9 Oct 2003 08:30:39 -0000 Message-ID: <20031009083039.24512.qmail@minotaur.apache.org> From: bodewig@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional ReplaceRegExp.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N bodewig 2003/10/09 01:30:39 Modified: src/main/org/apache/tools/ant/taskdefs/optional Tag: ANT_16_BRANCH ReplaceRegExp.java Log: Merge from HEAD Revision Changes Path No revision No revision 1.27.2.1 +7 -2 ant/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java Index: ReplaceRegExp.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java,v retrieving revision 1.27 retrieving revision 1.27.2.1 diff -u -r1.27 -r1.27.2.1 --- ReplaceRegExp.java 17 Sep 2003 20:11:43 -0000 1.27 +++ ReplaceRegExp.java 9 Oct 2003 08:30:39 -0000 1.27.2.1 @@ -58,11 +58,14 @@ 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; @@ -320,15 +323,17 @@ 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); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org