1 files changed, 13 insertions, 13 deletions

diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogMultiRepoJoiner.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogMultiRepoJoiner.java
index 7006408943a8..072e0e26ace1 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogMultiRepoJoiner.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogMultiRepoJoiner.java
@@ -1,36 +1,36 @@
 package com.intellij.vcs.log.data;
 
 import com.intellij.util.containers.ContainerUtil;
-import com.intellij.vcs.log.TimedVcsCommit;
+import com.intellij.vcs.log.graph.GraphCommit;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 
-public class VcsLogMultiRepoJoiner {
+public class VcsLogMultiRepoJoiner<CommitId> {
 
   @NotNull
-  public List<? extends TimedVcsCommit> join(@NotNull Collection<List<? extends TimedVcsCommit>> logsFromRepos) {
+  public List<? extends GraphCommit<CommitId>> join(@NotNull Collection<List<? extends GraphCommit<CommitId>>> logsFromRepos) {
     if (logsFromRepos.size() == 1) {
       return logsFromRepos.iterator().next();
     }
 
     int size = 0;
-    for (List<? extends TimedVcsCommit> repo : logsFromRepos) {
+    for (List<? extends GraphCommit<CommitId>> repo : logsFromRepos) {
       size += repo.size();
     }
-    List<TimedVcsCommit> result = new ArrayList<TimedVcsCommit>(size);
+    List<GraphCommit<CommitId>> result = new ArrayList<GraphCommit<CommitId>>(size);
 
-    Map<TimedVcsCommit, Iterator<? extends TimedVcsCommit>> nextCommits = ContainerUtil.newHashMap();
-    for (List<? extends TimedVcsCommit> log : logsFromRepos) {
-      Iterator<? extends TimedVcsCommit> iterator = log.iterator();
+    Map<GraphCommit<CommitId>, Iterator<? extends GraphCommit<CommitId>>> nextCommits = ContainerUtil.newHashMap();
+    for (List<? extends GraphCommit<CommitId>> log : logsFromRepos) {
+      Iterator<? extends GraphCommit<CommitId>> iterator = log.iterator();
       if (iterator.hasNext()) {
         nextCommits.put(iterator.next(), iterator);
       }
     }
 
     while (!nextCommits.isEmpty()) {
-      TimedVcsCommit lastCommit = findLatestCommit(nextCommits.keySet());
-      Iterator<? extends TimedVcsCommit> iterator = nextCommits.get(lastCommit);
+      GraphCommit<CommitId> lastCommit = findLatestCommit(nextCommits.keySet());
+      Iterator<? extends GraphCommit<CommitId>> iterator = nextCommits.get(lastCommit);
       result.add(lastCommit);
       nextCommits.remove(lastCommit);
 
@@ -43,10 +43,10 @@ public class VcsLogMultiRepoJoiner {
   }
 
   @NotNull
-  private static TimedVcsCommit findLatestCommit(@NotNull Set<TimedVcsCommit> commits) {
+  private GraphCommit<CommitId> findLatestCommit(@NotNull Set<GraphCommit<CommitId>> commits) {
     long maxTimeStamp = Long.MIN_VALUE;
-    TimedVcsCommit lastCommit = null;
-    for (TimedVcsCommit commit : commits) {
+    GraphCommit<CommitId> lastCommit = null;
+    for (GraphCommit<CommitId> commit : commits) {
       if (commit.getTimestamp() >= maxTimeStamp) {
         maxTimeStamp = commit.getTimestamp();
         lastCommit = commit;