diff --git a/plugins/git4idea/src/git4idea/util/GitCommitCompareInfo.java b/plugins/git4idea/src/git4idea/util/GitCommitCompareInfo.java index c04077b817f4..2986fb79adda 100644 --- a/plugins/git4idea/src/git4idea/util/GitCommitCompareInfo.java +++ b/plugins/git4idea/src/git4idea/util/GitCommitCompareInfo.java @@ -16,7 +16,7 @@ package git4idea.util; import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.util.Couple; +import com.intellij.openapi.util.Pair; import com.intellij.openapi.vcs.changes.Change; import git4idea.GitCommit; import git4idea.repo.GitRepository; @@ -31,7 +31,7 @@ public class GitCommitCompareInfo { private static final Logger LOG = Logger.getInstance(GitCommitCompareInfo.class); - private final Map>> myInfo = new HashMap>>(); + private final Map, List>> myInfo = new HashMap, List>>(); private final Map> myTotalDiff = new HashMap>(); private final InfoType myInfoType; @@ -43,7 +43,7 @@ public class GitCommitCompareInfo { myInfoType = infoType; } - public void put(@NotNull GitRepository repository, @NotNull Couple> commits) { + public void put(@NotNull GitRepository repository, @NotNull Pair, List> commits) { myInfo.put(repository, commits); } @@ -62,11 +62,11 @@ public class GitCommitCompareInfo { } @NotNull - private Couple> getCompareInfo(@NotNull GitRepository repo) { - Couple> pair = myInfo.get(repo); + private Pair, List> getCompareInfo(@NotNull GitRepository repo) { + Pair, List> pair = myInfo.get(repo); if (pair == null) { LOG.error("Compare info not found for repository " + repo); - return Couple.of(Collections.emptyList(), Collections.emptyList()); + return Pair.create(Collections.emptyList(), Collections.emptyList()); } return pair; }