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

diff: remove dead code - DiffManager.createDiffPanel

Browse Source
This commit is contained in:
Aleksey Pivovarov
2018-07-16 13:19:22 +03:00
parent 23bb967a53
commit d527cd0329
3 changed files with 4 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/diff/DiffManager.java
-14
View File
@@ -15,13 +15,8 @@
*/
package com.intellij.openapi.diff;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.editor.markup.MarkupEditorFilter;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
import java.awt.*;
/**
* @deprecated use {@link com.intellij.diff.DiffManager} instead
@@ -46,13 +41,4 @@ public abstract class DiffManager {
public abstract DiffTool getIdeaDiffTool();
public abstract MarkupEditorFilter getDiffEditorFilter();
/**
* @param window this window will be disposed, when user clicks on the line number
* You must call Disposer.dispose() when done.
* @param parentTool @deprecated use {@link #createDiffPanel(Window, Project, Disposable)} instead
*/
public abstract DiffPanel createDiffPanel(Window window, @NotNull Project project, DiffTool parentTool);
public abstract DiffPanel createDiffPanel(Window window, @NotNull Project project, @NotNull Disposable parentDisposable, DiffTool parentTool);
}
platform/platform-impl/src/com/intellij/openapi/diff/impl/external/BinaryDiffTool.java
Vendored
+1 -3
View File
@@ -133,9 +133,7 @@ public class BinaryDiffTool implements DiffTool {
public DiffPanel create(final Window window, final Disposable disposable, final BinaryDiffTool tool) {
if (! myCanCreatePanel) return null;
final Project project = myData.getProject();
final DiffPanel panel = DiffManager.getInstance().createDiffPanel(window, project, disposable, tool);
panel.setDiffRequest(myData);
final DiffPanel panel = DiffManagerImpl.createDiffPanel(myData, window, disposable, tool);
panel.removeStatusBar();
return panel;
}
platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffManagerImpl.java
Vendored
+3 -15
View File
@@ -16,7 +16,6 @@ import com.intellij.openapi.diff.impl.DiffUtil;
import com.intellij.openapi.diff.impl.mergeTool.MergeTool;
import com.intellij.openapi.diff.impl.processing.HighlightMode;
import com.intellij.openapi.editor.markup.MarkupEditorFilter;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.vcs.changes.actions.migrate.MigrateDiffTool;
import com.intellij.util.config.*;
@@ -136,18 +135,6 @@ public class DiffManagerImpl extends DiffManager implements PersistentStateCompo
return DIFF_EDITOR_FILTER;
}
@Override
public DiffPanel createDiffPanel(Window window, @NotNull Project project, DiffTool parentTool) {
return new DiffPanelImpl(window, project, true, true, FULL_DIFF_DIVIDER_POLYGONS_OFFSET, parentTool);
}
@Override
public DiffPanel createDiffPanel(Window window, @NotNull Project project, @NotNull Disposable parentDisposable, DiffTool parentTool) {
DiffPanel diffPanel = createDiffPanel(window, project, parentTool);
Disposer.register(parentDisposable, diffPanel);
return diffPanel;
}
public static DiffManagerImpl getInstanceEx() {
return (DiffManagerImpl)DiffManager.getInstance();
}
@@ -194,10 +181,11 @@ public class DiffManagerImpl extends DiffManager implements PersistentStateCompo
return myProperties;
}
static DiffPanel createDiffPanel(DiffRequest data, Window window, @NotNull Disposable parentDisposable, FrameDiffTool tool) {
static DiffPanel createDiffPanel(DiffRequest data, Window window, @NotNull Disposable parentDisposable, DiffTool tool) {
DiffPanel diffPanel = null;
try {
diffPanel = DiffManager.getInstance().createDiffPanel(window, data.getProject(), parentDisposable, tool);
diffPanel = new DiffPanelImpl(window, data.getProject(), true, true, FULL_DIFF_DIVIDER_POLYGONS_OFFSET, tool);
Disposer.register(parentDisposable, diffPanel);
int contentCount = data.getContents().length;
LOG.assertTrue(contentCount == 2, String.valueOf(contentCount));
LOG.assertTrue(data.getContentTitles().length == contentCount);