@@ -43,6 +43,7 @@ import java.util.Vector;
import java.util.jar.JarFile;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.MagicNames;
import org.apache.tools.ant.PathTokenizer;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.launch.Locator;
@@ -882,19 +883,15 @@ public class FileUtils {
* this method was invoked, any subsequent invocation of this method will
* yield a different file name.
* </p>
* <p>
* The filename is prefixNNNNNsuffix where NNNN is a random number.
* </p>
*
* @param prefix
* prefix before the random number.
* @param prefix file name prefix.
* @param suffix
* file extension; include the '.'.
* @param parentDir
* Directory to create the temporary file in; java.io.tmpdir used
* if not specified.
*
* @deprecated since ant 1.7.1 use createTempFile(String, String, File,
* @deprecated since ant 1.7.1 use createTempFile(Project, String, String, File,
* boolean, boolean) instead.
* @return a File reference to the new, nonexistent temporary file.
*/
@@ -902,8 +899,6 @@ public class FileUtils {
return createTempFile(prefix, suffix, parentDir, false, false);
}
private static final String NULL_PLACEHOLDER = "null";
/**
* Create a temporary file in a given directory.
*
@@ -911,7 +906,7 @@ public class FileUtils {
* exist before this method was invoked, any subsequent invocation
* of this method will yield a different file name.</p>
*
* @param prefix prefix before the random number .
* @param prefix file name prefix .
* @param suffix file extension; include the '.'.
* @param parentDir Directory to create the temporary file in;
* java.io.tmpdir used if not specified.
@@ -924,13 +919,51 @@ public class FileUtils {
*
* @return a File reference to the new temporary file.
* @since Ant 1.7.1
* @deprecated since Ant 1.9.15 use createTempFile(Project, String, String, File,
* boolean, boolean) instead.
*/
public File createTempFile(String prefix, String suffix, File parentDir,
boolean deleteOnExit, boolean createFile) {
return createTempFile(null, prefix, suffix, parentDir, deleteOnExit, createFile);
}
private static final String NULL_PLACEHOLDER = "null";
/**
* Create a temporary file in a given directory.
*
* <p>The file denoted by the returned abstract pathname did not
* exist before this method was invoked, any subsequent invocation
* of this method will yield a different file name.</p>
*
* @param project reference to the current Ant project.
* @param prefix file name prefix.
* @param suffix file extension; include the '.'.
* @param parentDir Directory to create the temporary file in;
* if not specified and {@code project} is not null then the value
* of the property {@code ant.tmpdir} is used if set;
* otherwise {@code java.io.tmpdir} is used.
* @param deleteOnExit whether to set the tempfile for deletion on
* normal VM exit.
* @param createFile true if the file must actually be created. If false
* chances exist that a file with the same name is created in the time
* between invoking this method and the moment the file is actually created.
* If possible set to true.
*
* @return a File reference to the new temporary file.
* @since Ant 1.9.15
*/
public File createTempFile(final Project project, String prefix, String suffix,
final File parentDir, final boolean deleteOnExit, final boolean createFile) {
File result = null;
String parent = (parentDir == null)
? System.getProperty("java.io.tmpdir")
: parentDir.getPath();
final String parent;
if (parentDir != null) {
parent = parentDir.getPath();
} else if (project != null && project.getProperty(MagicNames.TMPDIR) != null) {
parent = project.getProperty(MagicNames.TMPDIR);
} else {
parent = System.getProperty("java.io.tmpdir");
}
if (prefix == null) {
prefix = NULL_PLACEHOLDER;
}
@@ -970,12 +1003,8 @@ public class FileUtils {
* this method was invoked, any subsequent invocation of this method will
* yield a different file name.
* </p>
* <p>
* The filename is prefixNNNNNsuffix where NNNN is a random number.
* </p>
*
* @param prefix
* prefix before the random number.
* @param prefix file name prefix.
* @param suffix
* file extension; include the '.'.
* @param parentDir
@@ -984,7 +1013,7 @@ public class FileUtils {
* @param deleteOnExit
* whether to set the tempfile for deletion on normal VM exit.
*
* @deprecated since ant 1.7.1 use createTempFile(String, String, File,
* @deprecated since ant 1.7.1 use createTempFile(Project, String, String, File,
* boolean, boolean) instead.
* @return a File reference to the new, nonexistent temporary file.
*/
Stefan Bodewig