diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/jikes/JikesCompiler.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/jikes/JikesCompiler.java index 5ab1b1d9b67d..8f609405b3cc 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/jikes/JikesCompiler.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/jikes/JikesCompiler.java @@ -159,7 +159,7 @@ public class JikesCompiler extends ExternalCompiler { private void _createStartupCommand(final ModuleChunk chunk, final ArrayList commandLine, @NotNull final String outputPath) throws IOException { - myTempFile = File.createTempFile("jikes", ".tmp"); + myTempFile = FileUtil.createTempFile("jikes", ".tmp"); myTempFile.deleteOnExit(); final List files = chunk.getFilesToCompile(); diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/BuildInstructionBase.java b/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/BuildInstructionBase.java index e1d89bcb482b..446dd2e37b28 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/BuildInstructionBase.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/BuildInstructionBase.java @@ -21,6 +21,7 @@ package com.intellij.compiler.impl.packagingCompiler; import com.intellij.openapi.compiler.make.BuildInstruction; import com.intellij.openapi.util.UserDataHolderBase; +import com.intellij.openapi.util.io.FileUtil; import gnu.trove.THashSet; import org.jetbrains.annotations.NonNls; @@ -64,8 +65,8 @@ public abstract class BuildInstructionBase extends UserDataHolderBase implements } protected File createTempFile(final String prefix, final String suffix) throws IOException { - final File tempFile = File.createTempFile(prefix +"___",suffix); + final File tempFile = FileUtil.createTempFile(prefix + "___", suffix); addFileToDelete(tempFile); return tempFile; } -} \ No newline at end of file +} diff --git a/java/execution/impl/src/com/intellij/execution/applet/AppletConfiguration.java b/java/execution/impl/src/com/intellij/execution/applet/AppletConfiguration.java index a1b83928a58d..d6921529547e 100644 --- a/java/execution/impl/src/com/intellij/execution/applet/AppletConfiguration.java +++ b/java/execution/impl/src/com/intellij/execution/applet/AppletConfiguration.java @@ -32,6 +32,7 @@ import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.DefaultJDOMExternalizer; import com.intellij.openapi.util.InvalidDataException; import com.intellij.openapi.util.WriteExternalException; +import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; @@ -301,7 +302,7 @@ public class AppletConfiguration extends ModuleBasedConfiguration\n" + diff --git a/java/java-impl/src/com/intellij/javadoc/JavadocConfiguration.java b/java/java-impl/src/com/intellij/javadoc/JavadocConfiguration.java index ec37e90cb4e1..db305fd58e56 100644 --- a/java/java-impl/src/com/intellij/javadoc/JavadocConfiguration.java +++ b/java/java-impl/src/com/intellij/javadoc/JavadocConfiguration.java @@ -40,6 +40,7 @@ import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.ex.PathUtilEx; import com.intellij.openapi.roots.*; import com.intellij.openapi.util.*; +import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; @@ -250,7 +251,7 @@ public class JavadocConfiguration implements ModuleRunProfile, JDOMExternalizabl } try { - File sourcepathTempFile = File.createTempFile("javadoc", "args.txt"); + File sourcepathTempFile = FileUtil.createTempFile("javadoc", "args.txt"); sourcepathTempFile.deleteOnExit(); parameters.add("@" + sourcepathTempFile.getCanonicalPath()); final PrintWriter writer = new PrintWriter(new FileWriter(sourcepathTempFile)); diff --git a/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SCR17650Test.java b/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SCR17650Test.java index aaea88bb78a1..634f37e0bb2e 100644 --- a/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SCR17650Test.java +++ b/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SCR17650Test.java @@ -7,6 +7,7 @@ import com.intellij.openapi.roots.ModifiableRootModel; import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.roots.libraries.Library; +import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; @@ -27,7 +28,7 @@ public class SCR17650Test extends PsiTestCase { protected void setUp() throws Exception { super.setUp(); - final File root = File.createTempFile(getName(), ""); + final File root = FileUtil.createTempFile(getName(), ""); root.delete(); root.mkdir(); myFilesToDelete.add(root); diff --git a/java/java-tests/testSrc/com/intellij/roots/ModuleRootsExternalizationTest.java b/java/java-tests/testSrc/com/intellij/roots/ModuleRootsExternalizationTest.java index c5951a3c292b..52b7973ad1f8 100644 --- a/java/java-tests/testSrc/com/intellij/roots/ModuleRootsExternalizationTest.java +++ b/java/java-tests/testSrc/com/intellij/roots/ModuleRootsExternalizationTest.java @@ -12,6 +12,7 @@ import com.intellij.openapi.roots.*; import com.intellij.openapi.roots.impl.ModuleRootManagerImpl; import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.roots.libraries.LibraryTable; +import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.testFramework.ModuleTestCase; @@ -42,7 +43,7 @@ public class ModuleRootsExternalizationTest extends ModuleTestCase { } private ModuleRootManagerImpl createTempModuleRootManager() throws IOException { - File tmpModule = File.createTempFile("tst", ModuleFileType.DOT_DEFAULT_EXTENSION); + File tmpModule = FileUtil.createTempFile("tst", ModuleFileType.DOT_DEFAULT_EXTENSION); myFilesToDelete.add(tmpModule); final Module module = createModule(tmpModule); final ModuleRootManagerImpl moduleRootManager = diff --git a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java b/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java index b2d25802d9d5..4ee177217e57 100644 --- a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java +++ b/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java @@ -139,7 +139,7 @@ public abstract class CodeInsightTestCase extends PsiTestCase { final String extension = _extension == null ? fileType.getDefaultExtension():_extension; File dir = createTempDirectory(); - final File tempFile = File.createTempFile("aaa", "." + extension, dir); + final File tempFile = FileUtil.createTempFile(dir, "aaa", "." + extension, true); final FileTypeManager fileTypeManager = FileTypeManager.getInstance(); if (fileTypeManager.getFileTypeByExtension(extension) != fileType) { new WriteCommandAction(getProject()) { diff --git a/platform/bootstrap/src/com/intellij/idea/Main.java b/platform/bootstrap/src/com/intellij/idea/Main.java index 1a858c42dc2a..6e6e0111a3a5 100644 --- a/platform/bootstrap/src/com/intellij/idea/Main.java +++ b/platform/bootstrap/src/com/intellij/idea/Main.java @@ -18,6 +18,7 @@ package com.intellij.idea; import com.intellij.ide.Bootstrap; import com.intellij.openapi.util.Comparing; +import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NonNls; import javax.swing.*; @@ -90,7 +91,7 @@ public class Main { List args = new ArrayList(); if (System.getProperty("os.name").toLowerCase().startsWith("windows")) { File launcherFile = new File(ideaHomeDir, "bin/vistalauncher.exe"); - File launcherCopy = File.createTempFile("vistalauncher", ".exe"); + File launcherCopy = FileUtil.createTempFile("vistalauncher", ".exe"); launcherCopy.deleteOnExit(); copyFile(launcherFile, launcherCopy); args.add(launcherCopy.getPath()); diff --git a/platform/platform-api/src/com/intellij/ide/BrowserUtil.java b/platform/platform-api/src/com/intellij/ide/BrowserUtil.java index cbd70aa2db7c..9342135852d1 100644 --- a/platform/platform-api/src/com/intellij/ide/BrowserUtil.java +++ b/platform/platform-api/src/com/intellij/ide/BrowserUtil.java @@ -126,7 +126,7 @@ public class BrowserUtil { private static String redirectUrl(String url, @NonNls String urlString) throws IOException { if (url.indexOf('&') == -1 && (!urlString.startsWith("file:") || urlString.indexOf("#") == -1)) return urlString; - File redirect = File.createTempFile("redirect", ".html"); + File redirect = FileUtil.createTempFile("redirect", ".html"); redirect.deleteOnExit(); FileWriter writer = new FileWriter(redirect); writer.write(""); diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/ExtCompareFiles.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/ExtCompareFiles.java index 6497dafcfc55..aa94de49c2b1 100644 --- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/ExtCompareFiles.java +++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/ExtCompareFiles.java @@ -21,6 +21,7 @@ import com.intellij.openapi.diff.impl.DiffUtil; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.openapi.fileTypes.FileTypes; +import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NonNls; @@ -75,10 +76,10 @@ class ExtCompareFiles extends BaseExternalTool { if (name.length() <= 3) name = "___" + name; File tempFile; try { - tempFile = File.createTempFile(name, extension); + tempFile = FileUtil.createTempFile(name, extension); } catch (IOException e) { - tempFile = File.createTempFile(STD_PREFIX, extension); + tempFile = FileUtil.createTempFile(STD_PREFIX, extension); } FileOutputStream stream = null; try { diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/PluginDownloader.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/PluginDownloader.java index 6732d7adf5f4..d8ee30ef372b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/PluginDownloader.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/PluginDownloader.java @@ -208,7 +208,7 @@ public class PluginDownloader { pluginsTemp.mkdirs(); } - File file = File.createTempFile("plugin", "download", pluginsTemp); + File file = FileUtil.createTempFile(pluginsTemp, "plugin", "download", true); int responseCode = connection.getResponseCode(); switch (responseCode) { diff --git a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java index 7896c18581eb..56ddb38702ef 100644 --- a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java @@ -175,7 +175,7 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da private static void initProject(final LightProjectDescriptor descriptor) throws Exception { ourProjectDescriptor = descriptor; - final File projectFile = File.createTempFile("lighttemp", ProjectFileType.DOT_DEFAULT_EXTENSION); + final File projectFile = FileUtil.createTempFile("lighttemp", ProjectFileType.DOT_DEFAULT_EXTENSION); new WriteCommandAction.Simple(null) { @Override diff --git a/platform/testFramework/src/com/intellij/testFramework/TempFiles.java b/platform/testFramework/src/com/intellij/testFramework/TempFiles.java index cde2c052fc5b..0879bc3db3a5 100644 --- a/platform/testFramework/src/com/intellij/testFramework/TempFiles.java +++ b/platform/testFramework/src/com/intellij/testFramework/TempFiles.java @@ -47,7 +47,7 @@ public class TempFiles { } public File createTempFile(String prefix, String postfix) throws IOException { - File tempFile = File.createTempFile(prefix, postfix); + File tempFile = FileUtil.createTempFile(prefix, postfix); tempFileCreated(tempFile); return tempFile; } diff --git a/platform/testFramework/src/com/intellij/testFramework/Timings.java b/platform/testFramework/src/com/intellij/testFramework/Timings.java index d3fbb5b130b6..b1de9b99cce8 100644 --- a/platform/testFramework/src/com/intellij/testFramework/Timings.java +++ b/platform/testFramework/src/com/intellij/testFramework/Timings.java @@ -15,6 +15,8 @@ */ package com.intellij.testFramework; +import com.intellij.openapi.util.io.FileUtil; + import java.io.File; import java.io.FileReader; import java.io.FileWriter; @@ -34,7 +36,7 @@ public class Timings { } for (int i = 0; i < 42; i++) { try { - final File tempFile = File.createTempFile("test", "test" + i); + final File tempFile = FileUtil.createTempFile("test", "test" + i); final FileWriter writer = new FileWriter(tempFile); for (int j = 0; j < 15; j++) { writer.write("test" + j); diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java index a38c02774452..2d97784f8c58 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java @@ -1090,7 +1090,7 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig if (prefix.length() < 3) { prefix += "___"; } - final File tempFile = File.createTempFile(prefix, "." + StringUtil.getShortName(fileName), new File(getTempDirPath())); + final File tempFile = FileUtil.createTempFile(new File(getTempDirPath()), prefix, "." + StringUtil.getShortName(fileName), true); vFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(tempFile); } VfsUtil.saveText(vFile, text); diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/HeavyIdeaTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/HeavyIdeaTestFixtureImpl.java index 43be8974f7e9..079469db7331 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/HeavyIdeaTestFixtureImpl.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/HeavyIdeaTestFixtureImpl.java @@ -135,7 +135,7 @@ class HeavyIdeaTestFixtureImpl extends BaseFixture implements HeavyIdeaTestFixtu new WriteCommandAction.Simple(null) { @Override protected void run() throws Throwable { - File projectFile = File.createTempFile(PROJECT_FILE_PREFIX, PROJECT_FILE_SUFFIX); + File projectFile = FileUtil.createTempFile(PROJECT_FILE_PREFIX, PROJECT_FILE_SUFFIX); myFilesToDelete.add(projectFile); LocalFileSystem.getInstance().refreshAndFindFileByIoFile(projectFile); diff --git a/platform/testRunner/src/com/intellij/execution/testframework/CompositePrintable.java b/platform/testRunner/src/com/intellij/execution/testframework/CompositePrintable.java index c4eaad143960..1792a74f40bf 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/CompositePrintable.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/CompositePrintable.java @@ -39,7 +39,7 @@ public class CompositePrintable implements Printable, Disposable { public void flush() { if (myWrapper == null) { try { - myWrapper = new PrintablesWrapper(File.createTempFile("frst", "scd")); + myWrapper = new PrintablesWrapper(FileUtil.createTempFile("frst", "scd")); } catch (IOException ignored) { } diff --git a/platform/util/testSrc/com/intellij/util/io/PagedFileStorageTest.java b/platform/util/testSrc/com/intellij/util/io/PagedFileStorageTest.java index a93bbddb2334..bdf2a69007c3 100644 --- a/platform/util/testSrc/com/intellij/util/io/PagedFileStorageTest.java +++ b/platform/util/testSrc/com/intellij/util/io/PagedFileStorageTest.java @@ -15,6 +15,7 @@ */ package com.intellij.util.io; +import com.intellij.openapi.util.io.FileUtil; import junit.framework.TestCase; import java.io.File; @@ -27,7 +28,7 @@ public class PagedFileStorageTest extends TestCase { @Override public void setUp() throws Exception { - f = File.createTempFile("storage", ".tmp"); + f = FileUtil.createTempFile("storage", ".tmp"); lock = new PagedFileStorage.StorageLock(); s = new PagedFileStorage(f, lock); } diff --git a/platform/util/testSrc/com/intellij/util/io/zip/UpdateableZipTest.java b/platform/util/testSrc/com/intellij/util/io/zip/UpdateableZipTest.java index 99f6cca7ed2d..be3f5c3b8909 100644 --- a/platform/util/testSrc/com/intellij/util/io/zip/UpdateableZipTest.java +++ b/platform/util/testSrc/com/intellij/util/io/zip/UpdateableZipTest.java @@ -130,7 +130,7 @@ public class UpdateableZipTest extends TestCase { private File createTestUtilZip() throws Exception { - File zipFile = File.createTempFile("test", ".zip"); + File zipFile = FileUtil.createTempFile("test", ".zip"); ZipOutputStream zos = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(zipFile))); appendEntry(zos, "/first", "first".getBytes()); diff --git a/platform/vcs-api/src/com/intellij/vcsUtil/ActionWithTempFile.java b/platform/vcs-api/src/com/intellij/vcsUtil/ActionWithTempFile.java index f17174a4e833..3f854c89a74f 100644 --- a/platform/vcs-api/src/com/intellij/vcsUtil/ActionWithTempFile.java +++ b/platform/vcs-api/src/com/intellij/vcsUtil/ActionWithTempFile.java @@ -48,7 +48,7 @@ public abstract class ActionWithTempFile { } private void init() throws IOException { - myTempFile = File.createTempFile(TMP_PREFIX, TMP_SUFFIX); + myTempFile = FileUtil.createTempFile(TMP_PREFIX, TMP_SUFFIX); FileUtil.delete(myTempFile); FileUtil.rename(mySourceFile, myTempFile); } diff --git a/plugins/android/src/org/jetbrains/android/exportSignedPackage/ApkStep.java b/plugins/android/src/org/jetbrains/android/exportSignedPackage/ApkStep.java index cebadddc8133..979875deddda 100644 --- a/plugins/android/src/org/jetbrains/android/exportSignedPackage/ApkStep.java +++ b/plugins/android/src/org/jetbrains/android/exportSignedPackage/ApkStep.java @@ -108,7 +108,7 @@ class ApkStep extends ExportSignedPackageWizardStep { final boolean runZipAlign = zipalign.isFile(); File destFile = null; try { - destFile = runZipAlign ? File.createTempFile("android", ".apk") : new File(apkPath); + destFile = runZipAlign ? FileUtil.createTempFile("android", ".apk") : new File(apkPath); createApk(destFile); } catch (Exception e) { diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/SendTextFilePreprocessor.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/SendTextFilePreprocessor.java index f53ba6497483..dd106dc2fdc7 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/SendTextFilePreprocessor.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/SendTextFilePreprocessor.java @@ -15,6 +15,7 @@ */ package com.intellij.cvsSupport2.javacvsImpl.io; +import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.text.LineReader; import org.jetbrains.annotations.NonNls; import org.netbeans.lib.cvsclient.file.ISendTextFilePreprocessor; @@ -31,7 +32,7 @@ public class SendTextFilePreprocessor implements ISendTextFilePreprocessor { @NonNls private static final String TEMP_FILE_PREFIX = "send"; public File getPreprocessedTextFile(File originalTextFile, IWriterFactory writerFactory) throws IOException { - final File preprocessedTextFile = File.createTempFile(TEMP_FILE_PREFIX, null); + final File preprocessedTextFile = FileUtil.createTempFile(TEMP_FILE_PREFIX, null); final BufferedInputStream inputStream = new BufferedInputStream(new FileInputStream(originalTextFile)); Collection lines; try { diff --git a/plugins/cvs/smartcvs-src/org/netbeans/lib/cvsclient/file/LocalFileWriter.java b/plugins/cvs/smartcvs-src/org/netbeans/lib/cvsclient/file/LocalFileWriter.java index 5c0190ef57e0..29ae80d343b6 100644 --- a/plugins/cvs/smartcvs-src/org/netbeans/lib/cvsclient/file/LocalFileWriter.java +++ b/plugins/cvs/smartcvs-src/org/netbeans/lib/cvsclient/file/LocalFileWriter.java @@ -58,7 +58,7 @@ public final class LocalFileWriter implements ILocalFileWriter { // perform a sequence of readLines() until we've read the file from // the server - the file transmission is not followed by a newline. // Bah. - final File tempFile = File.createTempFile(RECEIVING_TMP_FILE_NAME, null); + final File tempFile = FileUtil.createTempFile(RECEIVING_TMP_FILE_NAME, null); try { writeFile(tempFile, length, inputStream); diff --git a/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java b/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java index ea6dfc551c44..5d43eed1dd17 100644 --- a/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java +++ b/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java @@ -442,7 +442,7 @@ public class GitCheckinEnvironment implements CheckinEnvironment { */ private File createMessageFile(VirtualFile root, final String message) throws IOException { // filter comment lines - File file = File.createTempFile(GIT_COMMIT_MSG_FILE_PREFIX, GIT_COMMIT_MSG_FILE_EXT); + File file = FileUtil.createTempFile(GIT_COMMIT_MSG_FILE_PREFIX, GIT_COMMIT_MSG_FILE_EXT); file.deleteOnExit(); @NonNls String encoding = GitConfigUtil.getCommitEncoding(myProject, root); Writer out = new OutputStreamWriter(new FileOutputStream(file), encoding); diff --git a/plugins/git4idea/src/git4idea/ui/GitTagDialog.java b/plugins/git4idea/src/git4idea/ui/GitTagDialog.java index 7ac00a8af56e..703ee342e985 100644 --- a/plugins/git4idea/src/git4idea/ui/GitTagDialog.java +++ b/plugins/git4idea/src/git4idea/ui/GitTagDialog.java @@ -18,6 +18,7 @@ package git4idea.ui; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; +import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.DocumentAdapter; @@ -150,7 +151,7 @@ public class GitTagDialog extends DialogWrapper { final File messageFile; if (hasMessage) { try { - messageFile = File.createTempFile(MESSAGE_FILE_PREFIX, MESSAGE_FILE_SUFFIX); + messageFile = FileUtil.createTempFile(MESSAGE_FILE_PREFIX, MESSAGE_FILE_SUFFIX); messageFile.deleteOnExit(); Writer out = new OutputStreamWriter(new FileOutputStream(messageFile), MESSAGE_FILE_ENCODING); try { diff --git a/plugins/git4idea/src/org/jetbrains/git4idea/util/ScriptGenerator.java b/plugins/git4idea/src/org/jetbrains/git4idea/util/ScriptGenerator.java index 815e9916005c..34de8ac04e53 100644 --- a/plugins/git4idea/src/org/jetbrains/git4idea/util/ScriptGenerator.java +++ b/plugins/git4idea/src/org/jetbrains/git4idea/util/ScriptGenerator.java @@ -149,8 +149,8 @@ public class ScriptGenerator { */ @SuppressWarnings({"HardCodedStringLiteral"}) public File generate() throws IOException { - File scriptPath = myTempDir != null ? File.createTempFile(myPrefix, SCRIPT_EXT, myTempDir) - : File.createTempFile(myPrefix, SCRIPT_EXT); + File scriptPath = myTempDir != null ? FileUtil.createTempFile(myTempDir, myPrefix, SCRIPT_EXT, true) + : FileUtil.createTempFile(myPrefix, SCRIPT_EXT); scriptPath.deleteOnExit(); PrintWriter out = new PrintWriter(new FileWriter(scriptPath)); try { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerBase.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerBase.java index 7873778330d3..fa25173c56b8 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerBase.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerBase.java @@ -161,7 +161,7 @@ public abstract class GroovyCompilerBase implements TranslatingCompiler { parameters.setMainClass(GroovycRunner.class.getName()); try { - File fileWithParameters = File.createTempFile("toCompile", ""); + File fileWithParameters = FileUtil.createTempFile("toCompile", ""); final VirtualFile finalOutputDir = getMainOutput(compileContext, module, tests); LOG.assertTrue(finalOutputDir != null, "No output directory for module " + module.getName() + (tests ? " tests" : " production")); fillFileWithGroovycParameters(toCompile, fileWithParameters, outputDir, patchers, finalOutputDir); diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgUtil.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgUtil.java index 7cd0fe8c7402..5547d1265fda 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgUtil.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgUtil.java @@ -15,6 +15,7 @@ package org.zmlx.hg4idea; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.ShutDownTracker; +import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vcs.FilePath; import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager; @@ -42,7 +43,7 @@ public abstract class HgUtil { public static File copyResourceToTempFile(String basename, String extension) throws IOException { final InputStream in = HgUtil.class.getClassLoader().getResourceAsStream("python/" + basename + extension); - final File tempFile = File.createTempFile(basename, extension); + final File tempFile = FileUtil.createTempFile(basename, extension); final byte[] buffer = new byte[4096]; OutputStream out = null; diff --git a/plugins/junit/src/com/intellij/execution/junit/TestObject.java b/plugins/junit/src/com/intellij/execution/junit/TestObject.java index 6b0782e07539..d9f4d6a98914 100644 --- a/plugins/junit/src/com/intellij/execution/junit/TestObject.java +++ b/plugins/junit/src/com/intellij/execution/junit/TestObject.java @@ -349,7 +349,7 @@ public abstract class TestObject implements JavaCommandLine { boolean junit4) { try { if (createTempFile) { - myTempFile = File.createTempFile("idea_junit", ".tmp"); + myTempFile = FileUtil.createTempFile("idea_junit", ".tmp"); myTempFile.deleteOnExit(); myJavaParameters.getProgramParametersList().add("@" + myTempFile.getAbsolutePath()); } diff --git a/plugins/junit/src/com/intellij/execution/junit/TestPackage.java b/plugins/junit/src/com/intellij/execution/junit/TestPackage.java index cfad35c982df..e1fff140e9ad 100644 --- a/plugins/junit/src/com/intellij/execution/junit/TestPackage.java +++ b/plugins/junit/src/com/intellij/execution/junit/TestPackage.java @@ -33,6 +33,7 @@ import com.intellij.openapi.progress.impl.ProgressManagerImpl; import com.intellij.openapi.project.DumbModeAction; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; +import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.PackageScope; @@ -99,7 +100,7 @@ public class TestPackage extends TestObject { } try { - myTempFile = File.createTempFile("idea_junit", ".tmp"); + myTempFile = FileUtil.createTempFile("idea_junit", ".tmp"); myTempFile.deleteOnExit(); myJavaParameters.getProgramParametersList().add("@" + myTempFile.getAbsolutePath()); } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnAuthenticationManager.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnAuthenticationManager.java index d59c482b00fe..6065c5319c12 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnAuthenticationManager.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnAuthenticationManager.java @@ -206,7 +206,7 @@ public class SvnAuthenticationManager extends DefaultSVNAuthenticationManager im for (int i = 0; i < maxAttempts; i++) { final File parent = file.getParentFile(); try { - final File tempFile = File.createTempFile("123", "1", parent); + final File tempFile = FileUtil.createTempFile(parent, "123", "1", true); FileUtil.delete(tempFile); if (! file.renameTo(tempFile)) continue; if (! file.createNewFile()) continue; diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java index 270004471a0d..e39310883e76 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java @@ -52,6 +52,7 @@ import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.Getter; import com.intellij.openapi.util.Key; +import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.wm.ToolWindowId; import com.intellij.openapi.wm.ToolWindowManager; @@ -326,7 +327,7 @@ public class TestNGRunnableState extends JavaCommandLineState { try { final ServerSocket serverSocket = new ServerSocket(0, 0, InetAddress.getByName(null)); javaParameters.getProgramParametersList().add("-socket" + serverSocket.getLocalPort()); - myTempFile = File.createTempFile("idea_testng", ".tmp"); + myTempFile = FileUtil.createTempFile("idea_testng", ".tmp"); myTempFile.deleteOnExit(); javaParameters.getProgramParametersList().add("-temp", myTempFile.getAbsolutePath()); final SearchingForTestsTask task = createSearchingForTestsTask(serverSocket, is15, config, myTempFile); diff --git a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaAction.java b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaAction.java index 56f7f93330ab..4299df21b83b 100644 --- a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaAction.java +++ b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaAction.java @@ -26,6 +26,7 @@ import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.Computable; +import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VfsUtil; @@ -104,7 +105,7 @@ public class GenerateInstanceDocumentFromSchemaAction extends AnAction { String pathToUse; try { - final File tempDir = File.createTempFile("xsd2inst",""); + final File tempDir = FileUtil.createTempFile("xsd2inst", ""); tempDir.delete(); tempDir.mkdir();