sbailliez 02/01/08 12:46:27
Modified: src/main/org/apache/tools/ant/taskdefs Delete.java
Log:
Fallback. Come back later for this one.
Revision Changes Path
1.21 +12 -19
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Delete.java
Index: Delete.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Delete.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Delete.java 8 Jan 2002 20:21:58 -0000 1.20
+++ Delete.java 8 Jan 2002 20:46:27 -0000 1.21
@@ -266,12 +266,11 @@
if (!file.delete()) {
String message="Unable to delete file " +
file.getAbsolutePath();
- if(failonerror) {
+ if(failonerror)
throw new BuildException(message);
- } else {
+ else
log(message,
quiet ? Project.MSG_VERBOSE :
Project.MSG_WARN);
- }
}
}
} else {
@@ -338,9 +337,7 @@
protected void removeDir(File d) {
String[] list = d.list();
- if (list == null) {
- list = new String[0];
- }
+ if (list == null) list = new String[0];
for (int i = 0; i < list.length; i++) {
String s = list[i];
File f = new File(d, s);
@@ -350,24 +347,22 @@
log("Deleting " + f.getAbsolutePath(), verbosity);
if (!f.delete()) {
String message="Unable to delete file " +
f.getAbsolutePath();
- if(failonerror) {
+ if(failonerror)
throw new BuildException(message);
- } else {
+ else
log(message,
quiet ? Project.MSG_VERBOSE : Project.MSG_WARN);
- }
}
}
}
log("Deleting directory " + d.getAbsolutePath(), verbosity);
if (!d.delete()) {
String message="Unable to delete directory " +
dir.getAbsolutePath();
- if(failonerror) {
+ if(failonerror)
throw new BuildException(message);
- } else {
+ else
log(message,
quiet ? Project.MSG_VERBOSE : Project.MSG_WARN);
- }
}
}
@@ -386,9 +381,9 @@
log("Deleting " + f.getAbsolutePath(), verbosity);
if (!f.delete()) {
String message="Unable to delete file " +
f.getAbsolutePath();
- if(failonerror) {
+ if(failonerror)
throw new BuildException(message);
- } else
+ else
log(message,
quiet ? Project.MSG_VERBOSE : Project.MSG_WARN);
}
@@ -396,8 +391,7 @@
}
if (dirs.length > 0 && includeEmpty) {
- in
- }t dirCount = 0;
+ int dirCount = 0;
for (int j=dirs.length-1; j>=0; j--) {
File dir = new File(d, dirs[j]);
String[] dirFiles = dir.list();
@@ -406,12 +400,11 @@
if (!dir.delete()) {
String message="Unable to delete directory "
+ dir.getAbsolutePath();
- if(failonerror) {
+ if(failonerror)
throw new BuildException(message);
- } else { {
+ else
log(message,
quiet ? Project.MSG_VERBOSE :
Project.MSG_WARN);
- }
} else {
dirCount++;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
