consulo
diff --git a/‎.consulo/runConfigurations/All_Tests.xml‎
Lines changed: 1 addition & 0 deletions b/‎.consulo/runConfigurations/All_Tests.xml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎java-impl/src/com/intellij/codeInspection/magicConstant/MagicConstantInspection.java‎
Lines changed: 6 additions & 4 deletions b/‎java-impl/src/com/intellij/codeInspection/magicConstant/MagicConstantInspection.java‎
Lines changed: 6 additions & 4 deletions
@@ -16,6 +16,7 @@
       <option name="TRANSPORT" value="0" />
       <option name="LOCAL" value="true" />
     </RunnerSettings>
+    <ConfigurationWrapper RunnerId="ConsuloDebuggerRunner" />
     <ConfigurationWrapper RunnerId="Debug" />
     <method>
       <option name="BuildArtifacts" enabled="true">
 
@@ -29,6 +29,7 @@
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.mustbe.consulo.RequiredDispatchThread;
 import com.intellij.analysis.AnalysisScope;
 import com.intellij.codeInsight.AnnotationUtil;
 import com.intellij.codeInsight.ExternalAnnotationsManager;
@@ -46,9 +47,9 @@
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.SdkModificator;
 import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
+import com.intellij.openapi.roots.ModuleExtensionWithSdkOrderEntry;
 import com.intellij.openapi.roots.OrderEntry;
 import com.intellij.openapi.roots.ProjectRootManager;
-import com.intellij.openapi.roots.SdkOrderEntry;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.io.FileUtil;
@@ -259,9 +260,9 @@ private static void checkAnnotationsJarAttached(@NotNull PsiFile file, @NotNull
 		Sdk jdk = null;
 		for(OrderEntry orderEntry : entries)
 		{
-			if(orderEntry instanceof SdkOrderEntry)
+			if(orderEntry instanceof ModuleExtensionWithSdkOrderEntry)
 			{
-				Sdk temp = ((SdkOrderEntry) orderEntry).getSdk();
+				Sdk temp = ((ModuleExtensionWithSdkOrderEntry) orderEntry).getSdk();
 				if(temp != null && temp.getSdkType() == JavaSdk.getInstance())
 				{
 					jdk = temp;
@@ -282,7 +283,7 @@ private static void checkAnnotationsJarAttached(@NotNull PsiFile file, @NotNull
 		final Sdk finalJdk = jdk;
 
 		String path = finalJdk.getHomePath();
-		String text = "No IDEA annotations attached to the JDK " + finalJdk.getName() + (path == null ? "" : " (" + FileUtil.toSystemDependentName(path) + ")") + ", some issues will not be found";
+		String text = "No external annotations attached to the JDK " + finalJdk.getName() + (path == null ? "" : " (" + FileUtil.toSystemDependentName(path) + ")") + ", some issues will not be found";
 		holder.registerProblem(file, text, ProblemHighlightType.GENERIC_ERROR_OR_WARNING, new LocalQuickFix()
 		{
 			@NotNull
@@ -300,6 +301,7 @@ public String getFamilyName()
 			}
 
 			@Override
+			@RequiredDispatchThread
 			public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor)
 			{
 				ApplicationManager.getApplication().runWriteAction(new Runnable()