From 7a667f03484a2b2e610c898ab117436db40d4ef4 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Thu, 30 Mar 2017 14:48:07 +0300
Subject: [PATCH] merge: remove unused method

---
 .../vcs/changes/actions/migrate/MigrateDiffTool.java  |  5 ++---
 .../changes/actions/migrate/MigrateToNewDiffUtil.java | 11 -----------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateDiffTool.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateDiffTool.java
index 9d8914d03ff1..39f91e212daf 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateDiffTool.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateDiffTool.java
@@ -17,7 +17,6 @@ package com.intellij.openapi.vcs.changes.actions.migrate;
 
 import com.intellij.diff.DiffDialogHints;
 import com.intellij.diff.DiffManager;
-import com.intellij.diff.chains.DiffRequestChain;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.diff.DiffRequest;
 import com.intellij.openapi.diff.DiffTool;
@@ -39,9 +38,9 @@ public class MigrateDiffTool implements DiffTool {
 
   @Override
   public void show(DiffRequest request) {
-    DiffRequestChain newChain = MigrateToNewDiffUtil.convertRequestChain(request);
+    com.intellij.diff.requests.DiffRequest newRequest = MigrateToNewDiffUtil.convertRequest(request);
     WindowWrapper.Mode mode = FrameDiffTool.shouldOpenDialog(request.getHints()) ? WindowWrapper.Mode.MODAL : WindowWrapper.Mode.FRAME;
-    DiffManager.getInstance().showDiff(request.getProject(), newChain, new DiffDialogHints(mode));
+    DiffManager.getInstance().showDiff(request.getProject(), newRequest, new DiffDialogHints(mode));
   }
 
   @Override
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateToNewDiffUtil.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateToNewDiffUtil.java
index 74f6e961f0dc..b1c9e1e63f30 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateToNewDiffUtil.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateToNewDiffUtil.java
@@ -1,9 +1,7 @@
 package com.intellij.openapi.vcs.changes.actions.migrate;
 
-import com.intellij.diff.chains.DiffRequestChain;
 import com.intellij.diff.chains.DiffRequestProducer;
 import com.intellij.diff.chains.DiffRequestProducerException;
-import com.intellij.diff.chains.SimpleDiffRequestChain;
 import com.intellij.diff.contents.DiffContent;
 import com.intellij.diff.contents.DocumentContentImpl;
 import com.intellij.diff.contents.EmptyContent;
@@ -13,7 +11,6 @@ import com.intellij.diff.requests.ErrorDiffRequest;
 import com.intellij.diff.requests.SimpleDiffRequest;
 import com.intellij.diff.util.DiffUserDataKeysEx;
 import com.intellij.diff.util.LineCol;
-import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.diff.DiffNavigationContext;
 import com.intellij.openapi.diff.DiffTool;
 import com.intellij.openapi.editor.Document;
@@ -34,16 +31,8 @@ import java.util.List;
 import static com.intellij.openapi.util.text.StringUtil.notNullize;
 
 public class MigrateToNewDiffUtil {
-  private static final Logger LOG = Logger.getInstance(MigrateToNewDiffUtil.class);
-
   @NonNls public static final Object DO_NOT_TRY_MIGRATE = "doNotTryMigrate";
 
-  @NotNull
-  public static DiffRequestChain convertRequestChain(@NotNull com.intellij.openapi.diff.DiffRequest oldRequest) {
-    DiffRequest request = convertRequest(oldRequest);
-    return new SimpleDiffRequestChain(request);
-  }
-
   @NotNull
   public static DiffRequest convertRequest(@NotNull com.intellij.openapi.diff.DiffRequest oldRequest) {
     DiffRequest request = convertRequestFair(oldRequest);