From 965e3f2cffab6bb64ec89e4c56eaee3d9412aeff Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Mon, 5 Aug 2013 18:26:09 +0400
Subject: [PATCH] cleanup

---
 .../src/com/intellij/concurrency/JobSchedulerImpl.java    | 8 ++++----
 .../com/intellij/concurrency/PrioritizedFutureTask.java   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/concurrency/JobSchedulerImpl.java b/platform/platform-impl/src/com/intellij/concurrency/JobSchedulerImpl.java
index ff2270325cab..366615108899 100644
--- a/platform/platform-impl/src/com/intellij/concurrency/JobSchedulerImpl.java
+++ b/platform/platform-impl/src/com/intellij/concurrency/JobSchedulerImpl.java
@@ -62,8 +62,8 @@ public class JobSchedulerImpl extends JobScheduler implements Disposable {
     return ourQueue.poll();
   }
 
-  static void submitTask(PrioritizedFutureTask future, boolean callerHasReadAccess, boolean reportExceptions) {
-    future.beforeRun(callerHasReadAccess, reportExceptions);
+  static void submitTask(@NotNull PrioritizedFutureTask future, boolean runInReadAction, boolean reportExceptions) {
+    future.beforeRun(runInReadAction, reportExceptions);
     ourExecutor.executeTask(future);
   }
 
@@ -72,12 +72,12 @@ public class JobSchedulerImpl extends JobScheduler implements Disposable {
       super(CORES_COUNT, Integer.MAX_VALUE, 60 * 10, TimeUnit.SECONDS, ourQueue, WORKERS_FACTORY);
     }
 
-    private void executeTask(final PrioritizedFutureTask task) {
+    private void executeTask(@NotNull PrioritizedFutureTask task) {
       super.execute(task);
     }
 
     @Override
-    public void execute(Runnable command) {
+    public void execute(@NotNull Runnable command) {
       throw new IllegalStateException("Use executeTask() to submit PrioritizedFutureTasks only");
     }
   }
diff --git a/platform/platform-impl/src/com/intellij/concurrency/PrioritizedFutureTask.java b/platform/platform-impl/src/com/intellij/concurrency/PrioritizedFutureTask.java
index 0b6646fedd86..799750ed5339 100644
--- a/platform/platform-impl/src/com/intellij/concurrency/PrioritizedFutureTask.java
+++ b/platform/platform-impl/src/com/intellij/concurrency/PrioritizedFutureTask.java
@@ -36,7 +36,7 @@ class PrioritizedFutureTask<T> extends FutureTask<T> implements Comparable<Prior
   private final int myTaskIndex;
   private final int myPriority;
   private final boolean myFailFastOnAcquireReadAction;
-  private volatile boolean myParentThreadHasReadAccess;
+  private volatile boolean myRunInReadAction;
   private volatile boolean myReportExceptions;
 
   PrioritizedFutureTask(final Callable<T> callable,
@@ -53,8 +53,8 @@ class PrioritizedFutureTask<T> extends FutureTask<T> implements Comparable<Prior
     myFailFastOnAcquireReadAction = failFastOnAcquireReadAction;
   }
 
-  public void beforeRun(boolean parentThreadHasReadAccess, boolean reportExceptions) {
-    myParentThreadHasReadAccess = parentThreadHasReadAccess;
+  public void beforeRun(boolean runInReadAction, boolean reportExceptions) {
+    myRunInReadAction = runInReadAction;
     myReportExceptions = reportExceptions;
   }
 
@@ -93,7 +93,7 @@ class PrioritizedFutureTask<T> extends FutureTask<T> implements Comparable<Prior
         }
       }
     };
-    if (myParentThreadHasReadAccess) {
+    if (myRunInReadAction) {
       // have to start "real" read action so that we cannot start write action until we are finished here
       if (myFailFastOnAcquireReadAction) {
         if (!ApplicationManagerEx.getApplicationEx().tryRunReadAction(runnable)) {