From fe678d1937dfca00eda5019956c3352d557accc6 Mon Sep 17 00:00:00 2001 From: Kevin Jackson Date: Mon, 26 Jun 2006 05:15:35 +0000 Subject: [PATCH] roll back deprecation of Project.resolveFile, revert prior changes to code git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@417126 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/Project.java | 3 --- .../apache/tools/ant/taskdefs/AbstractJarSignerTask.java | 5 +---- src/main/org/apache/tools/ant/taskdefs/ExecTask.java | 2 +- src/main/org/apache/tools/ant/taskdefs/Javac.java | 4 +--- src/main/org/apache/tools/ant/taskdefs/Javadoc.java | 6 +++--- src/main/org/apache/tools/ant/taskdefs/TempFile.java | 2 +- src/main/org/apache/tools/ant/taskdefs/Touch.java | 2 +- src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java | 4 ++-- 8 files changed, 10 insertions(+), 18 deletions(-) diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java index 0430a5cc4..39e40b247 100644 --- a/src/main/org/apache/tools/ant/Project.java +++ b/src/main/org/apache/tools/ant/Project.java @@ -1339,9 +1339,6 @@ public class Project implements ResourceFactory { * * @return the resolved File. * - * @deprecated since 1.7 - * Use @see {FileUtils#resolveFile FileUtils.resolveFile} - * instead. */ public File resolveFile(String fileName) { return FILE_UTILS.resolveFile(baseDir, fileName); diff --git a/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java b/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java index 6cd0aa2d5..f51e0ef22 100644 --- a/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java @@ -27,7 +27,6 @@ import org.apache.tools.ant.types.Environment; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.RedirectorElement; -import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.JavaEnvUtils; /** @@ -98,8 +97,6 @@ public abstract class AbstractJarSignerTask extends Task { * @since Ant 1.7 */ private Path path = null; - - private static final FileUtils FILE_UTILS = FileUtils.getFileUtils(); /** * Set the maximum memory to be used by the jarsigner process @@ -290,7 +287,7 @@ public abstract class AbstractJarSignerTask extends Task { // is the keystore a file addValue(cmd,"-keystore"); String loc; - File keystoreFile = FILE_UTILS.resolveFile(getProject().getBaseDir(), keystore); + File keystoreFile = getProject().resolveFile(keystore); if (keystoreFile.exists()) { loc = keystoreFile.getPath(); } else { diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java b/src/main/org/apache/tools/ant/taskdefs/ExecTask.java index 5bb573a6c..cbca260bc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/ExecTask.java @@ -412,7 +412,7 @@ public class ExecTask extends Task { return exec; } // try to find the executable - File executableFile = FILE_UTILS.resolveFile(getProject().getBaseDir(), exec); + File executableFile = getProject().resolveFile(exec); if (executableFile.exists()) { return executableFile.getAbsolutePath(); } diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java index f6825f201..e11b5b267 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javac.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java @@ -111,8 +111,6 @@ public class Javac extends MatchingTask { private String source; private String debugLevel; private File tmpDir; - - private static final FileUtils FILE_UTILS = FileUtils.getFileUtils(); /** * Javac task for compilation of Java files. @@ -804,7 +802,7 @@ public class Javac extends MatchingTask { // compile lists String[] list = src.list(); for (int i = 0; i < list.length; i++) { - File srcDir = FILE_UTILS.resolveFile(getProject().getBaseDir(), list[i]); + File srcDir = getProject().resolveFile(list[i]); if (!srcDir.exists()) { throw new BuildException("srcdir \"" + srcDir.getPath() diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java index 541df9754..e434dc496 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java @@ -543,7 +543,7 @@ public class Javadoc extends Task { while (tok.hasMoreTokens()) { String f = tok.nextToken(); SourceFile sf = new SourceFile(); - sf.setFile(FILE_UTILS.resolveFile(getProject().getBaseDir(),f.trim())); + sf.setFile(getProject().resolveFile(f.trim())); addSource(sf); } } @@ -1016,7 +1016,7 @@ public class Javadoc extends Task { if (!tok.hasMoreTokens()) { throw new BuildException(linkOfflineError); } - le.setPackagelistLoc(FILE_UTILS.resolveFile(getProject().getBaseDir(),tok.nextToken())); + le.setPackagelistLoc(getProject().resolveFile(tok.nextToken())); } /** @@ -1745,7 +1745,7 @@ public class Javadoc extends Task { String link = null; if (la.shouldResolveLink()) { File hrefAsFile = - FILE_UTILS.resolveFile(getProject().getBaseDir(), la.getHref()); + getProject().resolveFile(la.getHref()); if (hrefAsFile.exists()) { try { link = FILE_UTILS.getFileURL(hrefAsFile) diff --git a/src/main/org/apache/tools/ant/taskdefs/TempFile.java b/src/main/org/apache/tools/ant/taskdefs/TempFile.java index ce317c12e..9d512b8de 100644 --- a/src/main/org/apache/tools/ant/taskdefs/TempFile.java +++ b/src/main/org/apache/tools/ant/taskdefs/TempFile.java @@ -133,7 +133,7 @@ public class TempFile extends Task { throw new BuildException("no property specified"); } if (destDir == null) { - destDir = FILE_UTILS.resolveFile(getProject().getBaseDir(),"."); + destDir = getProject().resolveFile("."); } File tfile = FILE_UTILS.createTempFile( prefix, suffix, destDir, deleteOnExit); diff --git a/src/main/org/apache/tools/ant/taskdefs/Touch.java b/src/main/org/apache/tools/ant/taskdefs/Touch.java index 59b9cd2d1..87a56b79e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Touch.java +++ b/src/main/org/apache/tools/ant/taskdefs/Touch.java @@ -341,7 +341,7 @@ public class Touch extends Task { long modTime = (r.isExists()) ? r.getLastModified() : defaultTimestamp; for (int i = 0; i < mapped.length; i++) { - touch(FILE_UTILS.resolveFile(getProject().getBaseDir(),mapped[i]), modTime); + touch(getProject().resolveFile(mapped[i]), modTime); } } } diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java index bb981bdab..448fe8172 100644 --- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java +++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java @@ -274,7 +274,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger { try { if (baseDir == null) { - baseDir = FILE_UTILS.resolveFile(getProject().getBaseDir(),"."); + baseDir = getProject().resolveFile("."); } liaison = getLiaison(); @@ -289,7 +289,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger { if (xslFile != null) { // If we enter here, it means that the stylesheet is supplied // via style attribute - File stylesheet = FILE_UTILS.resolveFile(getProject().getBaseDir(), xslFile); + File stylesheet = getProject().resolveFile(xslFile); if (!stylesheet.exists()) { stylesheet = FILE_UTILS.resolveFile(baseDir, xslFile); /*