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: cleanup

Browse Source 
SimpleThreesideDiffViewer does not support modifications
This commit is contained in:
Aleksey Pivovarov
2015-03-05 18:43:17 +03:00
parent 50ff5363c6
commit 26321e238a
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffChange.java
-18
View File
@@ -37,9 +37,7 @@ public class SimpleThreesideDiffChange {
@NotNull private ConflictType myType;
@NotNull private final List<RangeHighlighter> myHighlighters = new ArrayList<RangeHighlighter>();
@NotNull private final List<RangeHighlighter> myActionHighlighters = new ArrayList<RangeHighlighter>();
private boolean myIsValid = true;
private int[] myLineStartShifts = new int[3];
private int[] myLineEndShifts = new int[3];
@@ -60,8 +58,6 @@ public class SimpleThreesideDiffChange {
createHighlighter(ThreeSide.BASE);
if (myType.isLeftChange()) createHighlighter(ThreeSide.LEFT);
if (myType.isRightChange()) createHighlighter(ThreeSide.RIGHT);
doInstallActionHighlighters();
}
public void destroyHighlighter() {
@@ -69,11 +65,6 @@ public class SimpleThreesideDiffChange {
highlighter.dispose();
}
myHighlighters.clear();
for (RangeHighlighter highlighter : myActionHighlighters) {
highlighter.dispose();
}
myActionHighlighters.clear();
}
//
@@ -110,10 +101,6 @@ public class SimpleThreesideDiffChange {
}
}
private void doInstallActionHighlighters() {
// TODO
}
//
// Getters
//
@@ -156,11 +143,6 @@ public class SimpleThreesideDiffChange {
return false;
}
for (RangeHighlighter highlighter : myActionHighlighters) {
highlighter.dispose();
}
myActionHighlighters.clear();
myIsValid = false;
return true;
}