From f7fc3e795e1f5ad5c43f224790afd44ecbdb573c Mon Sep 17 00:00:00 2001
From: Julia Beliaeva <Julia.Beliaeva@jetbrains.com>
Date: Mon, 31 Dec 2018 17:52:23 +0300
Subject: [PATCH] [vcs-log] use kotlin.Pair

---
 .../com/intellij/vcs/log/history/FileHistoryFilterer.kt  | 5 ++---
 .../src/com/intellij/vcs/log/visible/VcsLogFilterer.kt   | 1 -
 .../com/intellij/vcs/log/visible/VcsLogFiltererImpl.kt   | 9 ++++-----
 .../vcs/log/visible/VisiblePackRefresherImpl.java        | 4 ++--
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryFilterer.kt b/platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryFilterer.kt
index c1fc13db157c..04aaa929845f 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryFilterer.kt
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryFilterer.kt
@@ -2,7 +2,6 @@
 package com.intellij.vcs.log.history
 
 import com.intellij.openapi.diagnostic.Logger
-import com.intellij.openapi.util.Pair
 import com.intellij.openapi.vcs.AbstractVcs
 import com.intellij.openapi.vcs.FilePath
 import com.intellij.openapi.vcs.ProjectLevelVcsManager
@@ -71,7 +70,7 @@ internal class FileHistoryFilterer(logData: VcsLogData) : VcsLogFilterer {
         val visiblePack = filterWithIndex(dataPack, sortType, filters)
         LOG.debug(StopWatch.formatTime(System.currentTimeMillis() - start) + " for computing history for $filePath with index")
         if (checkNotEmpty(dataPack, visiblePack, true)) {
-          return Pair.create(visiblePack, commitCount)
+          return Pair(visiblePack, commitCount)
         }
       }
 
@@ -86,7 +85,7 @@ internal class FileHistoryFilterer(logData: VcsLogData) : VcsLogFilterer {
             LOG.debug(StopWatch.formatTime(System.currentTimeMillis() - start) +
                       " for computing history for $filePath with history provider")
             checkNotEmpty(dataPack, visiblePack, false)
-            Pair.create(visiblePack, commitCount)
+            Pair(visiblePack, commitCount)
           }
           catch (e: VcsException) {
             LOG.error(e)
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/visible/VcsLogFilterer.kt b/platform/vcs-log/impl/src/com/intellij/vcs/log/visible/VcsLogFilterer.kt
index 9c175b3d304b..bf93499d650e 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/visible/VcsLogFilterer.kt
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/visible/VcsLogFilterer.kt
@@ -1,7 +1,6 @@
 // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.vcs.log.visible
 
-import com.intellij.openapi.util.Pair
 import com.intellij.vcs.log.VcsLogFilterCollection
 import com.intellij.vcs.log.data.DataPack
 import com.intellij.vcs.log.graph.PermanentGraph
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/visible/VcsLogFiltererImpl.kt b/platform/vcs-log/impl/src/com/intellij/vcs/log/visible/VcsLogFiltererImpl.kt
index 9136c096c332..18a1278496bf 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/visible/VcsLogFiltererImpl.kt
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/visible/VcsLogFiltererImpl.kt
@@ -3,7 +3,6 @@ package com.intellij.vcs.log.visible
 
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.util.Computable
-import com.intellij.openapi.util.Pair
 import com.intellij.openapi.util.registry.Registry
 import com.intellij.openapi.vcs.VcsException
 import com.intellij.openapi.vfs.VirtualFile
@@ -57,7 +56,7 @@ class VcsLogFiltererImpl(private val logProviders: Map<VirtualFile, VcsLogProvid
     val visiblePack = VisiblePack(dataPack, visibleGraph, filterResult.canRequestMore, filters)
 
     LOG.debug(StopWatch.formatTime(System.currentTimeMillis() - start) + " for filtering by " + filters)
-    return Pair.create(visiblePack, filterResult.commitCount)
+    return Pair(visiblePack, filterResult.commitCount)
   }
 
   fun createVisibleGraph(dataPack: DataPack,
@@ -85,7 +84,7 @@ class VcsLogFiltererImpl(private val logProviders: Map<VirtualFile, VcsLogProvid
       visibleRoots.partition { index.isIndexed(it) }
     }
     else {
-      kotlin.Pair(emptyList(), visibleRoots.toList())
+      Pair(emptyList(), visibleRoots.toList())
     }
 
     val filteredWithIndex: Set<Int>? = if (rootsForIndex.isNotEmpty()) dataGetter?.filter(detailsFilters) else null
@@ -177,7 +176,7 @@ class VcsLogFiltererImpl(private val logProviders: Map<VirtualFile, VcsLogProvid
 
       val visibleGraph = dataPack.permanentGraph.createVisibleGraph(sortType, null, hashFilterResult)
       val visiblePack = VisiblePack(dataPack, visibleGraph, false, VcsLogFilterObject.collection(fromHashes(hashes)))
-      return Pair.create(visiblePack, CommitCountStage.ALL)
+      return Pair(visiblePack, CommitCountStage.ALL)
     }
 
     val textFilter = VcsLogFilterObject.fromPatternsList(ContainerUtil.newArrayList(hashes), false)
@@ -189,7 +188,7 @@ class VcsLogFiltererImpl(private val logProviders: Map<VirtualFile, VcsLogProvid
     val visibleGraph = dataPack.permanentGraph.createVisibleGraph(sortType, null, filterResult)
     val visiblePack = VisiblePack(dataPack, visibleGraph, textFilterResult.canRequestMore,
                                   VcsLogFilterObject.collection(fromHashes(hashes), textFilter))
-    return Pair.create(visiblePack, textFilterResult.commitCount)
+    return Pair(visiblePack, textFilterResult.commitCount)
   }
 
   fun getMatchingHeads(refs: RefsModel,
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/visible/VisiblePackRefresherImpl.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/visible/VisiblePackRefresherImpl.java
index 32255aa6c0c6..78d471bfb870 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/visible/VisiblePackRefresherImpl.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/visible/VisiblePackRefresherImpl.java
@@ -10,7 +10,6 @@ import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.progress.impl.CoreProgressManager;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.containers.ContainerUtil;
@@ -22,6 +21,7 @@ import com.intellij.vcs.log.data.VcsLogProgress;
 import com.intellij.vcs.log.data.index.VcsLogIndex;
 import com.intellij.vcs.log.graph.PermanentGraph;
 import com.intellij.vcs.log.visible.filters.VcsLogFilterObject;
+import kotlin.Pair;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -271,7 +271,7 @@ public class VisiblePackRefresherImpl implements VisiblePackRefresher, Disposabl
 
       VcsLogProgress.updateCurrentKey(new VisiblePackProgressKey(myLogId, false));
 
-      return state.withVisiblePack(pair.first).withCommitCount(pair.second);
+      return state.withVisiblePack(pair.getFirst()).withCommitCount(pair.getSecond());
     }
   }