diff --git a/src/main/org/apache/tools/ant/types/DestDir.java b/src/main/org/apache/tools/ant/types/DestDir.java index 913c534d1..792c804ec 100644 --- a/src/main/org/apache/tools/ant/types/DestDir.java +++ b/src/main/org/apache/tools/ant/types/DestDir.java @@ -95,7 +95,7 @@ public final class DestDir extends ValidatedFileAttribute { return false; } if (f.exists() && !f.isDirectory()) { - message = "DestDir " + f + " is not a directory."; + message = f + " is not a directory."; return false; } //If DestDir does not exist, make sure it is well formed. @@ -105,7 +105,7 @@ public final class DestDir extends ValidatedFileAttribute { File parent = new File(tmp.getParent()); if (parent.exists()) { if (!parent.isDirectory()) { - message = "DestDir " + f + " contains the path " + message = f + " contains the path " + parent + " that is not a directory."; return false; } diff --git a/src/main/org/apache/tools/ant/types/DestFile.java b/src/main/org/apache/tools/ant/types/DestFile.java index 18c39a40d..b3ce20e2f 100644 --- a/src/main/org/apache/tools/ant/types/DestFile.java +++ b/src/main/org/apache/tools/ant/types/DestFile.java @@ -95,7 +95,7 @@ public final class DestFile extends ValidatedFileAttribute { return false; } if (f.exists() && !f.isFile()) { - message = "DestFile " + f + " is not a file."; + message = f + " is not a file."; return false; } //If DestFile does not exist, make sure it is well formed. @@ -105,7 +105,7 @@ public final class DestFile extends ValidatedFileAttribute { File parent = new File(tmp.getParent()); if (parent.exists()) { if (!parent.isDirectory()) { - message = "DestFile " + f + " contains the path " + message = f + " contains the path " + parent + " that is not a directory."; return false; } diff --git a/src/main/org/apache/tools/ant/types/SrcDir.java b/src/main/org/apache/tools/ant/types/SrcDir.java index f7f58ca5a..9174a872d 100644 --- a/src/main/org/apache/tools/ant/types/SrcDir.java +++ b/src/main/org/apache/tools/ant/types/SrcDir.java @@ -63,21 +63,21 @@ import org.apache.tools.ant.BuildException; * @author Magesh Umasankar */ public final class SrcDir extends ValidatedFileAttribute { - - /** + + /** * empty constructor */ public SrcDir() {} - - - /** - * file constructor; performs validation + + + /** + * file constructor; performs validation * @param file the file to use */ public SrcDir(File file) throws BuildException { - setFile(file); + setFile(file); } - + private String message; protected final String getMessage() { @@ -95,11 +95,11 @@ public final class SrcDir extends ValidatedFileAttribute { return false; } if (!f.exists()) { - message = "SrcDir " + f + " does not exist."; + message = f + " does not exist."; return false; } if (!f.isDirectory()) { - message = "SrcDir " + f + " is not a directory."; + message = f + " is not a directory."; return false; } return true; diff --git a/src/main/org/apache/tools/ant/types/SrcFile.java b/src/main/org/apache/tools/ant/types/SrcFile.java index 30f9d9d9c..f8333d6ae 100644 --- a/src/main/org/apache/tools/ant/types/SrcFile.java +++ b/src/main/org/apache/tools/ant/types/SrcFile.java @@ -64,20 +64,20 @@ import org.apache.tools.ant.BuildException; */ public final class SrcFile extends ValidatedFileAttribute { - /** + /** * empty constructor */ public SrcFile() {} - - - /** - * file constructor; performs validation + + + /** + * file constructor; performs validation * @param file the file to use */ public SrcFile(File file) throws BuildException { - setFile(file); + setFile(file); } - + private String message; protected final String getMessage() { @@ -95,11 +95,11 @@ public final class SrcFile extends ValidatedFileAttribute { return false; } if (!f.exists()) { - message = "SrcFile " + f + " does not exist."; + message = f + " does not exist."; return false; } if (!f.isFile()) { - message = "SrcFile " + f + " is not a file."; + message = f + " is not a file."; return false; } return true;