From 08c71ffebd320a2adc2dcb4a3ef996b415f6a9be Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 19 Aug 2011 20:06:02 +0400 Subject: [PATCH] use ProgressIndicatorProvider instead of ProgressManager in PSI API --- .../lang-api/src/com/intellij/psi/PsiElementVisitor.java | 3 ++- .../src/com/intellij/psi/PsiRecursiveElementVisitor.java | 6 +++--- .../com/intellij/psi/PsiRecursiveElementWalkingVisitor.java | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/platform/lang-api/src/com/intellij/psi/PsiElementVisitor.java b/platform/lang-api/src/com/intellij/psi/PsiElementVisitor.java index d5d662916159..5367e935bd1d 100644 --- a/platform/lang-api/src/com/intellij/psi/PsiElementVisitor.java +++ b/platform/lang-api/src/com/intellij/psi/PsiElementVisitor.java @@ -15,6 +15,7 @@ */ package com.intellij.psi; +import com.intellij.openapi.progress.ProgressIndicatorProvider; import com.intellij.openapi.progress.ProgressManager; import com.intellij.psi.templateLanguages.OuterLanguageElement; @@ -25,7 +26,7 @@ import com.intellij.psi.templateLanguages.OuterLanguageElement; */ public abstract class PsiElementVisitor { public void visitElement(PsiElement element) { - ProgressManager.checkCanceled(); + ProgressIndicatorProvider.checkCanceled(); } public void visitFile(PsiFile file) { diff --git a/platform/lang-api/src/com/intellij/psi/PsiRecursiveElementVisitor.java b/platform/lang-api/src/com/intellij/psi/PsiRecursiveElementVisitor.java index 6ec50dd49f4f..000d3ee4037e 100644 --- a/platform/lang-api/src/com/intellij/psi/PsiRecursiveElementVisitor.java +++ b/platform/lang-api/src/com/intellij/psi/PsiRecursiveElementVisitor.java @@ -15,7 +15,7 @@ */ package com.intellij.psi; -import com.intellij.openapi.progress.ProgressManager; +import com.intellij.openapi.progress.ProgressIndicatorProvider; import java.util.List; @@ -35,7 +35,7 @@ public abstract class PsiRecursiveElementVisitor extends PsiElementVisitor { } public void visitElement(final PsiElement element) { - ProgressManager.checkCanceled(); + ProgressIndicatorProvider.checkCanceled(); element.acceptChildren(this); } @@ -47,7 +47,7 @@ public abstract class PsiRecursiveElementVisitor extends PsiElementVisitor { if (allFiles.size() > 1) { if (file == viewProvider.getPsi(viewProvider.getBaseLanguage())) { for (PsiFile lFile : allFiles) { - ProgressManager.checkCanceled(); + ProgressIndicatorProvider.checkCanceled(); lFile.acceptChildren(this); } return; diff --git a/platform/lang-api/src/com/intellij/psi/PsiRecursiveElementWalkingVisitor.java b/platform/lang-api/src/com/intellij/psi/PsiRecursiveElementWalkingVisitor.java index 344a6a739287..8309829cf393 100644 --- a/platform/lang-api/src/com/intellij/psi/PsiRecursiveElementWalkingVisitor.java +++ b/platform/lang-api/src/com/intellij/psi/PsiRecursiveElementWalkingVisitor.java @@ -15,7 +15,7 @@ */ package com.intellij.psi; -import com.intellij.openapi.progress.ProgressManager; +import com.intellij.openapi.progress.ProgressIndicatorProvider; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -41,7 +41,7 @@ public abstract class PsiRecursiveElementWalkingVisitor extends PsiElementVisito } public void visitElement(final PsiElement element) { - ProgressManager.checkCanceled(); + ProgressIndicatorProvider.checkCanceled(); myWalkingState.elementStarted(element); }