From 570528accd42852e56477a48b6130fcbc6cee234 Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Thu, 13 Apr 2017 19:37:54 +0300 Subject: [PATCH] [diff]: move scrollToChange method implementation to its base class --- .../intellij/diff/tools/fragmented/UnifiedDiffViewer.java | 5 ----- .../diff/tools/util/PrevNextDifferenceIterableBase.java | 5 ++++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java index 4960be28dd63..53c639c0b96f 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java @@ -957,11 +957,6 @@ public class UnifiedDiffViewer extends ListenerDiffViewerBase { protected int getEndLine(@NotNull UnifiedDiffChange change) { return change.getLine2(); } - - @Override - protected void scrollToChange(@NotNull UnifiedDiffChange change) { - DiffUtil.scrollEditor(myEditor, change.getLine1(), true); - } } private class MyOpenInEditorWithMouseAction extends OpenInEditorWithMouseAction { diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/PrevNextDifferenceIterableBase.java b/platform/diff-impl/src/com/intellij/diff/tools/util/PrevNextDifferenceIterableBase.java index cda8d9d90219..1086fa2e6a13 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/util/PrevNextDifferenceIterableBase.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/PrevNextDifferenceIterableBase.java @@ -15,6 +15,7 @@ */ package com.intellij.diff.tools.util; +import com.intellij.diff.util.DiffUtil; import com.intellij.openapi.editor.ex.EditorEx; import org.jetbrains.annotations.NotNull; @@ -31,7 +32,9 @@ public abstract class PrevNextDifferenceIterableBase implements PrevNextDiffe protected abstract int getEndLine(@NotNull T change); - protected abstract void scrollToChange(@NotNull T change); + protected void scrollToChange(@NotNull T change) { + DiffUtil.scrollEditor(getEditor(), getStartLine(change), true); + } @Override public boolean canGoNext() {