diff: add annotate action to diff viewers

[idea/community.git] / platform / diff-impl / src / com / intellij / diff / tools / fragmented / UnifiedDiffViewer.java

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 d54b5158f70f2cd2c0b755dafdbcddd80be680fd..f3eb5b650c993f2854b46b8cd3205aa723fbcc55 100644 (file)
--- a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java
@@ -459,7 +459,7 @@ public class UnifiedDiffViewer extends ListenerDiffViewerBase {
    * This convertor returns -1 if exact matching is impossible
    */
   @CalledInAwt
    * This convertor returns -1 if exact matching is impossible
    */
   @CalledInAwt

-  protected int transferLineToOnesideStrict(@NotNull Side side, int line) {
+  public int transferLineToOnesideStrict(@NotNull Side side, int line) {

     if (myChangedBlockData == null) return -1;
 
     LineNumberConvertor lineConvertor = myChangedBlockData.getLineNumberConvertor();
     if (myChangedBlockData == null) return -1;
 
     LineNumberConvertor lineConvertor = myChangedBlockData.getLineNumberConvertor();


@@ -470,7 +470,7 @@ public class UnifiedDiffViewer extends ListenerDiffViewerBase {
    * This convertor returns -1 if exact matching is impossible
    */
   @CalledInAwt
    * This convertor returns -1 if exact matching is impossible
    */
   @CalledInAwt

-  protected int transferLineFromOnesideStrict(@NotNull Side side, int line) {
+  public int transferLineFromOnesideStrict(@NotNull Side side, int line) {

     if (myChangedBlockData == null) return -1;
 
     LineNumberConvertor lineConvertor = myChangedBlockData.getLineNumberConvertor();
     if (myChangedBlockData == null) return -1;
 
     LineNumberConvertor lineConvertor = myChangedBlockData.getLineNumberConvertor();


@@ -481,7 +481,7 @@ public class UnifiedDiffViewer extends ListenerDiffViewerBase {
    * This convertor returns 'good enough' position, even if exact matching is impossible
    */
   @CalledInAwt
    * This convertor returns 'good enough' position, even if exact matching is impossible
    */
   @CalledInAwt

-  protected int transferLineToOneside(@NotNull Side side, int line) {
+  public int transferLineToOneside(@NotNull Side side, int line) {

     if (myChangedBlockData == null) return line;
 
     LineNumberConvertor lineConvertor = myChangedBlockData.getLineNumberConvertor();
     if (myChangedBlockData == null) return line;
 
     LineNumberConvertor lineConvertor = myChangedBlockData.getLineNumberConvertor();


@@ -493,7 +493,7 @@ public class UnifiedDiffViewer extends ListenerDiffViewerBase {
    */
   @CalledInAwt
   @NotNull
    */
   @CalledInAwt
   @NotNull

-  protected Pair<int[], Side> transferLineFromOneside(int line) {
+  public Pair<int[], Side> transferLineFromOneside(int line) {

     int[] lines = new int[2];
 
     if (myChangedBlockData == null) {
     int[] lines = new int[2];
 
     if (myChangedBlockData == null) {


@@ -839,6 +839,12 @@ public class UnifiedDiffViewer extends ListenerDiffViewerBase {
   // Getters
   //
 
   // Getters
   //
 

+
+  @NotNull
+  public Side getMasterSide() {
+    return myMasterSide;
+  }
+

   @NotNull
   public EditorEx getEditor() {
     return myEditor;
   @NotNull
   public EditorEx getEditor() {
     return myEditor;