From 57c43675398385ada82e20bb7cfbedfb05b0d61e Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 10 Jun 2013 11:35:35 +0400 Subject: [PATCH] OpenAPI fixed --- .../vcs-api/src/com/intellij/openapi/vcs/FilePath.java | 2 +- .../src/com/intellij/openapi/vcs/FilePathImpl.java | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/FilePath.java b/platform/vcs-api/src/com/intellij/openapi/vcs/FilePath.java index 3b8aa077d4b3..90fd92f2e78e 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/FilePath.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/FilePath.java @@ -74,7 +74,7 @@ public interface FilePath { */ FileType getFileType(); - VirtualFile refresh(); + void refresh(); void hardRefresh(); 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 5f60e1cb3e88..913a8c772e9a 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/FilePathImpl.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/FilePathImpl.java @@ -137,13 +137,11 @@ public class FilePathImpl implements FilePath { } @Override - public VirtualFile refresh() { - VirtualFile virtualFile = myVirtualFile; + public void refresh() { if (myLocal) { VirtualFile virtualParent = getVirtualFileParent(); - myVirtualFile = virtualFile = virtualParent == null ? LocalFileSystem.getInstance().findFileByIoFile(myFile) : virtualParent.findChild(myName); + myVirtualFile = virtualParent == null ? LocalFileSystem.getInstance().findFileByIoFile(myFile) : virtualParent.findChild(myName); } - return virtualFile; } @Override @@ -214,7 +212,8 @@ public class FilePathImpl implements FilePath { myVirtualFile = virtualFile = null; } if (virtualFile == null) { - virtualFile = refresh(); + refresh(); + virtualFile = myVirtualFile; } detectFileType(virtualFile); return virtualFile;