diff --git a/java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java b/java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java index 78f43afacad2..f4d9be9d3ed1 100644 --- a/java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java +++ b/java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java @@ -221,14 +221,7 @@ public class GlobalJavaInspectionContextImpl extends GlobalJavaInspectionContext for (SmartPsiElementPointer sortedID : sortedIDs) { final PsiClass psiClass = (PsiClass)dereferenceInReadAction(sortedID); if (psiClass == null) continue; - context.incrementJobDoneAmount(context.getStdJobDescriptors().FIND_EXTERNAL_USAGES, ApplicationManager.getApplication().runReadAction( - new Computable() { - @Override - public String compute() { - return psiClass.getQualifiedName(); - } - } - )); + context.incrementJobDoneAmount(context.getStdJobDescriptors().FIND_EXTERNAL_USAGES, getClassPresentableName(psiClass)); final List processors = myDerivedClassesRequests.get(sortedID); LOG.assertTrue(processors != null, psiClass.getClass().getName()); @@ -282,14 +275,7 @@ public class GlobalJavaInspectionContextImpl extends GlobalJavaInspectionContext final List processors = myClassUsagesRequests.get(sortedID); LOG.assertTrue(processors != null, psiClass.getClass().getName()); - context.incrementJobDoneAmount(context.getStdJobDescriptors().FIND_EXTERNAL_USAGES, ApplicationManager.getApplication().runReadAction( - new Computable() { - @Override - public String compute() { - return psiClass.getQualifiedName(); - } - } - )); + context.incrementJobDoneAmount(context.getStdJobDescriptors().FIND_EXTERNAL_USAGES, getClassPresentableName(psiClass)); ReferencesSearch.search(psiClass, searchScope, false) .forEach(new PsiReferenceProcessorAdapter(createReferenceProcessor(processors, context))); @@ -316,6 +302,18 @@ public class GlobalJavaInspectionContextImpl extends GlobalJavaInspectionContext } } + private String getClassPresentableName(final PsiClass psiClass) { + return ApplicationManager.getApplication().runReadAction( + new Computable() { + @Override + public String compute() { + final String qualifiedName = psiClass.getQualifiedName(); + return qualifiedName != null ? qualifiedName : psiClass.getName(); + } + } + ); + } + private static PsiElement dereferenceInReadAction(final SmartPsiElementPointer sortedID) { return ApplicationManager.getApplication().runReadAction(new Computable() { @Override