From 671d31cfbb94cf9a354696c0d2f11a72ae848eab Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Tue, 28 Feb 2012 15:35:31 +0100
Subject: [PATCH] edt save

---
 .../ide/diff/VirtualFileDiffElement.java       | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/diff/VirtualFileDiffElement.java b/platform/platform-impl/src/com/intellij/ide/diff/VirtualFileDiffElement.java
index 90ec7c08a626..7ad3430e1848 100644
--- a/platform/platform-impl/src/com/intellij/ide/diff/VirtualFileDiffElement.java
+++ b/platform/platform-impl/src/com/intellij/ide/diff/VirtualFileDiffElement.java
@@ -19,8 +19,7 @@ import com.intellij.ide.presentation.VirtualFilePresentation;
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.openapi.actionSystem.DataProvider;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
-import com.intellij.openapi.application.AccessToken;
-import com.intellij.openapi.application.WriteAction;
+import com.intellij.openapi.application.ex.ApplicationManagerEx;
 import com.intellij.openapi.diff.DiffRequest;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
@@ -275,15 +274,14 @@ public class VirtualFileDiffElement extends DiffElement<VirtualFile> {
       }
 
       if (!docsToSave.isEmpty()) {
-        AccessToken token = WriteAction.start();
-        try {
-          for (Document document : docsToSave) {
-            manager.saveDocument(document);
+        ApplicationManagerEx.getApplicationEx().runEdtSafeAction(new Runnable() {
+          @Override
+          public void run() {
+            for (Document document : docsToSave) {
+              manager.saveDocument(document);
+            }
           }
-        }
-        finally {
-          token.finish();
-        }
+        });
       }
       if (!FileWatcher.getInstance().isWatched(virtualFile)) {
         ((NewVirtualFile)virtualFile).markDirtyRecursively();