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

cleanup

Browse Source
This commit is contained in:
Vladimir Krivosheev
2015-02-23 12:29:25 +01:00
parent 7d698151c0
commit ad56e564e6
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/DiffManagerImpl.java
+2 -9
View File
@@ -26,7 +26,6 @@ import com.intellij.diff.tools.external.ExternalDiffTool;
import com.intellij.diff.tools.fragmented.OnesideDiffTool;
import com.intellij.diff.tools.simple.SimpleDiffTool;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Disposer;
import org.jetbrains.annotations.NotNull;
@@ -34,11 +33,10 @@ import org.jetbrains.annotations.Nullable;
import java.awt.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
public class DiffManagerImpl extends DiffManagerEx {
private static final Logger LOG = Logger.getInstance(DiffManagerImpl.class);
@Override
public void showDiff(@Nullable Project project, @NotNull DiffRequest request) {
showDiff(project, request, DiffDialogHints.DEFAULT);
@@ -88,16 +86,11 @@ public class DiffManagerImpl extends DiffManagerEx {
@Override
public List<DiffTool> getDiffTools() {
List<DiffTool> result = new ArrayList<DiffTool>();
result.add(SimpleDiffTool.INSTANCE);
result.add(OnesideDiffTool.INSTANCE);
result.add(BinaryDiffTool.INSTANCE);
result.add(DirDiffTool.INSTANCE);
for (DiffTool tool : DiffTool.EP_NAME.getExtensions()) {
result.add(tool);
}
Collections.addAll(result, DiffTool.EP_NAME.getExtensions());
return result;
}
}