MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix binary compatibility

Browse Source
This commit is contained in:
Konstantin Bulenkov
2014-06-09 11:46:30 +02:00
parent 79d53fd832
commit 40875a7c74
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/util/GitCommitCompareInfo.java
+6 -6
View File
@@ -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<GitRepository, Couple<List<GitCommit>>> myInfo = new HashMap<GitRepository, Couple<List<GitCommit>>>();
private final Map<GitRepository, Pair<List<GitCommit>, List<GitCommit>>> myInfo = new HashMap<GitRepository, Pair<List<GitCommit>, List<GitCommit>>>();
private final Map<GitRepository, Collection<Change>> myTotalDiff = new HashMap<GitRepository, Collection<Change>>();
private final InfoType myInfoType;
@@ -43,7 +43,7 @@ public class GitCommitCompareInfo {
myInfoType = infoType;
}
public void put(@NotNull GitRepository repository, @NotNull Couple<List<GitCommit>> commits) {
public void put(@NotNull GitRepository repository, @NotNull Pair<List<GitCommit>, List<GitCommit>> commits) {
myInfo.put(repository, commits);
}
@@ -62,11 +62,11 @@ public class GitCommitCompareInfo {
}
@NotNull
private Couple<List<GitCommit>> getCompareInfo(@NotNull GitRepository repo) {
Couple<List<GitCommit>> pair = myInfo.get(repo);
private Pair<List<GitCommit>, List<GitCommit>> getCompareInfo(@NotNull GitRepository repo) {
Pair<List<GitCommit>, List<GitCommit>> pair = myInfo.get(repo);
if (pair == null) {
LOG.error("Compare info not found for repository " + repo);
return Couple.of(Collections.<GitCommit>emptyList(), Collections.<GitCommit>emptyList());
return Pair.create(Collections.<GitCommit>emptyList(), Collections.<GitCommit>emptyList());
}
return pair;
}