From 2d400f8ce5cd8c204a9050ca42eff5e75d76af89 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Thu, 18 Jun 2015 17:34:33 +0300 Subject: [PATCH] diff: move helper class --- .../src/com/intellij/diff/util}/LineCol.java | 7 ++++++- .../intellij/diff/tools/fragmented/OnesideDiffViewer.java | 5 +---- 2 files changed, 7 insertions(+), 5 deletions(-) rename platform/{diff-impl/src/com/intellij/diff/tools/fragmented => diff-api/src/com/intellij/diff/util}/LineCol.java (94%) diff --git a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/LineCol.java b/platform/diff-api/src/com/intellij/diff/util/LineCol.java similarity index 94% rename from platform/diff-impl/src/com/intellij/diff/tools/fragmented/LineCol.java rename to platform/diff-api/src/com/intellij/diff/util/LineCol.java index 965e347a209f..c5ce3751e3fa 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/LineCol.java +++ b/platform/diff-api/src/com/intellij/diff/util/LineCol.java @@ -13,15 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.diff.tools.fragmented; +package com.intellij.diff.util; import com.intellij.openapi.editor.Document; import org.jetbrains.annotations.NotNull; public class LineCol { + // counting from zero public final int line; public final int column; + public LineCol(int line) { + this(line, 0); + } + public LineCol(int line, int column) { this.line = line; this.column = column; diff --git a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideDiffViewer.java index 585e7ca6f193..284637231638 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideDiffViewer.java @@ -29,12 +29,9 @@ import com.intellij.diff.requests.DiffRequest; import com.intellij.diff.tools.util.*; import com.intellij.diff.tools.util.base.*; import com.intellij.diff.tools.util.side.TwosideTextDiffViewer; -import com.intellij.diff.util.DiffUserDataKeys; +import com.intellij.diff.util.*; import com.intellij.diff.util.DiffUserDataKeysEx.ScrollToPolicy; -import com.intellij.diff.util.DiffUtil; import com.intellij.diff.util.DiffUtil.DocumentData; -import com.intellij.diff.util.LineRange; -import com.intellij.diff.util.Side; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.CommonDataKeys;