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

merge: remove unused method

Browse Source
This commit is contained in:
Aleksey Pivovarov
2017-03-30 15:31:11 +03:00
parent 3594082a82
commit 7a667f0348
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateDiffTool.java
+2 -3
View File
@@ -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
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateToNewDiffUtil.java
-11
View File
@@ -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);