From fae857b99e1aed990805f2601894d8a01d962b53 Mon Sep 17 00:00:00 2001 From: Konstantin Kolosovsky Date: Wed, 2 Mar 2016 17:14:55 +0300 Subject: [PATCH] Revert: vcs: Refactored "FilePath" implementations not to create new "File" instances on each "getIOFile()" call - reuse same "File" instance created in constructor instead (d962b00bb55b09bc5487ed0f5b7d51c0049edec2) --- .../vcs-impl/src/com/intellij/openapi/vcs/FilePathImpl.java | 4 +--- .../vcs-impl/src/com/intellij/openapi/vcs/LocalFilePath.java | 4 +--- .../vcs-impl/src/com/intellij/openapi/vcs/RemoteFilePath.java | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/FilePathImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/FilePathImpl.java index 6600676b9f20..4089cea7ec7f 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/FilePathImpl.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/FilePathImpl.java @@ -42,12 +42,10 @@ import java.nio.charset.Charset; @Deprecated public class FilePathImpl implements FilePath { @NotNull private final String myPath; - @NotNull private final File myIOFile; private final boolean myIsDirectory; public FilePathImpl(@NotNull String path, boolean isDirectory) { myPath = FileUtil.toCanonicalPath(path); - myIOFile = new File(myPath); myIsDirectory = isDirectory; } public FilePathImpl(@NotNull VirtualFile file) { @@ -122,7 +120,7 @@ public class FilePathImpl implements FilePath { @Override @NotNull public File getIOFile() { - return myIOFile; + return new File(myPath); } @NotNull diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/LocalFilePath.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/LocalFilePath.java index 4de1b44a1896..10ac108b4491 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/LocalFilePath.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/LocalFilePath.java @@ -35,12 +35,10 @@ import java.nio.charset.Charset; public class LocalFilePath implements FilePath { @NotNull private final String myPath; - @NotNull private final File myIOFile; private final boolean myIsDirectory; public LocalFilePath(@NotNull String path, boolean isDirectory) { myPath = FileUtil.toCanonicalPath(path); - myIOFile = new File(myPath); myIsDirectory = isDirectory; } @@ -112,7 +110,7 @@ public class LocalFilePath implements FilePath { @Override @NotNull public File getIOFile() { - return myIOFile; + return new File(myPath); } @NotNull diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/RemoteFilePath.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/RemoteFilePath.java index d74634638490..da15800bfe04 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/RemoteFilePath.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/RemoteFilePath.java @@ -37,12 +37,10 @@ public class RemoteFilePath implements FilePath { private static final TObjectHashingStrategy CASE_SENSITIVE_STRATEGY = FilePathHashingStrategy.create(true); @NotNull private final String myPath; - @NotNull private final File myIOFile; private final boolean myIsDirectory; public RemoteFilePath(@NotNull String path, boolean isDirectory) { myPath = path; - myIOFile = new File(myPath); myIsDirectory = isDirectory; } @@ -61,7 +59,7 @@ public class RemoteFilePath implements FilePath { @NotNull @Override public File getIOFile() { - return myIOFile; + return new File(myPath); } @NotNull