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

IDEA-146998 diff: allow to change default settings in 'old diff'

Browse Source 
was broken by f9174b7
This commit is contained in:
Aleksey Pivovarov
2015-10-28 19:34:44 +03:00
parent 4354d61113
commit dc3074b0cd
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffPanelImpl.java
+6 -4
View File
@@ -181,13 +181,15 @@ public class DiffPanelImpl implements DiffPanelEx, ContentChangeListener, TwoSid
myPanel.setDataProvider(myDataProvider);
ComparisonPolicy comparisonPolicy = getComparisonPolicy();
if (comparisonPolicy != DiffManagerImpl.getInstanceEx().getComparisonPolicy()) {
setComparisonPolicy(comparisonPolicy);
ComparisonPolicy defaultComparisonPolicy = DiffManagerImpl.getInstanceEx().getComparisonPolicy();
if (comparisonPolicy != defaultComparisonPolicy) {
setComparisonPolicy(defaultComparisonPolicy, false);
}
HighlightMode highlightMode = getHighlightMode();
if (highlightMode != DiffManagerImpl.getInstanceEx().getHighlightMode()) {
setHighlightMode(highlightMode);
HighlightMode defaultHighlightMode = DiffManagerImpl.getInstanceEx().getHighlightMode();
if (highlightMode != defaultHighlightMode) {
setHighlightMode(defaultHighlightMode, false);
}
myVisibleAreaListener = new VisibleAreaListener() {