From 5ec4a69f232deabc727704fa29dbb1bd1de7fe11 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Thu, 3 Mar 2016 16:26:47 +0300
Subject: [PATCH] merge: @CalledInAwt

---
 .../diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java | 3 +++
 .../intellij/diff/tools/simple/SimpleThreesideDiffViewer.java  | 1 +
 .../intellij/diff/tools/simple/ThreesideTextDiffViewerEx.java  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java b/platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java
index 2fac9c582716..40c1ac115783 100644
--- a/platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java
+++ b/platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java
@@ -439,6 +439,7 @@ public class TextMergeViewer implements MergeTool.MergeViewer {
     }
 
     @Override
+    @CalledInAwt
     protected void destroyChangedBlocks() {
       super.destroyChangedBlocks();
       myInnerDiffWorker.stop();
@@ -496,6 +497,7 @@ public class TextMergeViewer implements MergeTool.MergeViewer {
         }
       }
 
+      @CalledInAwt
       public void stop() {
         if (myProgress != null) myProgress.cancel();
         myProgress = null;
@@ -503,6 +505,7 @@ public class TextMergeViewer implements MergeTool.MergeViewer {
         myAlarm.cancelAllRequests();
       }
 
+      @CalledInAwt
       private void putChanges(@NotNull Collection<TextMergeChange> changes) {
         for (TextMergeChange change : changes) {
           if (change.isResolved()) continue;
diff --git a/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffViewer.java
index 641666bbb94b..433c1a9f692d 100644
--- a/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffViewer.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffViewer.java
@@ -219,6 +219,7 @@ public class SimpleThreesideDiffViewer extends ThreesideTextDiffViewerEx {
   }
 
   @Override
+  @CalledInAwt
   protected void destroyChangedBlocks() {
     super.destroyChangedBlocks();
     for (SimpleThreesideDiffChange change : myDiffChanges) {
diff --git a/platform/diff-impl/src/com/intellij/diff/tools/simple/ThreesideTextDiffViewerEx.java b/platform/diff-impl/src/com/intellij/diff/tools/simple/ThreesideTextDiffViewerEx.java
index 97555411c251..dea8e51bff60 100644
--- a/platform/diff-impl/src/com/intellij/diff/tools/simple/ThreesideTextDiffViewerEx.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/simple/ThreesideTextDiffViewerEx.java
@@ -120,6 +120,7 @@ public abstract class ThreesideTextDiffViewerEx extends ThreesideTextDiffViewer
     };
   }
 
+  @CalledInAwt
   protected void clearDiffPresentation() {
     myStatusPanel.setBusy(false);
     myPanel.resetNotifications();
@@ -129,6 +130,7 @@ public abstract class ThreesideTextDiffViewerEx extends ThreesideTextDiffViewer
     myStatusPanel.update();
   }
 
+  @CalledInAwt
   protected void destroyChangedBlocks() {
     myFoldingModel.destroy();
   }