From 3a895e21e7299bad7402848add41d911fbbadbd7 Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Wed, 3 May 2017 15:35:12 +0300 Subject: [PATCH] [shelf]: change patch PreLoader storage map to SoftHardCacheMap --- .../openapi/vcs/changes/shelf/DiffShelvedChangesAction.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesAction.java index 18120298e8b0..ac4d8c5b7567 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesAction.java @@ -26,6 +26,7 @@ import com.intellij.diff.contents.DiffContent; import com.intellij.diff.requests.DiffRequest; import com.intellij.diff.requests.SimpleDiffRequest; import com.intellij.diff.requests.UnknownFileTypeDiffRequest; +import com.intellij.diff.tools.util.SoftHardCacheMap; import com.intellij.diff.util.DiffUtil; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; @@ -217,7 +218,7 @@ public class DiffShelvedChangesAction extends AnAction implements DumbAware { return new UnknownFileTypeDiffRequest(file, getName()); } if (isNewFile) return createDiffRequest(project, shelvedChange.getChange(project), getName(), context, indicator); - + final CommitContext commitContext; final TextFilePatch patch; try { @@ -295,12 +296,11 @@ public class DiffShelvedChangesAction extends AnAction implements DumbAware { } static class PatchesPreloader { - private final Map> myFilePatchesMap; + private final SoftHardCacheMap> myFilePatchesMap = new SoftHardCacheMap<>(5, 5); private final Project myProject; PatchesPreloader(final Project project) { myProject = project; - myFilePatchesMap = new HashMap<>(); } @NotNull