From bed06ee3558472313c3f0593eafe8afa7214ac51 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Thu, 22 Oct 2009 13:27:09 +0400 Subject: [PATCH] checkCancelled() --- .../src/com/intellij/psi/impl/JavaPsiFacadeImpl.java | 2 +- .../codeInsight/daemon/impl/GeneralHighlightingPass.java | 2 +- .../codeInsight/daemon/impl/LocalInspectionsPass.java | 4 ++-- .../lang-impl/src/com/intellij/psi/impl/PsiManagerImpl.java | 6 +++--- .../lang/ant/config/impl/AntResourcesClassLoader.java | 3 +-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/java/java-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java b/java/java-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java index 07766fb3e536..e1bab9877917 100644 --- a/java/java-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java @@ -162,7 +162,7 @@ public class JavaPsiFacadeImpl extends JavaPsiFacadeEx implements Disposable { } public PsiClass findClass(@NotNull final String qualifiedName, @NotNull GlobalSearchScope scope) { - myProgressManager.checkCanceled(); // We hope this method is being called often enough to cancel daemon processes smoothly + ProgressManager.checkCanceled(); // We hope this method is being called often enough to cancel daemon processes smoothly if (DumbService.getInstance(getProject()).isDumb()) { final List classes = findClassesInDumbMode(qualifiedName, scope); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java index 22114fb6e9f8..2241b1e70173 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java @@ -470,7 +470,7 @@ public class GeneralHighlightingPass extends ProgressableTextEditorHighlightingP int nextLimit = chunkSize; for (int i = 0; i < elements.size(); i++) { PsiElement element = elements.get(i); - progressManager.checkCanceled(); + ProgressManager.checkCanceled(); if (element != myFile && !skipParentsSet.isEmpty() && element.getFirstChild() != null && skipParentsSet.contains(element)) { skipParentsSet.add(element.getParent()); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java index bacee4bdeede..d9e4d1588473 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java @@ -195,7 +195,7 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass JobUtil.invokeConcurrentlyUnderMyProgress(tools, new Processor() { public boolean process(final LocalInspectionTool tool) { final ProgressManager progressManager = ProgressManager.getInstance(); - progressManager.checkCanceled(); + ProgressManager.checkCanceled(); ProgressIndicator localIndicator = progressManager.getProgressIndicator(); ProgressIndicator original = ((ProgressWrapper)localIndicator).getOriginalProgressIndicator(); @@ -211,7 +211,7 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass } tool.inspectionStarted(session); for (PsiElement element : elements) { - progressManager.checkCanceled(); + ProgressManager.checkCanceled(); element.accept(elementVisitor); } tool.inspectionFinished(session); diff --git a/platform/lang-impl/src/com/intellij/psi/impl/PsiManagerImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/PsiManagerImpl.java index ef46d8883771..ce364f7ab668 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/PsiManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/PsiManagerImpl.java @@ -335,13 +335,13 @@ public class PsiManagerImpl extends PsiManagerEx implements ProjectComponent { } public ResolveCache getResolveCache() { - myProgressManager.checkCanceled(); // We hope this method is being called often enough to cancel daemon processes smoothly + ProgressManager.checkCanceled(); // We hope this method is being called often enough to cancel daemon processes smoothly return myResolveCache; } public boolean areElementsEquivalent(PsiElement element1, PsiElement element2) { - myProgressManager.checkCanceled(); // We hope this method is being called often enough to cancel daemon processes smoothly + ProgressManager.checkCanceled(); // We hope this method is being called often enough to cancel daemon processes smoothly if (element1 == element2) return true; if (element1 == null || element2 == null) { @@ -386,7 +386,7 @@ public class PsiManagerImpl extends PsiManagerEx implements ProjectComponent { } public PsiDirectory findDirectory(@NotNull VirtualFile file) { - myProgressManager.checkCanceled(); + ProgressManager.checkCanceled(); return myFileManager.findDirectory(file); } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntResourcesClassLoader.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntResourcesClassLoader.java index de34e9ed9ebe..756583658818 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntResourcesClassLoader.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntResourcesClassLoader.java @@ -28,7 +28,6 @@ import java.util.Set; * Date: Oct 21, 2008 */ public class AntResourcesClassLoader extends UrlClassLoader { - private final ProgressManager myPm = ProgressManager.getInstance(); private final Set myMisses = new HashSet(); public AntResourcesClassLoader(final List urls, final ClassLoader parentLoader, final boolean canLockJars, final boolean canUseCache) { @@ -43,7 +42,7 @@ public class AntResourcesClassLoader extends UrlClassLoader { } protected Class findClass(final String name) throws ClassNotFoundException { - myPm.checkCanceled(); + ProgressManager.checkCanceled(); try { return super.findClass(name); }