From 9ff4ea4e8394b895624df079321d9e1810cb5504 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Sat, 18 Jan 2014 17:06:17 +0400 Subject: [PATCH] [vcs] Remove read action from loading byte content from java.io.File --- .../src/com/intellij/vcsUtil/VcsUtil.java | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java b/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java index bbeeae9e99f6..7cb5f4aff918 100644 --- a/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java +++ b/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java @@ -18,7 +18,6 @@ package com.intellij.vcsUtil; import com.intellij.ide.util.PropertiesComponent; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonDataKeys; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; @@ -294,21 +293,15 @@ public class VcsUtil { }); } - // FileDocumentManager has difficulties in loading the content for files - // which are outside the project structure? - public static byte[] getFileByteContent(final File file) throws IOException { - return ApplicationManager.getApplication().runReadAction(new Computable() { - public byte[] compute() { - byte[] content; - try { - content = FileUtil.loadFileBytes(file); - } - catch (IOException e) { - content = null; - } - return content; - } - }); + @Nullable + public static byte[] getFileByteContent(@NotNull File file) throws IOException { + try { + return FileUtil.loadFileBytes(file); + } + catch (IOException e) { + LOG.info(e); + return null; + } } public static FilePath getFilePath(String path) {