From 6653c42a77eb0d663817f3112a5631f3bad6bfbe Mon Sep 17 00:00:00 2001 From: Jacobus Martinus Kruithof Date: Sat, 11 Dec 2004 22:43:05 +0000 Subject: [PATCH] If we can use File.getParentFile, there is presumably no reason to use FileUtils.getParentFile, right? (Comment re-used from jglick) git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277179 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/taskdefs/Available.java | 5 ++--- src/main/org/apache/tools/ant/taskdefs/Concat.java | 2 +- src/main/org/apache/tools/ant/taskdefs/Copy.java | 2 +- src/main/org/apache/tools/ant/taskdefs/Expand.java | 2 +- src/main/org/apache/tools/ant/taskdefs/FixCRLF.java | 1 + src/main/org/apache/tools/ant/taskdefs/Move.java | 2 +- src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java | 2 +- src/main/org/apache/tools/ant/taskdefs/Zip.java | 2 +- .../org/apache/tools/ant/taskdefs/optional/net/FTP.java | 4 ++-- src/main/org/apache/tools/ant/util/FileUtils.java | 6 +++--- .../org/apache/tools/ant/taskdefs/XmlPropertyTest.java | 4 ++-- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/Available.java b/src/main/org/apache/tools/ant/taskdefs/Available.java index 80bf41372..d6849494f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Available.java +++ b/src/main/org/apache/tools/ant/taskdefs/Available.java @@ -330,8 +330,7 @@ public class Available extends Task implements Condition { return false; } - FileUtils fileUtils = FileUtils.newFileUtils(); - File parent = fileUtils.getParentFile(path); + File parent = path.getParentFile(); // ** full-pathname specified == parent dir of path in list if (parent != null && parent.exists() && file.equals(parent.getAbsolutePath())) { @@ -364,7 +363,7 @@ public class Available extends Task implements Condition { // ** simple name specified == parent of parent dir + name if (parent != null) { - File grandParent = fileUtils.getParentFile(parent); + File grandParent = parent.getParentFile(); if (grandParent != null && grandParent.exists()) { if (checkFile(new File(grandParent, file), file + " in " + grandParent)) { diff --git a/src/main/org/apache/tools/ant/taskdefs/Concat.java b/src/main/org/apache/tools/ant/taskdefs/Concat.java index 4c97c330d..d2bfffc4b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Concat.java +++ b/src/main/org/apache/tools/ant/taskdefs/Concat.java @@ -561,7 +561,7 @@ public class Concat extends Task { os = new LogOutputStream(this, Project.MSG_WARN); } else { // ensure that the parent dir of dest file exists - File parent = fileUtils.getParentFile(destinationFile); + File parent = destinationFile.getParentFile(); if (!parent.exists()) { parent.mkdirs(); } diff --git a/src/main/org/apache/tools/ant/taskdefs/Copy.java b/src/main/org/apache/tools/ant/taskdefs/Copy.java index 7a177474c..775edba73 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Copy.java +++ b/src/main/org/apache/tools/ant/taskdefs/Copy.java @@ -509,7 +509,7 @@ public class Copy extends Task { } if (destFile != null) { - destDir = fileUtils.getParentFile(destFile); + destDir = destFile.getParentFile(); } } diff --git a/src/main/org/apache/tools/ant/taskdefs/Expand.java b/src/main/org/apache/tools/ant/taskdefs/Expand.java index 3e7f04255..a5d2d43f8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Expand.java +++ b/src/main/org/apache/tools/ant/taskdefs/Expand.java @@ -241,7 +241,7 @@ public class Expand extends Task { log("expanding " + entryName + " to " + f, Project.MSG_VERBOSE); // create intermediary directories - sometimes zip don't add them - File dirF = fileUtils.getParentFile(f); + File dirF = f.getParentFile(); if (dirF != null) { dirF.mkdirs(); } diff --git a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java index 45f9a6b4b..c9077f444 100644 --- a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java +++ b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java @@ -1000,3 +1000,4 @@ public class FixCRLF extends MatchingTask { } } + diff --git a/src/main/org/apache/tools/ant/taskdefs/Move.java b/src/main/org/apache/tools/ant/taskdefs/Move.java index 7ae161212..3bb4e59c4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Move.java +++ b/src/main/org/apache/tools/ant/taskdefs/Move.java @@ -74,7 +74,7 @@ public class Move extends Copy { destFile = (destFile == null) ? new File(destDir, file.getName()) : destFile; destDir = (destDir == null) - ? fileUtils.getParentFile(destFile) : destDir; + ? destFile.getParentFile() : destDir; completeDirMap.put(file, destFile); file = null; diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java index ed68caad1..985124c40 100644 --- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java +++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java @@ -562,7 +562,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger { */ private void ensureDirectoryFor(File targetFile) throws BuildException { - File directory = fileUtils.getParentFile(targetFile); + File directory = targetFile.getParentFile(); if (!directory.exists()) { if (!directory.mkdirs()) { throw new BuildException("Unable to create directory: " diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java index 33b672a60..a6ff2f486 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Zip.java +++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java @@ -407,7 +407,7 @@ public class Zip extends MatchingTask { if (doUpdate) { renamedFile = fileUtils.createTempFile("zip", ".tmp", - fileUtils.getParentFile(zipFile)); + zipFile.getParentFile()); renamedFile.deleteOnExit(); try { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java index 900c0da37..2a87f1e77 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java @@ -1310,7 +1310,7 @@ public class FTP try { if (action == LIST_FILES) { - File pd = fileUtils.getParentFile(listing); + File pd = listing.getParentFile(); if (!pd.exists()) { pd.mkdirs(); @@ -1782,7 +1782,7 @@ public class FTP + file.getAbsolutePath()); } - File pdir = fileUtils.getParentFile(file); + File pdir = file.getParentFile(); if (!pdir.exists()) { pdir.mkdirs(); diff --git a/src/main/org/apache/tools/ant/util/FileUtils.java b/src/main/org/apache/tools/ant/util/FileUtils.java index 961f948aa..22c401ee3 100644 --- a/src/main/org/apache/tools/ant/util/FileUtils.java +++ b/src/main/org/apache/tools/ant/util/FileUtils.java @@ -507,7 +507,7 @@ public class FileUtils { // ensure that parent dir of dest file exists! // not using getParentFile method to stay 1.1 compat - File parent = getParentFile(destFile); + File parent = destFile.getParentFile(); if (parent != null && !parent.exists()) { parent.mkdirs(); } @@ -709,7 +709,7 @@ public class FileUtils { while (tok.hasMoreTokens()) { String part = tok.nextToken(); if (part.equals("..")) { - helpFile = getParentFile(helpFile); + helpFile = helpFile.getParentFile(); if (helpFile == null) { String msg = "The file or path you specified (" + filename + ") is invalid relative to " @@ -1260,7 +1260,7 @@ public class FileUtils { throw new IOException("Failed to delete " + to + " while trying to rename " + from); } - File parent = getParentFile(to); + File parent = to.getParentFile(); if (parent != null && !parent.exists() && !parent.mkdirs()) { throw new IOException("Failed to create directory " + parent + " while trying to rename " + from); diff --git a/src/testcases/org/apache/tools/ant/taskdefs/XmlPropertyTest.java b/src/testcases/org/apache/tools/ant/taskdefs/XmlPropertyTest.java index 466d31e4c..0d48b7d88 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/XmlPropertyTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/XmlPropertyTest.java @@ -123,7 +123,7 @@ public class XmlPropertyTest extends BuildFileTest { // folder of the input file. Otherwise, its the "current" dir.. File workingDir; if ( localRoot ) { - workingDir = fileUtils.getParentFile(inputFile); + workingDir = inputFile.getParentFile(); } else { workingDir = fileUtils.resolveFile(new File("."), "."); } @@ -285,7 +285,7 @@ public class XmlPropertyTest extends BuildFileTest { + ".properties"; } - File dir = fileUtils.getParentFile(fileUtils.getParentFile(input)); + File dir = input.getParentFile().getParentFile(); String goldFileFolder = "goldfiles/";