From 346fac04258a1b50d486a91a6c22b5c7be5c1938 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 23 Mar 2012 16:43:54 +0100
Subject: [PATCH] don't assert read access in Document which is for non-AWT use

---
 .../openapi/editor/impl/DocumentImpl.java     | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/platform/core-impl/src/com/intellij/openapi/editor/impl/DocumentImpl.java b/platform/core-impl/src/com/intellij/openapi/editor/impl/DocumentImpl.java
index efbace051a9c..437d7233a42c 100644
--- a/platform/core-impl/src/com/intellij/openapi/editor/impl/DocumentImpl.java
+++ b/platform/core-impl/src/com/intellij/openapi/editor/impl/DocumentImpl.java
@@ -72,7 +72,7 @@ public class DocumentImpl extends UserDataHolderBase implements DocumentEx {
   private int myCheckGuardedBlocks = 0;
   private boolean myGuardsSuppressed = false;
   private boolean myEventsHandling = false;
-  private final boolean myAssertWriteAccess;
+  private final boolean myAssertThreading;
   private volatile boolean myDoingBulkUpdate = false;
   private volatile boolean myAcceptSlashR = false;
   private boolean myChangeInProgress;
@@ -90,7 +90,7 @@ public class DocumentImpl extends UserDataHolderBase implements DocumentEx {
     myLineSet.documentCreated(this);
     setCyclicBufferSize(0);
     setModificationStamp(LocalTimeCounter.currentTime());
-    myAssertWriteAccess = !forUseInNonAWTThread;
+    myAssertThreading = !forUseInNonAWTThread;
   }
 
   public boolean setAcceptSlashR(boolean accept) {
@@ -424,7 +424,7 @@ public class DocumentImpl extends UserDataHolderBase implements DocumentEx {
   }
 
   private void assertWriteAccess() {
-    if (myAssertWriteAccess) {
+    if (myAssertThreading) {
       final Application application = ApplicationManager.getApplication();
       if (application != null) {
         application.assertWriteAccessAllowed();
@@ -826,14 +826,12 @@ public class DocumentImpl extends UserDataHolderBase implements DocumentEx {
 
     @Override
     protected void assertReadAccess() {
-      DocumentImpl.assertReadAccess();
-    }
-  }
-
-  private static void assertReadAccess() {
-    final Application application = ApplicationManager.getApplication();
-    if (application != null) {
-      application.assertReadAccessAllowed();
+      if (myAssertThreading) {
+        final Application application = ApplicationManager.getApplication();
+        if (application != null) {
+          application.assertReadAccessAllowed();
+        }
+      }
     }
   }
 }