From 3a55f07fb451cd9c449a09234990b2ae9d580b7b Mon Sep 17 00:00:00 2001
From: Julia Beliaeva <Julia.Beliaeva@jetbrains.com>
Date: Sat, 29 Jul 2017 23:16:10 +0300
Subject: [PATCH] [vcs-log] use Comparator.reverseOrder and
 Comparator.comparingInt methods

---
 .../graph/impl/permanent/PermanentLinearGraphBuilder.java  | 7 ++-----
 .../vcs/log/graph/linearBek/LinearBekController.java       | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/permanent/PermanentLinearGraphBuilder.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/permanent/PermanentLinearGraphBuilder.java
index cd58626b302b..3a499caa9f16 100644
--- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/permanent/PermanentLinearGraphBuilder.java
+++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/permanent/PermanentLinearGraphBuilder.java
@@ -25,10 +25,7 @@ import com.intellij.vcs.log.graph.utils.impl.BitSetFlags;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static com.intellij.vcs.log.graph.impl.permanent.DuplicateParentFixer.fixDuplicateParentCommits;
 
@@ -155,7 +152,7 @@ public class PermanentLinearGraphBuilder<CommitId> {
 
   private void fixUnderdoneEdges(@NotNull NotNullFunction<CommitId, Integer> notLoadedCommitToId) {
     List<CommitId> commitIds = ContainerUtil.newArrayList(upAdjacentNodes.keySet());
-    ContainerUtil.sort(commitIds, (o1, o2) -> Collections.min(upAdjacentNodes.get(o1)) - Collections.min(upAdjacentNodes.get(o2)));
+    ContainerUtil.sort(commitIds, Comparator.comparingInt(o -> Collections.min(upAdjacentNodes.get(o))));
     for (CommitId notLoadCommit : commitIds) {
       int notLoadId = notLoadedCommitToId.fun(notLoadCommit);
       for (int upNodeIndex : upAdjacentNodes.get(notLoadCommit)) {
diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/linearBek/LinearBekController.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/linearBek/LinearBekController.java
index 936b52f2aeea..66c5a1528857 100644
--- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/linearBek/LinearBekController.java
+++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/linearBek/LinearBekController.java
@@ -169,7 +169,7 @@ public class LinearBekController extends CascadeController {
   }
 
   private SortedSet<Integer> collectNodesToCollapse(GraphNode node) {
-    SortedSet<Integer> toCollapse = new TreeSet<>((o1, o2) -> o2.compareTo(o1));
+    SortedSet<Integer> toCollapse = new TreeSet<>(Comparator.reverseOrder());
     for (LinearBekGraphBuilder.MergeFragment f : collectFragmentsToCollapse(node)) {
       toCollapse.add(f.getParent());
       toCollapse.addAll(f.getTailsAndBody());