Author: kevj
Date: Wed Apr 19 23:44:38 2006
New Revision: 395510
URL: http://svn.apache.org/viewcvs?rev=395510&view=rev
Log:
fix bug#32738, implement quiet check for every message logged
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Delete.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Delete.java
URL:
http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Delete.java?rev=395510&r1=395509&r2=395510&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Delete.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Delete.java Wed Apr
19 23:44:38 2006
@@ -490,7 +490,7 @@
public void execute() throws BuildException {
if (usedMatchingTask) {
log("DEPRECATED - Use of the implicit FileSet is deprecated. "
- + "Use a nested fileset element instead.");
+ + "Use a nested fileset element instead.", quiet ?
Project.MSG_VERBOSE : verbosity);
}
if (file == null && dir == null && filesets.size() == 0 && rcs ==
null) {
@@ -510,7 +510,7 @@
if (file.isDirectory()) {
log("Directory " + file.getAbsolutePath()
+ " cannot be removed using the file attribute. "
- + "Use dir instead.");
+ + "Use dir instead.", quiet ? Project.MSG_VERBOSE :
verbosity);
} else {
log("Deleting: " + file.getAbsolutePath());
@@ -520,8 +520,7 @@
}
} else {
log("Could not find file " + file.getAbsolutePath()
- + " to delete.",
- Project.MSG_VERBOSE);
+ + " to delete.", quiet ? Project.MSG_VERBOSE : verbosity);
}
}
@@ -545,7 +544,7 @@
Resources filesetDirs = new Resources();
filesetDirs.setProject(getProject());
- for (int i = 0; i < filesets.size(); i++) {
+ for (int i = 0, size = filesets.size(); i < size; i++) {
FileSet fs = (FileSet) filesets.get(i);
if (fs.getProject() == null) {
log("Deleting fileset with no project specified;"
@@ -617,7 +616,7 @@
throw (e instanceof BuildException)
? (BuildException) e : new BuildException(e);
}
- log(e.getMessage(), quiet ? Project.MSG_VERBOSE : Project.MSG_WARN);
+ log(e.getMessage(), quiet ? Project.MSG_VERBOSE : verbosity);
}
/**
@@ -666,7 +665,7 @@
if (f.isDirectory()) {
removeDir(f);
} else {
- log("Deleting " + f.getAbsolutePath(), verbosity);
+ log("Deleting " + f.getAbsolutePath(), quiet ?
Project.MSG_VERBOSE : verbosity);
if (!delete(f)) {
handle("Unable to delete file " + f.getAbsolutePath());
}
@@ -688,10 +687,11 @@
protected void removeFiles(File d, String[] files, String[] dirs) {
if (files.length > 0) {
log("Deleting " + files.length + " files from "
- + d.getAbsolutePath());
+ + d.getAbsolutePath(), quiet ? Project.MSG_VERBOSE :
verbosity);
for (int j = 0; j < files.length; j++) {
File f = new File(d, files[j]);
- log("Deleting " + f.getAbsolutePath(), verbosity);
+ log("Deleting " + f.getAbsolutePath(),
+ quiet ? Project.MSG_VERBOSE : verbosity);
if (!delete(f)) {
handle("Unable to delete file " + f.getAbsolutePath());
}
@@ -704,7 +704,8 @@
File currDir = new File(d, dirs[j]);
String[] dirFiles = currDir.list();
if (dirFiles == null || dirFiles.length == 0) {
- log("Deleting " + currDir.getAbsolutePath(), verbosity);
+ log("Deleting " + currDir.getAbsolutePath(),
+ quiet ? Project.MSG_VERBOSE : verbosity);
if (!delete(currDir)) {
handle("Unable to delete directory "
+ currDir.getAbsolutePath());
@@ -715,9 +716,11 @@
}
if (dirCount > 0) {
- log("Deleted " + dirCount + " director"
- + (dirCount == 1 ? "y" : "ies")
- + " from " + d.getAbsolutePath());
+ log("Deleted "
+ + dirCount
+ + " director" + (dirCount == 1 ? "y" : "ies")
+ + " form " + d.getAbsolutePath(),
+ quiet ? Project.MSG_VERBOSE : verbosity);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
