From 800817474ccc7b04ea813311205333138f8ce88b Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 28 Feb 2011 13:28:08 +0100 Subject: [PATCH] fix typo --- .../completion/JavaCompletionUtil.java | 8 ++++---- .../completion/proc/VariablesProcessor.java | 4 ++-- .../scope/JavaCompletionProcessor.java | 2 +- .../com/intellij/psi/impl/PsiClassImplUtil.java | 12 ++++++------ .../src/com/intellij/psi/impl/PsiImplUtil.java | 4 ++-- .../intellij/psi/impl/file/PsiPackageImpl.java | 4 ++-- .../psi/impl/source/JavaDummyHolder.java | 2 +- .../intellij/psi/impl/source/PsiClassImpl.java | 4 ++-- .../psi/impl/source/PsiCodeFragmentImpl.java | 2 +- .../psi/impl/source/PsiJavaFileBaseImpl.java | 6 +++--- .../source/resolve/ClassCollectingProcessor.java | 4 ++-- .../source/resolve/ClassResolverProcessor.java | 4 ++-- .../resolve/VariableResolverProcessor.java | 4 ++-- .../providers/JavaClassReferenceProvider.java | 2 +- .../impl/source/tree/java/PsiCodeBlockImpl.java | 4 ++-- .../tree/java/PsiDeclarationStatementImpl.java | 2 +- .../intellij/psi/scope/ElementClassFilter.java | 16 ++++++++-------- .../com/intellij/psi/scope/ElementClassHint.java | 4 ++-- .../psi/scope/processor/MethodsProcessor.java | 4 ++-- .../psi/scope/processor/VariablesProcessor.java | 4 ++-- .../noncode/GrCollectionTypeMembersProvider.java | 4 ++-- .../resolve/processors/ResolverProcessor.java | 2 +- 22 files changed, 51 insertions(+), 51 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java index a9eb9b56f2ae..c0407ace8d98 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java @@ -456,10 +456,10 @@ public class JavaCompletionUtil { return member.getName(); } - public boolean shouldProcess(DeclaractionKind kind) { - return member instanceof PsiEnumConstant ? kind == DeclaractionKind.ENUM_CONST : - member instanceof PsiField ? kind == DeclaractionKind.FIELD : - kind == DeclaractionKind.METHOD; + public boolean shouldProcess(DeclarationKind kind) { + return member instanceof PsiEnumConstant ? kind == DeclarationKind.ENUM_CONST : + member instanceof PsiField ? kind == DeclarationKind.FIELD : + kind == DeclarationKind.METHOD; } @Override diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/proc/VariablesProcessor.java b/java/java-impl/src/com/intellij/codeInsight/completion/proc/VariablesProcessor.java index 5fd16d1e427c..03777100a052 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/proc/VariablesProcessor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/proc/VariablesProcessor.java @@ -58,8 +58,8 @@ public class VariablesProcessor myResultList = lst; } - public boolean shouldProcess(DeclaractionKind kind) { - return kind == DeclaractionKind.VARIABLE || kind == DeclaractionKind.FIELD || kind == DeclaractionKind.ENUM_CONST; + public boolean shouldProcess(DeclarationKind kind) { + return kind == DeclarationKind.VARIABLE || kind == DeclarationKind.FIELD || kind == DeclarationKind.ENUM_CONST; } /** Always return true since we wanna get all vars in scope */ diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java b/java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java index b0cd28cf2d2a..a4ff8067961f 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java @@ -247,7 +247,7 @@ public class JavaCompletionProcessor extends BaseScopeProcessor implements Eleme myResults.clear(); } - public boolean shouldProcess(DeclaractionKind kind) { + public boolean shouldProcess(DeclarationKind kind) { switch (kind) { case CLASS: return myFilter.isClassAcceptable(PsiClass.class); diff --git a/java/java-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java b/java/java-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java index 1f065c2513a6..247e5fdaf429 100644 --- a/java/java-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java +++ b/java/java-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java @@ -420,7 +420,7 @@ public class PsiClassImplUtil { final ElementClassHint classHint = processor.getHint(ElementClassHint.KEY); if (nameHint != null) { - if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclaractionKind.FIELD)) { + if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclarationKind.FIELD)) { final PsiField fieldByName = aClass.findFieldByName(nameHint.getName(state), false); if (fieldByName != null) { processor.handleEvent(PsiScopeProcessor.Event.SET_DECLARATION_HOLDER, aClass); @@ -442,7 +442,7 @@ public class PsiClassImplUtil { } } } - if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclaractionKind.CLASS)) { + if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclarationKind.CLASS)) { if (last != null && last.getParent() == aClass) { if (last instanceof PsiClass) { if (!processor.execute(last, state)) return false; @@ -476,7 +476,7 @@ public class PsiClassImplUtil { } } } - if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclaractionKind.METHOD)) { + if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclarationKind.METHOD)) { if (processor instanceof MethodResolverProcessor) { final MethodResolverProcessor methodResolverProcessor = (MethodResolverProcessor)processor; if (methodResolverProcessor.isConstructor()) { @@ -540,7 +540,7 @@ public class PsiClassImplUtil { final NameHint nameHint = processor.getHint(NameHint.KEY); - if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclaractionKind.FIELD)) { + if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclarationKind.FIELD)) { if (nameHint != null) { final PsiField fieldByName = aClass.findFieldByName(nameHint.getName(state), false); if (fieldByName != null) { @@ -555,7 +555,7 @@ public class PsiClassImplUtil { } } - if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclaractionKind.METHOD)) { + if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclarationKind.METHOD)) { final PsiMethod[] methods = nameHint != null ? aClass.findMethodsByName(nameHint.getName(state), false) : aClass.getMethods(); for (final PsiMethod method : methods) { if (isRaw && !method.hasModifierProperty(PsiModifier.STATIC)) { //static methods are not erased due to raw overriding @@ -567,7 +567,7 @@ public class PsiClassImplUtil { } } - if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclaractionKind.CLASS)) { + if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclarationKind.CLASS)) { if (last != null && last.getParent() == aClass) { // Parameters final PsiTypeParameterList list = aClass.getTypeParameterList(); diff --git a/java/java-impl/src/com/intellij/psi/impl/PsiImplUtil.java b/java/java-impl/src/com/intellij/psi/impl/PsiImplUtil.java index fec778f6e4e7..f658edc4f1a7 100644 --- a/java/java-impl/src/com/intellij/psi/impl/PsiImplUtil.java +++ b/java/java-impl/src/com/intellij/psi/impl/PsiImplUtil.java @@ -180,7 +180,7 @@ public class PsiImplUtil { @NotNull final PsiElement place) { final ElementClassHint hint = processor.getHint(ElementClassHint.KEY); processor.handleEvent(PsiScopeProcessor.Event.SET_DECLARATION_HOLDER, method); - if (hint == null || hint.shouldProcess(ElementClassHint.DeclaractionKind.CLASS)) { + if (hint == null || hint.shouldProcess(ElementClassHint.DeclarationKind.CLASS)) { final PsiTypeParameterList list = method.getTypeParameterList(); if (list != null && !list.processDeclarations(processor, state, null, place)) return false; } @@ -199,7 +199,7 @@ public class PsiImplUtil { @NotNull final ResolveState state, final PsiElement lastParent) { final ElementClassHint hint = processor.getHint(ElementClassHint.KEY); - if (hint != null && !hint.shouldProcess(ElementClassHint.DeclaractionKind.VARIABLE)) return true; + if (hint != null && !hint.shouldProcess(ElementClassHint.DeclarationKind.VARIABLE)) return true; final List resources = resourceList.getResourceVariables(); @SuppressWarnings({"SuspiciousMethodCalls"}) diff --git a/java/java-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java b/java/java-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java index 9d3b1d1366b5..8ecd4d1698db 100644 --- a/java/java-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java @@ -460,7 +460,7 @@ public class PsiPackageImpl extends PsiElementBase implements PsiPackage, Querya final Condition prefixMatcher = processor.getHint(JavaCompletionProcessor.NAME_FILTER); - if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclaractionKind.CLASS)) { + if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclarationKind.CLASS)) { NameHint nameHint = processor.getHint(NameHint.KEY); if (nameHint != null) { final String shortName = nameHint.getName(state); @@ -486,7 +486,7 @@ public class PsiPackageImpl extends PsiElementBase implements PsiPackage, Querya } } } - if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclaractionKind.PACKAGE)) { + if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclarationKind.PACKAGE)) { NameHint nameHint = processor.getHint(NameHint.KEY); if (nameHint != null) { PsiPackage aPackage = findSubPackageByName(nameHint.getName(state)); diff --git a/java/java-impl/src/com/intellij/psi/impl/source/JavaDummyHolder.java b/java/java-impl/src/com/intellij/psi/impl/source/JavaDummyHolder.java index d05a75f01c33..8196e6cefb3a 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/JavaDummyHolder.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/JavaDummyHolder.java @@ -87,7 +87,7 @@ public class JavaDummyHolder extends DummyHolder implements PsiImportHolder { public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, PsiElement lastParent, @NotNull PsiElement place) { ElementClassHint classHint = processor.getHint(ElementClassHint.KEY); - if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclaractionKind.CLASS)) { + if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclarationKind.CLASS)) { final NameHint nameHint = processor.getHint(NameHint.KEY); final String name = nameHint != null ? nameHint.getName(state) : null; //"pseudo-imports" diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java index b69a6c16a454..e6be33250240 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java @@ -466,12 +466,12 @@ public class PsiClassImpl extends JavaStubPsiElement> implements final NameHint nameHint = processor.getHint(NameHint.KEY); final ElementClassHint classHint = processor.getHint(ElementClassHint.KEY); if (nameHint == null || VALUES_METHOD.equals(nameHint.getName(state))) { - if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclaractionKind.METHOD)) { + if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclarationKind.METHOD)) { if (!processor.execute(myValuesMethod, ResolveState.initial())) return false; } } if (nameHint == null || VALUE_OF_METHOD.equals(nameHint.getName(state))) { - if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclaractionKind.METHOD)) { + if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclarationKind.METHOD)) { if (!processor.execute(myValueOfMethod, ResolveState.initial())) return false; } } diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiCodeFragmentImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/PsiCodeFragmentImpl.java index b7af9c01cd80..d6fca94cfebe 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/PsiCodeFragmentImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/PsiCodeFragmentImpl.java @@ -171,7 +171,7 @@ public class PsiCodeFragmentImpl extends PsiFileImpl implements JavaCodeFragment @NotNull PsiElement place) { final ElementClassHint classHint = processor.getHint(ElementClassHint.KEY); - if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclaractionKind.CLASS)) { + if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclarationKind.CLASS)) { final NameHint nameHint = processor.getHint(NameHint.KEY); final String name = nameHint != null ? nameHint.getName(state) : null; if (name != null) { diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiJavaFileBaseImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/PsiJavaFileBaseImpl.java index 7d3b9785b189..c9e5efb517cf 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/PsiJavaFileBaseImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/PsiJavaFileBaseImpl.java @@ -257,7 +257,7 @@ public abstract class PsiJavaFileBaseImpl extends PsiFileImpl implements PsiJava final ElementClassHint classHint = processor.getHint(ElementClassHint.KEY); final NameHint nameHint = processor.getHint(NameHint.KEY); final String name = nameHint != null ? nameHint.getName(state) : null; - if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclaractionKind.CLASS)){ + if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclarationKind.CLASS)){ final PsiClass[] classes = getClasses(); for (PsiClass aClass : classes) { if (!processor.execute(aClass, state)) return false; @@ -304,7 +304,7 @@ public abstract class PsiJavaFileBaseImpl extends PsiFileImpl implements PsiJava } } - if(classHint == null || classHint.shouldProcess(ElementClassHint.DeclaractionKind.PACKAGE)){ + if(classHint == null || classHint.shouldProcess(ElementClassHint.DeclarationKind.PACKAGE)){ final PsiPackage rootPackage = JavaPsiFacade.getInstance(getProject()).findPackage(""); processor.handleEvent(JavaScopeProcessorEvent.SET_CURRENT_FILE_CONTEXT, rootPackage); if(rootPackage != null) rootPackage.processDeclarations(processor, state, null, place); @@ -347,7 +347,7 @@ public abstract class PsiJavaFileBaseImpl extends PsiFileImpl implements PsiJava staticImportProcessor.handleEvent(JavaScopeProcessorEvent.SET_CURRENT_FILE_CONTEXT, null); } - if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclaractionKind.CLASS)){ + if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclarationKind.CLASS)){ processor.handleEvent(JavaScopeProcessorEvent.SET_CURRENT_FILE_CONTEXT, null); PsiJavaCodeReferenceElement[] implicitlyImported = getImplicitlyImportedPackageReferences(); diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/ClassCollectingProcessor.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/ClassCollectingProcessor.java index 9ecf483f36fe..683d25ca6119 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/ClassCollectingProcessor.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/ClassCollectingProcessor.java @@ -57,8 +57,8 @@ public class ClassCollectingProcessor extends BaseScopeProcessor implements Elem return true; } - public boolean shouldProcess(DeclaractionKind kind) { - return kind == DeclaractionKind.CLASS || kind == DeclaractionKind.PACKAGE || kind == DeclaractionKind.METHOD || kind == DeclaractionKind.FIELD; + public boolean shouldProcess(DeclarationKind kind) { + return kind == DeclarationKind.CLASS || kind == DeclarationKind.PACKAGE || kind == DeclarationKind.METHOD || kind == DeclarationKind.FIELD; } public MostlySingularMultiMap getResults() { diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java index b91ee852736d..32c65fd41717 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java @@ -77,8 +77,8 @@ public class ClassResolverProcessor extends BaseScopeProcessor implements NameHi return myClassName; } - public boolean shouldProcess(DeclaractionKind kind) { - return kind == DeclaractionKind.CLASS; + public boolean shouldProcess(DeclarationKind kind) { + return kind == DeclarationKind.CLASS; } private boolean myStaticContext = false; diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/VariableResolverProcessor.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/VariableResolverProcessor.java index 91cb7a2031ba..17aa8205a74c 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/VariableResolverProcessor.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/VariableResolverProcessor.java @@ -82,8 +82,8 @@ public class VariableResolverProcessor extends ConflictFilterProcessor implement } - public boolean shouldProcess(DeclaractionKind kind) { - return kind == DeclaractionKind.VARIABLE || kind == DeclaractionKind.FIELD || kind == DeclaractionKind.ENUM_CONST; + public boolean shouldProcess(DeclarationKind kind) { + return kind == DeclarationKind.VARIABLE || kind == DeclarationKind.FIELD || kind == DeclarationKind.ENUM_CONST; } public boolean execute(PsiElement element, ResolveState state) { diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReferenceProvider.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReferenceProvider.java index a21c030c697e..58c589d3da86 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReferenceProvider.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReferenceProvider.java @@ -128,7 +128,7 @@ public class JavaClassReferenceProvider extends GenericReferenceProvider impleme public void handleEmptyContext(PsiScopeProcessor processor, PsiElement position) { final ElementClassHint hint = processor.getHint(ElementClassHint.KEY); if (position == null) return; - if (hint == null || hint.shouldProcess(ElementClassHint.DeclaractionKind.PACKAGE) || hint.shouldProcess(ElementClassHint.DeclaractionKind.CLASS)) { + if (hint == null || hint.shouldProcess(ElementClassHint.DeclarationKind.PACKAGE) || hint.shouldProcess(ElementClassHint.DeclarationKind.CLASS)) { final List cachedPackages = getDefaultPackages(); for (final PsiElement psiPackage : cachedPackages) { if (!processor.execute(psiPackage, ResolveState.initial())) return; diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiCodeBlockImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiCodeBlockImpl.java index c702b47277c2..c5c36a658804 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiCodeBlockImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiCodeBlockImpl.java @@ -209,10 +209,10 @@ public class PsiCodeBlockImpl extends LazyParseablePsiElement implements PsiCode if (hint != null && !conflict) { final ElementClassHint elementClassHint = processor.getHint(ElementClassHint.KEY); final String name = hint.getName(state); - if ((elementClassHint == null || elementClassHint.shouldProcess(ElementClassHint.DeclaractionKind.CLASS)) && classesSet.contains(name)) { + if ((elementClassHint == null || elementClassHint.shouldProcess(ElementClassHint.DeclarationKind.CLASS)) && classesSet.contains(name)) { return PsiScopesUtil.walkChildrenScopes(this, processor, state, lastParent, place); } - if ((elementClassHint == null || elementClassHint.shouldProcess(ElementClassHint.DeclaractionKind.VARIABLE)) && variablesSet.contains(name)) { + if ((elementClassHint == null || elementClassHint.shouldProcess(ElementClassHint.DeclarationKind.VARIABLE)) && variablesSet.contains(name)) { return PsiScopesUtil.walkChildrenScopes(this, processor, state, lastParent, place); } } diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiDeclarationStatementImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiDeclarationStatementImpl.java index 2d529395154d..57b7d6b59f08 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiDeclarationStatementImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiDeclarationStatementImpl.java @@ -104,7 +104,7 @@ public class PsiDeclarationStatementImpl extends CompositePsiElement implements else { final ElementClassHint hint = processor.getHint(ElementClassHint.KEY); if (lastParent instanceof PsiClass) { - if (hint == null || hint.shouldProcess(ElementClassHint.DeclaractionKind.CLASS)) { + if (hint == null || hint.shouldProcess(ElementClassHint.DeclarationKind.CLASS)) { processor.execute(lastParent, state); } } diff --git a/java/java-impl/src/com/intellij/psi/scope/ElementClassFilter.java b/java/java-impl/src/com/intellij/psi/scope/ElementClassFilter.java index b38037c2a7f5..ef3973cfe253 100644 --- a/java/java-impl/src/com/intellij/psi/scope/ElementClassFilter.java +++ b/java/java-impl/src/com/intellij/psi/scope/ElementClassFilter.java @@ -23,16 +23,16 @@ import com.intellij.psi.*; import com.intellij.psi.filters.ElementFilter; public class ElementClassFilter implements ElementFilter { - public static final ElementClassFilter PACKAGE_FILTER = new ElementClassFilter(ElementClassHint.DeclaractionKind.PACKAGE); - public static final ElementClassFilter VARIABLE = new ElementClassFilter(ElementClassHint.DeclaractionKind.VARIABLE); - public static final ElementClassFilter METHOD = new ElementClassFilter(ElementClassHint.DeclaractionKind.METHOD); - public static final ElementClassFilter CLASS = new ElementClassFilter(ElementClassHint.DeclaractionKind.CLASS); - public static final ElementClassFilter FIELD = new ElementClassFilter(ElementClassHint.DeclaractionKind.FIELD); - public static final ElementClassFilter ENUM_CONST = new ElementClassFilter(ElementClassHint.DeclaractionKind.ENUM_CONST); + public static final ElementClassFilter PACKAGE_FILTER = new ElementClassFilter(ElementClassHint.DeclarationKind.PACKAGE); + public static final ElementClassFilter VARIABLE = new ElementClassFilter(ElementClassHint.DeclarationKind.VARIABLE); + public static final ElementClassFilter METHOD = new ElementClassFilter(ElementClassHint.DeclarationKind.METHOD); + public static final ElementClassFilter CLASS = new ElementClassFilter(ElementClassHint.DeclarationKind.CLASS); + public static final ElementClassFilter FIELD = new ElementClassFilter(ElementClassHint.DeclarationKind.FIELD); + public static final ElementClassFilter ENUM_CONST = new ElementClassFilter(ElementClassHint.DeclarationKind.ENUM_CONST); - private final ElementClassHint.DeclaractionKind myKind; + private final ElementClassHint.DeclarationKind myKind; - private ElementClassFilter(ElementClassHint.DeclaractionKind kind) { + private ElementClassFilter(ElementClassHint.DeclarationKind kind) { myKind = kind; } diff --git a/java/java-impl/src/com/intellij/psi/scope/ElementClassHint.java b/java/java-impl/src/com/intellij/psi/scope/ElementClassHint.java index 2c648a89327d..b25dc262028e 100644 --- a/java/java-impl/src/com/intellij/psi/scope/ElementClassHint.java +++ b/java/java-impl/src/com/intellij/psi/scope/ElementClassHint.java @@ -20,7 +20,7 @@ import com.intellij.openapi.util.Key; public interface ElementClassHint { Key KEY = Key.create("ElementClassHint"); - enum DeclaractionKind { + enum DeclarationKind { CLASS, PACKAGE, METHOD, @@ -29,5 +29,5 @@ public interface ElementClassHint { ENUM_CONST } - boolean shouldProcess(DeclaractionKind kind); + boolean shouldProcess(DeclarationKind kind); } diff --git a/java/java-impl/src/com/intellij/psi/scope/processor/MethodsProcessor.java b/java/java-impl/src/com/intellij/psi/scope/processor/MethodsProcessor.java index 69ed41418320..fc9b4d9ed687 100644 --- a/java/java-impl/src/com/intellij/psi/scope/processor/MethodsProcessor.java +++ b/java/java-impl/src/com/intellij/psi/scope/processor/MethodsProcessor.java @@ -115,7 +115,7 @@ public abstract class MethodsProcessor extends ConflictFilterProcessor implement return super.getHint(hintKey); } - public boolean shouldProcess(DeclaractionKind kind) { - return kind == DeclaractionKind.METHOD; + public boolean shouldProcess(DeclarationKind kind) { + return kind == DeclarationKind.METHOD; } } diff --git a/java/java-impl/src/com/intellij/psi/scope/processor/VariablesProcessor.java b/java/java-impl/src/com/intellij/psi/scope/processor/VariablesProcessor.java index edc4ab2d726d..ec310ce3c779 100644 --- a/java/java-impl/src/com/intellij/psi/scope/processor/VariablesProcessor.java +++ b/java/java-impl/src/com/intellij/psi/scope/processor/VariablesProcessor.java @@ -45,8 +45,8 @@ public abstract class VariablesProcessor extends BaseScopeProcessor implements E protected abstract boolean check(PsiVariable var, ResolveState state); - public boolean shouldProcess(DeclaractionKind kind) { - return kind == DeclaractionKind.VARIABLE || kind == DeclaractionKind.FIELD || kind == DeclaractionKind.ENUM_CONST; + public boolean shouldProcess(DeclarationKind kind) { + return kind == DeclarationKind.VARIABLE || kind == DeclarationKind.FIELD || kind == DeclarationKind.ENUM_CONST; } /** Always return true since we wanna get all vars in scope */ diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/noncode/GrCollectionTypeMembersProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/noncode/GrCollectionTypeMembersProvider.java index 2104c4711e8a..72f26e4528ba 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/noncode/GrCollectionTypeMembersProvider.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/noncode/GrCollectionTypeMembersProvider.java @@ -93,8 +93,8 @@ public class GrCollectionTypeMembersProvider extends NonCodeMembersContributor { } @Override - public boolean shouldProcess(DeclaractionKind kind) { - return kind == DeclaractionKind.FIELD; + public boolean shouldProcess(DeclarationKind kind) { + return kind == DeclarationKind.FIELD; } } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/ResolverProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/ResolverProcessor.java index df40c5c451bf..71409a3b04b1 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/ResolverProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/ResolverProcessor.java @@ -145,7 +145,7 @@ public class ResolverProcessor implements PsiScopeProcessor, NameHint, ClassHint return myResolveTargetKinds.contains(resolveKind); } - public boolean shouldProcess(DeclaractionKind kind) { + public boolean shouldProcess(DeclarationKind kind) { switch (kind) { case CLASS: return shouldProcess(CLASS);