Replace PsiManager.getInstance(psiElement.getProject()) to psiElement.getManager() and add inspection to this case.

This commit is contained in:
Sergey Evdokimov
2012-01-28 17:23:15 +04:00
parent daac3822eb
commit 01c6acab8e
21 changed files with 22 additions and 23 deletions
@@ -36,7 +36,7 @@ public class AnnotatedElementsSearcher implements QueryExecutor<PsiModifierListO
final String annotationFQN = annClass.getQualifiedName();
assert annotationFQN != null;
final PsiManagerImpl psiManager = (PsiManagerImpl)PsiManager.getInstance(annClass.getProject());
final PsiManagerImpl psiManager = (PsiManagerImpl)annClass.getManager();
final SearchScope useScope = p.getScope();
Class<? extends PsiModifierListOwner>[] types = p.getTypes();
@@ -47,7 +47,7 @@ public class AnnotatedPackagesSearcher implements QueryExecutor<PsiPackage, Anno
final String annotationFQN = annClass.getQualifiedName();
assert annotationFQN != null;
final PsiManagerImpl psiManager = (PsiManagerImpl)PsiManager.getInstance(annClass.getProject());
final PsiManagerImpl psiManager = (PsiManagerImpl)annClass.getManager();
final SearchScope useScope = p.getScope();
final String annotationShortName = annClass.getName();
@@ -21,7 +21,7 @@ public class ConstructorReferencesSearcher extends QueryExecutorBase<PsiReferenc
public void processQuery(@NotNull ReferencesSearch.SearchParameters p, @NotNull Processor<PsiReference> consumer) {
final PsiElement element = p.getElementToSearch();
if (element instanceof PsiMethod && ((PsiMethod)element).isConstructor()) {
new ConstructorReferencesSearchHelper(PsiManager.getInstance(element.getProject()))
new ConstructorReferencesSearchHelper(element.getManager())
.processConstructorReferences(consumer, (PsiMethod)p.getElementToSearch(), p.getScope(), p.isIgnoreAccessScope(), true, p.getOptimizer());
}
}
@@ -36,7 +36,7 @@ public class JavaDirectInheritorsSearcher implements QueryExecutor<PsiClass, Dir
@Override
public boolean execute(@NotNull final DirectClassInheritorsSearch.SearchParameters p, @NotNull final Processor<PsiClass> consumer) {
final PsiClass aClass = p.getClassToProcess();
final PsiManagerImpl psiManager = (PsiManagerImpl)PsiManager.getInstance(aClass.getProject());
final PsiManagerImpl psiManager = (PsiManagerImpl)aClass.getManager();
final SearchScope useScope = ApplicationManager.getApplication().runReadAction(new Computable<SearchScope>() {
@Override
@@ -25,7 +25,7 @@ public class MethodUsagesSearcher extends QueryExecutorBase<PsiReference, Method
final SearchScope searchScope = p.getScope();
final PsiManager psiManager = PsiManager.getInstance(method.getProject());
final PsiManager psiManager = method.getManager();
final PsiClass aClass = method.getContainingClass();
if (aClass == null) return;
@@ -931,7 +931,7 @@ public class JavaChangeSignatureUsageProcessor implements ChangeSignatureUsagePr
PsiMethod prototype;
final PsiMethod method = myChangeInfo.getMethod();
if (!StdLanguages.JAVA.equals(method.getLanguage())) return;
PsiManager manager = PsiManager.getInstance(method.getProject());
PsiManager manager = method.getManager();
PsiElementFactory factory = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory();
final CanonicalTypes.Type returnType = myChangeInfo.getNewReturnType();
if (returnType != null) {