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

cleanup

Browse Source
This commit is contained in:
Maxim Shafirov
2009-11-06 16:49:30 +03:00
parent 5cb6e23e4f
commit 305241e847
4 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/search/ThrowSearchUtil.java
-2
View File
@@ -19,7 +19,6 @@ import com.intellij.find.findUsages.FindUsagesOptions;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.Key;
import com.intellij.psi.*;
import com.intellij.psi.search.PsiSearchHelper;
import com.intellij.psi.search.searches.MethodReferencesSearch;
import com.intellij.psi.util.PsiFormatUtil;
import com.intellij.usageView.UsageInfo;
@@ -90,7 +89,6 @@ public class ThrowSearchUtil {
final PsiMethod method = deepestSuperMethod != null ? deepestSuperMethod : (PsiMethod)elem;
if (!processed.contains(method)) {
processed.add(method);
PsiSearchHelper helper = method.getManager().getSearchHelper();
final PsiReference[] refs = MethodReferencesSearch.search(method, options.searchScope, true).toArray(PsiReference.EMPTY_ARRAY);
for (int i = 0; i != refs.length; ++i) {
scanCatches(refs[i].getElement(), processor, root, options, processed);
java/java-impl/src/com/intellij/refactoring/makeStatic/MakeMethodOrClassStaticProcessor.java
+4 -4
View File
@@ -29,7 +29,6 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.search.PsiSearchHelper;
import com.intellij.psi.search.searches.OverridingMethodsSearch;
import com.intellij.psi.search.searches.ReferencesSearch;
import com.intellij.psi.util.PsiTreeUtil;
@@ -48,7 +47,10 @@ import com.intellij.util.IncorrectOperationException;
import com.intellij.util.containers.MultiMap;
import org.jetbrains.annotations.NotNull;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
public abstract class MakeMethodOrClassStaticProcessor<T extends PsiTypeParameterListOwner> extends BaseRefactoringProcessor {
private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.makeMethodStatic.MakeMethodStaticProcessor");
@@ -193,8 +195,6 @@ public abstract class MakeMethodOrClassStaticProcessor<T extends PsiTypeParamete
@NotNull
protected UsageInfo[] findUsages() {
ArrayList<UsageInfo> result = new ArrayList<UsageInfo>();
PsiManager manager = myMember.getManager();
PsiSearchHelper helper = manager.getSearchHelper();
result.addAll(Arrays.asList(MakeStaticUtil.findClassRefsInMember(myMember, true)));
java/java-impl/src/com/intellij/refactoring/psi/SearchUtils.java
-3
View File
@@ -19,7 +19,6 @@ import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiReference;
import com.intellij.psi.search.PsiSearchHelper;
import com.intellij.psi.search.SearchScope;
import com.intellij.psi.search.searches.ClassInheritorsSearch;
import com.intellij.psi.search.searches.OverridingMethodsSearch;
@@ -59,13 +58,11 @@ public class SearchUtils{
}
public static Iterable<PsiMethod> findOverridingMethods(PsiMethod method){
final PsiSearchHelper searchHelper = method.getManager().getSearchHelper();
return new ArrayIterable<PsiMethod>(OverridingMethodsSearch.search(method, method.getUseScope(), true).toArray(new PsiMethod[0]));
// return OverridingMethodsSearch.search(method, method.getUseScope(), true).findAll();
}
public static Iterable<PsiClass> findClassInheritors(PsiClass aClass, boolean deep){
final PsiSearchHelper searchHelper = aClass.getManager().getSearchHelper();
return new ArrayIterable<PsiClass>(ClassInheritorsSearch.search(aClass, aClass.getUseScope(), deep).toArray(new PsiClass[0]));
// return ClassInheritorsSearch.search(aClass, deep);
}