MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Code tolerates null ProgressIndicatorProvider

Browse Source
This commit is contained in:
Dmitry Lomov
2012-10-18 18:28:34 +02:00
parent a2be6066cf
commit e73492cd2b
11 changed files with 50 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-indexing-api/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class ClassInheritorsSearch extends ExtensibleQueryFactory<PsiClass, Clas
LOG.assertTrue(searchScope != null);
ProgressIndicator progress = ProgressIndicatorProvider.getInstance().getProgressIndicator();
ProgressIndicator progress = ProgressIndicatorProvider.getGlobalProgressIndicator();
if (progress != null) {
progress.pushState();
String className = ApplicationManager.getApplication().runReadAction(new Computable<String>() {
java/java-indexing-impl/src/com/intellij/psi/impl/search/AllClassesSearchExecutor.java
+1 -1
View File
@@ -66,7 +66,7 @@ public class AllClassesSearchExecutor implements QueryExecutor<PsiClass, AllClas
}
});
final ProgressIndicator indicator = ProgressIndicatorProvider.getInstance().getProgressIndicator();
final ProgressIndicator indicator = ProgressIndicatorProvider.getGlobalProgressIndicator();
if (indicator != null) {
indicator.checkCanceled();
}
java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java
+1 -1
View File
@@ -305,7 +305,7 @@ public class ClsFileImpl extends ClsRepositoryPsiElement<PsiClassHolderFileStub>
final ASTNode mirrorTreeElement = SourceTreeToPsiMap.psiElementToTree(mirror);
//IMPORTANT: do not take lock too early - FileDocumentManager.getInstance().saveToString() can run write action...
final NonCancelableSection section = ProgressIndicatorProvider.getInstance().startNonCancelableSection();
final NonCancelableSection section = ProgressIndicatorProvider.startNonCancelableSectionIfSupported();
try {
setMirror((TreeElement)mirrorTreeElement);