mbenson 2005/01/26 10:40:16
Modified: src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Delete.java
Log:
sync with HEAD
Revision Changes Path
No revision
No revision
1.47.2.8 +6 -6 ant/src/main/org/apache/tools/ant/taskdefs/Delete.java
Index: Delete.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Delete.java,v
retrieving revision 1.47.2.7
retrieving revision 1.47.2.8
diff -u -r1.47.2.7 -r1.47.2.8
--- Delete.java 10 Jun 2004 07:44:50 -0000 1.47.2.7
+++ Delete.java 26 Jan 2005 18:40:16 -0000 1.47.2.8
@@ -49,7 +49,7 @@
* using the include/exclude syntax. The deltree task would delete a
* directory tree. This task combines the functionality of these two
* originally distinct tasks.
- * <p>Currently Delete extends MatchingTask. This is intend <i>only</i>
+ * <p>Currently Delete extends MatchingTask. This is intended <i>only</i>
* to provide backwards compatibility for a release. The future position
* is to use nested filesets exclusively.</p>
*
@@ -642,13 +642,13 @@
if (dirs.length > 0 && includeEmpty) {
int dirCount = 0;
for (int j = dirs.length - 1; j >= 0; j--) {
- File dir = new File(d, dirs[j]);
- String[] dirFiles = dir.list();
+ File currDir = new File(d, dirs[j]);
+ String[] dirFiles = currDir.list();
if (dirFiles == null || dirFiles.length == 0) {
- log("Deleting " + dir.getAbsolutePath(), verbosity);
- if (!delete(dir)) {
+ log("Deleting " + currDir.getAbsolutePath(), verbosity);
+ if (!delete(currDir)) {
String message = "Unable to delete directory "
- + dir.getAbsolutePath();
+ + currDir.getAbsolutePath();
if (failonerror) {
throw new BuildException(message);
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
