ProgressManager -> ProgressIndicatorProvider

diff --git a/java/java-impl/src/com/intellij/psi/impl/InheritanceImplUtil.java b/java/java-impl/src/com/intellij/psi/impl/InheritanceImplUtil.java
index e705a693cc2790f915f034d1e1595e13e548e8e8..37341fb90dbe74fffcea69cdb10268c9a22efeb6 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/impl/InheritanceImplUtil.java
+++ b/java/java-impl/src/com/intellij/psi/impl/InheritanceImplUtil.java
@@ -16,7 +16,7 @@
 package com.intellij.psi.impl;
 
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.progress.ProgressManager;
+import com.intellij.openapi.progress.ProgressIndicatorProvider;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.psi.*;
 import com.intellij.psi.search.GlobalSearchScope;
@@ -157,7 +157,7 @@ public class InheritanceImplUtil {
   }
 
   private static boolean checkInheritor(PsiClass aClass, PsiClass baseClass, boolean checkDeep, Set<PsiClass> checkedClasses) {
-    ProgressManager.checkCanceled();
+    ProgressIndicatorProvider.checkCanceled();
     if (aClass != null) {
       PsiManager manager = baseClass.getManager();
       if (manager.areElementsEquivalent(baseClass, aClass)) {

diff --git a/java/java-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java b/java/java-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java
index 83d10725d8a5970b9f148cf348590111c7b08955..313fe62c9981514d9b0f37fae9e0ca95a53feb40 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java
+++ b/java/java-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java
@@ -17,7 +17,7 @@ package com.intellij.psi.impl;
 
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.progress.ProgressManager;
+import com.intellij.openapi.progress.ProgressIndicatorProvider;
 import com.intellij.openapi.roots.FileIndexFacade;
 import com.intellij.openapi.util.*;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -500,7 +500,7 @@ public class PsiClassImplUtil {
       final List<Pair<PsiMethod, PsiSubstitutor>> list = allMethodsMap.get(nameHint.getName(state));
       if (list != null) {
         for (final Pair<PsiMethod, PsiSubstitutor> candidate : list) {
-          ProgressManager.checkCanceled();
+          ProgressIndicatorProvider.checkCanceled();
           PsiMethod candidateMethod = candidate.getFirst();
           if (processor instanceof MethodResolverProcessor) {
             if (candidateMethod.isConstructor() != ((MethodResolverProcessor)processor).isConstructor()) continue;

diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiBinaryExpressionImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiBinaryExpressionImpl.java
index beab7d3daa1c74ed8a109cb7d50b451199985fa0..698bb80086cc2ab158747bc317a314f4d4e6c9ec 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiBinaryExpressionImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiBinaryExpressionImpl.java
@@ -17,7 +17,7 @@ package com.intellij.psi.impl.source.tree.java;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.progress.ProgressManager;
+import com.intellij.openapi.progress.ProgressIndicatorProvider;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.source.resolve.JavaResolveCache;
 import com.intellij.psi.impl.source.tree.ChildRole;
@@ -86,7 +86,7 @@ public class PsiBinaryExpressionImpl extends ExpressionPsiElement implements Psi
         @Override
         protected void elementFinished(PsiElement element) {
           if (element instanceof PsiExpression) {
-            ProgressManager.checkCanceled();
+            ProgressIndicatorProvider.checkCanceled();
             ((PsiExpression)element).getType();
           }
         }

diff --git a/java/java-impl/src/com/intellij/psi/scope/util/PsiScopesUtil.java b/java/java-impl/src/com/intellij/psi/scope/util/PsiScopesUtil.java
index 4d3ebca740efef04ce3e79e266208fb12db23dd8..6a47f7c5515f06c5ca9395b9186bf4b00a1dc459 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/scope/util/PsiScopesUtil.java
+++ b/java/java-impl/src/com/intellij/psi/scope/util/PsiScopesUtil.java
@@ -24,7 +24,7 @@
 package com.intellij.psi.scope.util;
 
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.progress.ProgressManager;
+import com.intellij.openapi.progress.ProgressIndicatorProvider;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.source.resolve.JavaResolveUtil;
@@ -61,7 +61,7 @@ public class PsiScopesUtil {
     PsiElement scope = entrance;
 
     while (scope != null) {
-      ProgressManager.checkCanceled();
+      ProgressIndicatorProvider.checkCanceled();
       if (scope instanceof PsiClass) {
         processor.handleEvent(JavaScopeProcessorEvent.SET_CURRENT_FILE_CONTEXT, scope);
       }

diff --git a/platform/lang-impl/src/com/intellij/psi/impl/meta/MetaRegistry.java b/platform/lang-impl/src/com/intellij/psi/impl/meta/MetaRegistry.java
index 54e2c2ac9afc87bf2c6ad5a048b744b8e64024d7..1719462b0cc60238bbcb2d65e3d1805f07fc79a6 100644 (file)
--- a/platform/lang-impl/src/com/intellij/psi/impl/meta/MetaRegistry.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/meta/MetaRegistry.java
@@ -18,7 +18,7 @@ package com.intellij.psi.impl.meta;
 
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.extensions.Extensions;
-import com.intellij.openapi.progress.ProgressManager;
+import com.intellij.openapi.progress.ProgressIndicatorProvider;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.UserDataCache;
@@ -109,7 +109,7 @@ public class MetaRegistry extends MetaDataRegistrar {
   
   @Nullable
   public static PsiMetaData getMetaBase(final PsiElement element) {
-    ProgressManager.checkCanceled();
+    ProgressIndicatorProvider.checkCanceled();
     return ourCachedMetaCache.get(META_DATA_KEY, element, null).getValue();
   }