From c0b293ba3900f0d29c34f0cbbfd5141a56baf9ef Mon Sep 17 00:00:00 2001
From: Sergey Evdokimov <sergey.evdokimov@jetbrains.com>
Date: Wed, 15 Feb 2012 19:04:42 +0400
Subject: [PATCH] Simplifying code.

---
 .../MavenDefaultModifiableModelsProvider.java    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenDefaultModifiableModelsProvider.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenDefaultModifiableModelsProvider.java
index b970512c042b..b98d5e4db9c0 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenDefaultModifiableModelsProvider.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenDefaultModifiableModelsProvider.java
@@ -17,9 +17,7 @@ package org.jetbrains.idea.maven.importing;
 
 import com.intellij.facet.FacetManager;
 import com.intellij.facet.ModifiableFacetModel;
-import com.intellij.openapi.application.ModalityState;
-import com.intellij.openapi.application.ReadAction;
-import com.intellij.openapi.application.Result;
+import com.intellij.openapi.application.*;
 import com.intellij.openapi.module.ModifiableModuleModel;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
@@ -56,11 +54,13 @@ public class MavenDefaultModifiableModelsProvider extends MavenBaseModifiableMod
 
   @Override
   protected ModifiableModuleModel doGetModuleModel() {
-    return new ReadAction<ModifiableModuleModel>() {
-      protected void run(Result<ModifiableModuleModel> result) throws Throwable {
-        result.setResult(ModuleManager.getInstance(myProject).getModifiableModel());
-      }
-    }.execute().getResultObject();
+    AccessToken accessToken = ApplicationManager.getApplication().acquireReadActionLock();
+    try {
+      return ModuleManager.getInstance(myProject).getModifiableModel();
+    }
+    finally {
+      accessToken.finish();
+    }
   }
 
   @Override