diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/AbstractInplaceIntroduceFieldPopup.java b/java/java-impl/src/com/intellij/refactoring/introduceField/AbstractInplaceIntroduceFieldPopup.java index 63be4577548f..af327ac8f065 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceField/AbstractInplaceIntroduceFieldPopup.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceField/AbstractInplaceIntroduceFieldPopup.java @@ -20,14 +20,14 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.refactoring.introduceParameter.AbstractJavaInplaceIntroducer; import com.intellij.refactoring.ui.TypeSelectorManagerImpl; -import com.intellij.refactoring.util.occurences.OccurenceManager; +import com.intellij.refactoring.util.occurrences.OccurrenceManager; /** * User: anna */ public abstract class AbstractInplaceIntroduceFieldPopup extends AbstractJavaInplaceIntroducer { protected final PsiClass myParentClass; - protected final OccurenceManager myOccurenceManager; + protected final OccurrenceManager myOccurrenceManager; private SmartPsiElementPointer myAnchorElement; private int myAnchorIdx = -1; @@ -45,11 +45,11 @@ public abstract class AbstractInplaceIntroduceFieldPopup extends AbstractJavaInp String title, PsiClass parentClass, final PsiElement anchorElement, - final OccurenceManager occurenceManager, + final OccurrenceManager occurrenceManager, final PsiElement anchorElementIfAll) { super(project, editor, expr, localVariable, occurrences, typeSelectorManager, title); myParentClass = parentClass; - myOccurenceManager = occurenceManager; + myOccurrenceManager = occurrenceManager; mySmartPointerManager = SmartPointerManager.getInstance(project); myAnchorElement = anchorElement != null ? mySmartPointerManager.createSmartPsiElementPointer(anchorElement) : null; myAnchorElementIfAll = anchorElementIfAll != null ? mySmartPointerManager.createSmartPsiElementPointer(anchorElementIfAll) : null; diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java index 989ea000a4e4..01dfa8241140 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java @@ -64,7 +64,7 @@ import com.intellij.refactoring.rename.RenameJavaVariableProcessor; import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.refactoring.util.EnumConstantsUtil; import com.intellij.refactoring.util.RefactoringUtil; -import com.intellij.refactoring.util.occurences.OccurenceManager; +import com.intellij.refactoring.util.occurrences.OccurrenceManager; import com.intellij.util.IncorrectOperationException; import com.intellij.util.VisibilityUtil; import org.jetbrains.annotations.NonNls; @@ -172,9 +172,9 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase if (!CommonRefactoringUtil.checkReadOnlyStatus(project, file)) return true; - final OccurenceManager occurenceManager = createOccurenceManager(selectedExpr, myParentClass); - final PsiExpression[] occurrences = occurenceManager.getOccurences(); - final PsiElement anchorStatementIfAll = occurenceManager.getAnchorStatementForAll(); + final OccurrenceManager occurrenceManager = createOccurenceManager(selectedExpr, myParentClass); + final PsiExpression[] occurrences = occurrenceManager.getOccurrences(); + final PsiElement anchorStatementIfAll = occurrenceManager.getAnchorStatementForAll(); List highlighters = null; if (editor != null) { @@ -206,7 +206,7 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase final Runnable runnable = - new ConvertToFieldRunnable(settings.getSelectedExpr(), settings, type, settings.getOccurrences(), occurenceManager, + new ConvertToFieldRunnable(settings.getSelectedExpr(), settings, type, settings.getOccurrences(), occurrenceManager, anchorStatementIfAll, tempAnchorElement, editor, myParentClass); @@ -250,7 +250,7 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase ); } - protected abstract OccurenceManager createOccurenceManager(PsiExpression selectedExpr, PsiClass parentClass); + protected abstract OccurrenceManager createOccurenceManager(PsiExpression selectedExpr, PsiClass parentClass); protected final PsiClass getParentClass() { return myParentClass; @@ -316,7 +316,7 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase private static void addInitializationToSetUp(final PsiExpression initializer, final PsiField field, - final OccurenceManager occurenceManager, + final OccurrenceManager occurrenceManager, final boolean replaceAll, final PsiClass parentClass) throws IncorrectOperationException { final PsiMethod setupMethod = TestUtil.findOrCreateSetUpMethod(parentClass); @@ -326,7 +326,7 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase PsiElement anchor = null; if (PsiTreeUtil.isAncestor(setupMethod, initializer, true)) { anchor = replaceAll - ? occurenceManager.getAnchorStatementForAllInScope(setupMethod) + ? occurrenceManager.getAnchorStatementForAllInScope(setupMethod) : PsiTreeUtil.getParentOfType(initializer, PsiStatement.class); } @@ -640,7 +640,7 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase private final PsiType myType; private final PsiExpression[] myOccurrences; private final boolean myReplaceAll; - private final OccurenceManager myOccurenceManager; + private final OccurrenceManager myOccurrenceManager; private final PsiElement myAnchorStatementIfAll; private final PsiElement myAnchorElementIfOne; private final Boolean myOutOfCodeBlockExtraction; @@ -655,7 +655,7 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase Settings settings, PsiType type, PsiExpression[] occurrences, - OccurenceManager occurenceManager, + OccurrenceManager occurrenceManager, PsiElement anchorStatementIfAll, PsiElement anchorElementIfOne, Editor editor, @@ -668,7 +668,7 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase myType = type; myOccurrences = occurrences; myReplaceAll = settings.isReplaceAll(); - myOccurenceManager = occurenceManager; + myOccurrenceManager = occurrenceManager; myAnchorStatementIfAll = anchorStatementIfAll; myAnchorElementIfOne = anchorElementIfOne; myOutOfCodeBlockExtraction = selectedExpr.getUserData(ElementToWorkOn.OUT_OF_CODE_BLOCK); @@ -743,7 +743,7 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase addInitializationToConstructors(initializer, myField, enclosingConstructor, myParentClass); } if (initializerPlace == InitializationPlace.IN_SETUP_METHOD && initializer != null) { - addInitializationToSetUp(initializer, myField, myOccurenceManager, myReplaceAll, myParentClass); + addInitializationToSetUp(initializer, myField, myOccurrenceManager, myReplaceAll, myParentClass); } if (mySelectedExpr.getParent() instanceof PsiParenthesizedExpression) { mySelectedExpr = (PsiExpression)mySelectedExpr.getParent(); diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceConstantPopup.java b/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceConstantPopup.java index d3923151789d..b63153c77c47 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceConstantPopup.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceConstantPopup.java @@ -28,7 +28,7 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtil; import com.intellij.refactoring.JavaRefactoringSettings; import com.intellij.refactoring.ui.TypeSelectorManagerImpl; -import com.intellij.refactoring.util.occurences.OccurenceManager; +import com.intellij.refactoring.util.occurrences.OccurrenceManager; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -57,9 +57,9 @@ public class InplaceIntroduceConstantPopup extends AbstractInplaceIntroduceField PsiExpression[] occurrences, TypeSelectorManagerImpl typeSelectorManager, PsiElement anchorElement, - PsiElement anchorElementIfAll, OccurenceManager occurenceManager) { + PsiElement anchorElementIfAll, OccurrenceManager occurrenceManager) { super(project, editor, expr, localVariable, occurrences, typeSelectorManager, IntroduceConstantHandler.REFACTORING_NAME, - parentClass, anchorElement, occurenceManager, anchorElementIfAll); + parentClass, anchorElement, occurrenceManager, anchorElementIfAll); myInitializerText = getExprText(expr, localVariable); @@ -239,7 +239,7 @@ public class InplaceIntroduceConstantPopup extends AbstractInplaceIntroduceField else { final BaseExpressionToFieldHandler.ConvertToFieldRunnable convertToFieldRunnable = new BaseExpressionToFieldHandler.ConvertToFieldRunnable(myExpr, settings, settings.getForcedType(), - myOccurrences, myOccurenceManager, + myOccurrences, myOccurrenceManager, getAnchorElementIfAll(), getAnchorElement(), myEditor, myParentClass); convertToFieldRunnable.run(); } diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceFieldPopup.java b/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceFieldPopup.java index f71d7bdbca43..6033e8c15d73 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceFieldPopup.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceFieldPopup.java @@ -27,17 +27,12 @@ import com.intellij.psi.util.PsiExpressionTrimRenderer; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtil; import com.intellij.refactoring.JavaRefactoringSettings; -import com.intellij.refactoring.introduceParameter.AbstractJavaInplaceIntroducer; import com.intellij.refactoring.ui.TypeSelectorManagerImpl; -import com.intellij.refactoring.util.occurences.OccurenceManager; -import com.intellij.ui.SimpleTextAttributes; +import com.intellij.refactoring.util.occurrences.OccurrenceManager; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.TestOnly; import javax.swing.*; import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; @@ -63,9 +58,9 @@ public class InplaceIntroduceFieldPopup extends AbstractInplaceIntroduceFieldPop final boolean allowInitInMethod, boolean allowInitInMethodIfAll, final PsiElement anchorElement, final PsiElement anchorElementIfAll, - final OccurenceManager occurenceManager, Project project) { + final OccurrenceManager occurrenceManager, Project project) { super(project, editor, initializerExpression, localVariable, occurrences, typeSelectorManager, - IntroduceFieldHandler.REFACTORING_NAME, parentClass, anchorElement, occurenceManager, anchorElementIfAll); + IntroduceFieldHandler.REFACTORING_NAME, parentClass, anchorElement, occurrenceManager, anchorElementIfAll); myStatic = aStatic; myIntroduceFieldPanel = new IntroduceFieldPopupPanel(parentClass, initializerExpression, localVariable, currentMethodConstructor, localVariable != null, aStatic, @@ -230,7 +225,7 @@ public class InplaceIntroduceFieldPopup extends AbstractInplaceIntroduceFieldPop else { final BaseExpressionToFieldHandler.ConvertToFieldRunnable convertToFieldRunnable = new BaseExpressionToFieldHandler.ConvertToFieldRunnable(myExpr, settings, settings.getForcedType(), - myOccurrences, myOccurenceManager, + myOccurrences, myOccurrenceManager, getAnchorElementIfAll(), getAnchorElement(), myEditor, myParentClass); diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java index 454e2e8b7ea8..755c5890a50e 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java @@ -36,8 +36,8 @@ import com.intellij.refactoring.ui.TypeSelectorManagerImpl; import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.refactoring.util.RefactoringUtil; import com.intellij.refactoring.util.classMembers.ClassMemberReferencesVisitor; -import com.intellij.refactoring.util.occurences.ExpressionOccurenceManager; -import com.intellij.refactoring.util.occurences.OccurenceManager; +import com.intellij.refactoring.util.occurrences.ExpressionOccurrenceManager; +import com.intellij.refactoring.util.occurrences.OccurrenceManager; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -216,8 +216,8 @@ public class IntroduceConstantHandler extends BaseExpressionToFieldHandler { return visitor.getElementReference(); } - protected OccurenceManager createOccurenceManager(final PsiExpression selectedExpr, final PsiClass parentClass) { - return new ExpressionOccurenceManager(selectedExpr, parentClass, null); + protected OccurrenceManager createOccurenceManager(final PsiExpression selectedExpr, final PsiClass parentClass) { + return new ExpressionOccurrenceManager(selectedExpr, parentClass, null); } private static class IsStaticFinalInitializerExpression extends ClassMemberReferencesVisitor { diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldHandler.java index a2ab1af32442..9d88a5713536 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldHandler.java @@ -25,16 +25,15 @@ import com.intellij.psi.util.PsiUtil; import com.intellij.refactoring.HelpID; import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.introduce.inplace.AbstractInplaceIntroducer; -import com.intellij.refactoring.introduceParameter.AbstractJavaInplaceIntroducer; import com.intellij.refactoring.ui.TypeSelectorManagerImpl; import com.intellij.refactoring.util.CommonRefactoringUtil; -import com.intellij.refactoring.util.occurences.*; +import com.intellij.refactoring.util.occurrences.*; import org.jetbrains.annotations.NotNull; public class IntroduceFieldHandler extends BaseExpressionToFieldHandler { public static final String REFACTORING_NAME = RefactoringBundle.message("introduce.field.title"); - private static final MyOccurenceFilter MY_OCCURENCE_FILTER = new MyOccurenceFilter(); + private static final MyOccurrenceFilter MY_OCCURENCE_FILTER = new MyOccurrenceFilter(); private InplaceIntroduceFieldPopup myInplaceIntroduceFieldPopup; public IntroduceFieldHandler() { @@ -164,12 +163,12 @@ public class IntroduceFieldHandler extends BaseExpressionToFieldHandler { } private static boolean isInSuperOrThis(PsiExpression occurence) { - return !NotInSuperCallOccurenceFilter.INSTANCE.isOK(occurence) || !NotInThisCallFilter.INSTANCE.isOK(occurence); + return !NotInSuperCallOccurrenceFilter.INSTANCE.isOK(occurence) || !NotInThisCallFilter.INSTANCE.isOK(occurence); } - protected OccurenceManager createOccurenceManager(final PsiExpression selectedExpr, final PsiClass parentClass) { - final OccurenceFilter occurenceFilter = isInSuperOrThis(selectedExpr) ? null : MY_OCCURENCE_FILTER; - return new ExpressionOccurenceManager(selectedExpr, parentClass, occurenceFilter, true); + protected OccurrenceManager createOccurenceManager(final PsiExpression selectedExpr, final PsiClass parentClass) { + final OccurrenceFilter occurrenceFilter = isInSuperOrThis(selectedExpr) ? null : MY_OCCURENCE_FILTER; + return new ExpressionOccurrenceManager(selectedExpr, parentClass, occurrenceFilter, true); } protected boolean invokeImpl(final Project project, PsiLocalVariable localVariable, final Editor editor) { @@ -192,9 +191,9 @@ public class IntroduceFieldHandler extends BaseExpressionToFieldHandler { return localToFieldHandler.convertLocalToField(localVariable, editor); } - private static class MyOccurenceFilter implements OccurenceFilter { - public boolean isOK(PsiExpression occurence) { - return !isInSuperOrThis(occurence); + private static class MyOccurrenceFilter implements OccurrenceFilter { + public boolean isOK(PsiExpression occurrence) { + return !isInSuperOrThis(occurrence); } } } diff --git a/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java index 692295ab092d..7ffdbe907ab3 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java @@ -56,7 +56,7 @@ import com.intellij.refactoring.ui.NameSuggestionsGenerator; import com.intellij.refactoring.ui.TypeSelectorManagerImpl; import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.refactoring.util.RefactoringUtil; -import com.intellij.refactoring.util.occurences.ExpressionOccurenceManager; +import com.intellij.refactoring.util.occurrences.ExpressionOccurrenceManager; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; import com.intellij.usageView.UsageInfo; @@ -372,7 +372,7 @@ public class IntroduceParameterHandler extends IntroduceHandlerBase implements R PsiExpression[] occurences; if (myExpr != null) { - occurences = new ExpressionOccurenceManager(myExpr, method, null).findExpressionOccurrences(); + occurences = new ExpressionOccurrenceManager(myExpr, method, null).findExpressionOccurrences(); } else { // local variable occurences = CodeInsightUtil.findReferenceExpressions(method, myLocalVar); diff --git a/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterProcessor.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterProcessor.java index eec99efac200..15eaf40d6ea4 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterProcessor.java @@ -41,9 +41,9 @@ import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.changeSignature.ChangeSignatureProcessor; import com.intellij.refactoring.introduceVariable.IntroduceVariableBase; import com.intellij.refactoring.util.*; -import com.intellij.refactoring.util.occurences.ExpressionOccurenceManager; -import com.intellij.refactoring.util.occurences.LocalVariableOccurenceManager; -import com.intellij.refactoring.util.occurences.OccurenceManager; +import com.intellij.refactoring.util.occurrences.ExpressionOccurrenceManager; +import com.intellij.refactoring.util.occurrences.LocalVariableOccurrenceManager; +import com.intellij.refactoring.util.occurrences.OccurrenceManager; import com.intellij.refactoring.util.usageInfo.DefaultConstructorImplicitUsageInfo; import com.intellij.refactoring.util.usageInfo.NoConstructorClassUsageInfo; import com.intellij.usageView.UsageInfo; @@ -190,14 +190,14 @@ public class IntroduceParameterProcessor extends BaseRefactoringProcessor implem } protected PsiElement[] getOccurrences() { - final OccurenceManager occurenceManager; + final OccurrenceManager occurrenceManager; if (myLocalVariable == null) { - occurenceManager = new ExpressionOccurenceManager(myExpressionToSearch, myMethodToReplaceIn, null); + occurrenceManager = new ExpressionOccurrenceManager(myExpressionToSearch, myMethodToReplaceIn, null); } else { - occurenceManager = new LocalVariableOccurenceManager(myLocalVariable, null); + occurrenceManager = new LocalVariableOccurrenceManager(myLocalVariable, null); } - return occurenceManager.getOccurences(); + return occurrenceManager.getOccurrences(); } public boolean hasConflicts() { diff --git a/java/java-impl/src/com/intellij/refactoring/introduceVariable/InputValidator.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/InputValidator.java index 183c755123a5..6ab7d35e8500 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceVariable/InputValidator.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceVariable/InputValidator.java @@ -22,7 +22,7 @@ import com.intellij.psi.PsiVariable; import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.rename.JavaUnresolvableLocalCollisionDetector; import com.intellij.refactoring.util.RefactoringUIUtil; -import com.intellij.refactoring.util.occurences.ExpressionOccurenceManager; +import com.intellij.refactoring.util.occurrences.ExpressionOccurrenceManager; import com.intellij.util.containers.HashSet; import com.intellij.util.containers.MultiMap; @@ -30,7 +30,7 @@ public class InputValidator implements IntroduceVariableBase.Validator { private final Project myProject; private final PsiElement myAnchorStatementIfAll; private final PsiElement myAnchorStatement; - private final ExpressionOccurenceManager myOccurenceManager; + private final ExpressionOccurrenceManager myOccurenceManager; private final IntroduceVariableBase myIntroduceVariableBase; public boolean isOK(IntroduceVariableSettings settings) { @@ -57,7 +57,7 @@ public class InputValidator implements IntroduceVariableBase.Validator { }; JavaUnresolvableLocalCollisionDetector.visitLocalsCollisions(anchor, name, scope, anchor, visitor); if (replaceAllOccurrences) { - final PsiExpression[] occurences = myOccurenceManager.getOccurences(); + final PsiExpression[] occurences = myOccurenceManager.getOccurrences(); for (PsiExpression occurence : occurences) { IntroduceVariableBase.checkInLoopCondition(occurence, conflicts); } @@ -77,7 +77,7 @@ public class InputValidator implements IntroduceVariableBase.Validator { Project project, PsiElement anchorStatementIfAll, PsiElement anchorStatement, - ExpressionOccurenceManager occurenceManager) { + ExpressionOccurrenceManager occurenceManager) { myIntroduceVariableBase = introduceVariableBase; myProject = project; myAnchorStatementIfAll = anchorStatementIfAll; diff --git a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java index d2d130881726..616828f66926 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java @@ -59,8 +59,8 @@ import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.refactoring.util.FieldConflictsResolver; import com.intellij.refactoring.util.RefactoringUIUtil; import com.intellij.refactoring.util.RefactoringUtil; -import com.intellij.refactoring.util.occurences.ExpressionOccurenceManager; -import com.intellij.refactoring.util.occurences.NotInSuperCallOccurenceFilter; +import com.intellij.refactoring.util.occurrences.ExpressionOccurrenceManager; +import com.intellij.refactoring.util.occurrences.NotInSuperCallOccurrenceFilter; import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.MultiMap; import org.jetbrains.annotations.NonNls; @@ -486,7 +486,7 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase impleme return false; } - if(!NotInSuperCallOccurenceFilter.INSTANCE.isOK(expr)) { + if(!NotInSuperCallOccurrenceFilter.INSTANCE.isOK(expr)) { String message = RefactoringBundle.getCannotRefactorMessage(RefactoringBundle.message("cannot.introduce.variable.in.super.constructor.call")); showErrorMessage(project, editor, message); return false; @@ -508,9 +508,9 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase impleme } } - final ExpressionOccurenceManager occurenceManager = new ExpressionOccurenceManager(expr, lastScope, - NotInSuperCallOccurenceFilter.INSTANCE); - final PsiExpression[] occurrences = occurenceManager.getOccurences(); + final ExpressionOccurrenceManager occurenceManager = new ExpressionOccurrenceManager(expr, lastScope, + NotInSuperCallOccurrenceFilter.INSTANCE); + final PsiExpression[] occurrences = occurenceManager.getOccurrences(); final PsiElement anchorStatementIfAll = occurenceManager.getAnchorStatementForAll(); final LinkedHashMap> occurrencesMap = Maps.newLinkedHashMap(); diff --git a/java/java-impl/src/com/intellij/refactoring/util/occurences/BaseOccurenceManager.java b/java/java-impl/src/com/intellij/refactoring/util/occurrences/BaseOccurrenceManager.java similarity index 73% rename from java/java-impl/src/com/intellij/refactoring/util/occurences/BaseOccurenceManager.java rename to java/java-impl/src/com/intellij/refactoring/util/occurrences/BaseOccurrenceManager.java index e313e89aca74..4113e2cd6ca1 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/occurences/BaseOccurenceManager.java +++ b/java/java-impl/src/com/intellij/refactoring/util/occurrences/BaseOccurrenceManager.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.refactoring.util.occurences; +package com.intellij.refactoring.util.occurrences; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; @@ -27,45 +27,45 @@ import java.util.ArrayList; /** * @author dsl */ -public abstract class BaseOccurenceManager implements OccurenceManager { - private PsiExpression[] myOccurences = null; +public abstract class BaseOccurrenceManager implements OccurrenceManager { + private PsiExpression[] myOccurrences = null; private PsiElement myAnchorStatement = null; - protected final OccurenceFilter myFilter; + protected final OccurrenceFilter myFilter; - public BaseOccurenceManager(OccurenceFilter filter) { + public BaseOccurrenceManager(OccurrenceFilter filter) { myFilter = filter; } - public PsiExpression[] getOccurences() { - if(myOccurences == null) { - myOccurences = findOccurences(); + public PsiExpression[] getOccurrences() { + if(myOccurrences == null) { + myOccurrences = findOccurrences(); if(myFilter != null) { ArrayList result = new ArrayList(); - for (PsiExpression occurence : myOccurences) { - if (myFilter.isOK(occurence)) result.add(occurence); + for (PsiExpression occurrence : myOccurrences) { + if (myFilter.isOK(occurrence)) result.add(occurrence); } if (result.isEmpty()) { - myOccurences = defaultOccurences(); + myOccurrences = defaultOccurrences(); } else { - myOccurences = result.toArray(new PsiExpression[result.size()]); + myOccurrences = result.toArray(new PsiExpression[result.size()]); } } if (getAnchorStatementForAll() == null) { - myOccurences = defaultOccurences(); + myOccurrences = defaultOccurrences(); } } - return myOccurences; + return myOccurrences; } - protected abstract PsiExpression[] defaultOccurences(); + protected abstract PsiExpression[] defaultOccurrences(); - protected abstract PsiExpression[] findOccurences(); + protected abstract PsiExpression[] findOccurrences(); public boolean isInFinalContext() { - return needToDeclareFinal(myOccurences); + return needToDeclareFinal(myOccurrences); } public PsiElement getAnchorStatementForAll() { @@ -76,7 +76,7 @@ public abstract class BaseOccurenceManager implements OccurenceManager { } public PsiElement getAnchorStatementForAllInScope(PsiElement scope) { - return RefactoringUtil.getAnchorElementForMultipleExpressions(myOccurences, scope); + return RefactoringUtil.getAnchorElementForMultipleExpressions(myOccurrences, scope); } private static boolean needToDeclareFinal(PsiExpression[] occurrences) { diff --git a/java/java-impl/src/com/intellij/refactoring/util/occurences/ExpressionOccurenceManager.java b/java/java-impl/src/com/intellij/refactoring/util/occurrences/ExpressionOccurrenceManager.java similarity index 89% rename from java/java-impl/src/com/intellij/refactoring/util/occurences/ExpressionOccurenceManager.java rename to java/java-impl/src/com/intellij/refactoring/util/occurrences/ExpressionOccurrenceManager.java index 0beb43d086c4..28a3aa213bdc 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/occurences/ExpressionOccurenceManager.java +++ b/java/java-impl/src/com/intellij/refactoring/util/occurrences/ExpressionOccurrenceManager.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.refactoring.util.occurences; +package com.intellij.refactoring.util.occurrences; import com.intellij.codeInsight.CodeInsightUtil; import com.intellij.find.FindManager; @@ -30,22 +30,22 @@ import java.util.*; /** * @author dsl */ -public class ExpressionOccurenceManager extends BaseOccurenceManager { +public class ExpressionOccurrenceManager extends BaseOccurrenceManager { private PsiExpression myMainOccurence; private final PsiElement myScope; private final boolean myMaintainStaticContext; - public ExpressionOccurenceManager(PsiExpression mainOccurence, PsiElement scope, OccurenceFilter filter) { + public ExpressionOccurrenceManager(PsiExpression mainOccurence, PsiElement scope, OccurrenceFilter filter) { this(mainOccurence, scope, filter, false); } - public ExpressionOccurenceManager(PsiExpression mainOccurence, PsiElement scope, OccurenceFilter filter, boolean maintainStaticContext) { + public ExpressionOccurrenceManager(PsiExpression mainOccurence, PsiElement scope, OccurrenceFilter filter, boolean maintainStaticContext) { super(filter); myMainOccurence = mainOccurence; myScope = scope; myMaintainStaticContext = maintainStaticContext; } - protected PsiExpression[] defaultOccurences() { + protected PsiExpression[] defaultOccurrences() { return new PsiExpression[]{myMainOccurence}; } @@ -53,12 +53,12 @@ public class ExpressionOccurenceManager extends BaseOccurenceManager { return myMainOccurence; } - protected PsiExpression[] findOccurences() { + protected PsiExpression[] findOccurrences() { if("null".equals(myMainOccurence.getText())) { - return defaultOccurences(); + return defaultOccurrences(); } if(myFilter != null && !myFilter.isOK(myMainOccurence)) { - return defaultOccurences(); + return defaultOccurrences(); } final PsiExpression[] expressionOccurrences = findExpressionOccurrences(); final PsiClass scopeClass = PsiTreeUtil.getNonStrictParentOfType(myScope, PsiClass.class); diff --git a/java/java-impl/src/com/intellij/refactoring/util/occurences/LocalVariableOccurenceManager.java b/java/java-impl/src/com/intellij/refactoring/util/occurrences/LocalVariableOccurrenceManager.java similarity index 77% rename from java/java-impl/src/com/intellij/refactoring/util/occurences/LocalVariableOccurenceManager.java rename to java/java-impl/src/com/intellij/refactoring/util/occurrences/LocalVariableOccurrenceManager.java index ea438b598912..59a764e4f801 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/occurences/LocalVariableOccurenceManager.java +++ b/java/java-impl/src/com/intellij/refactoring/util/occurrences/LocalVariableOccurrenceManager.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.refactoring.util.occurences; +package com.intellij.refactoring.util.occurrences; import com.intellij.codeInsight.CodeInsightUtil; import com.intellij.psi.PsiExpression; @@ -23,19 +23,19 @@ import com.intellij.refactoring.util.RefactoringUtil; /** * @author dsl */ -public class LocalVariableOccurenceManager extends BaseOccurenceManager { +public class LocalVariableOccurrenceManager extends BaseOccurrenceManager { private final PsiLocalVariable myLocalVariable; - public LocalVariableOccurenceManager(PsiLocalVariable localVariable, OccurenceFilter filter) { + public LocalVariableOccurrenceManager(PsiLocalVariable localVariable, OccurrenceFilter filter) { super(filter); myLocalVariable = localVariable; } - public PsiExpression[] defaultOccurences() { + public PsiExpression[] defaultOccurrences() { return PsiExpression.EMPTY_ARRAY; } - public PsiExpression[] findOccurences() { + public PsiExpression[] findOccurrences() { return CodeInsightUtil.findReferenceExpressions(RefactoringUtil.getVariableScope(myLocalVariable), myLocalVariable); } diff --git a/java/java-impl/src/com/intellij/refactoring/util/occurences/NotInSuperCallOccurenceFilter.java b/java/java-impl/src/com/intellij/refactoring/util/occurrences/NotInSuperCallOccurrenceFilter.java similarity index 75% rename from java/java-impl/src/com/intellij/refactoring/util/occurences/NotInSuperCallOccurenceFilter.java rename to java/java-impl/src/com/intellij/refactoring/util/occurrences/NotInSuperCallOccurrenceFilter.java index 4e0d1b58523c..130d8a90748d 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/occurences/NotInSuperCallOccurenceFilter.java +++ b/java/java-impl/src/com/intellij/refactoring/util/occurrences/NotInSuperCallOccurrenceFilter.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.refactoring.util.occurences; +package com.intellij.refactoring.util.occurrences; /** * @author dsl */ -public class NotInSuperCallOccurenceFilter extends NotInSuperOrThisCallFilterBase { - public static final OccurenceFilter INSTANCE = new NotInSuperCallOccurenceFilter(); +public class NotInSuperCallOccurrenceFilter extends NotInSuperOrThisCallFilterBase { + public static final OccurrenceFilter INSTANCE = new NotInSuperCallOccurrenceFilter(); protected String getKeywordText() { return "super"; diff --git a/java/java-impl/src/com/intellij/refactoring/util/occurences/NotInSuperOrThisCallFilterBase.java b/java/java-impl/src/com/intellij/refactoring/util/occurrences/NotInSuperOrThisCallFilterBase.java similarity index 88% rename from java/java-impl/src/com/intellij/refactoring/util/occurences/NotInSuperOrThisCallFilterBase.java rename to java/java-impl/src/com/intellij/refactoring/util/occurrences/NotInSuperOrThisCallFilterBase.java index f5cf98136656..c1e104fc155e 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/occurences/NotInSuperOrThisCallFilterBase.java +++ b/java/java-impl/src/com/intellij/refactoring/util/occurrences/NotInSuperOrThisCallFilterBase.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.refactoring.util.occurences; +package com.intellij.refactoring.util.occurrences; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiExpression; @@ -24,9 +24,9 @@ import org.jetbrains.annotations.NonNls; /** * @author dsl */ -public abstract class NotInSuperOrThisCallFilterBase implements OccurenceFilter { - public boolean isOK(PsiExpression occurence) { - PsiElement parent = occurence.getParent(); +public abstract class NotInSuperOrThisCallFilterBase implements OccurrenceFilter { + public boolean isOK(PsiExpression occurrence) { + PsiElement parent = occurrence.getParent(); while(parent instanceof PsiExpression) { parent = parent.getParent(); } diff --git a/java/java-impl/src/com/intellij/refactoring/util/occurences/NotInThisCallFilter.java b/java/java-impl/src/com/intellij/refactoring/util/occurrences/NotInThisCallFilter.java similarity index 94% rename from java/java-impl/src/com/intellij/refactoring/util/occurences/NotInThisCallFilter.java rename to java/java-impl/src/com/intellij/refactoring/util/occurrences/NotInThisCallFilter.java index bba94f452398..5f9974620a3d 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/occurences/NotInThisCallFilter.java +++ b/java/java-impl/src/com/intellij/refactoring/util/occurrences/NotInThisCallFilter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.refactoring.util.occurences; +package com.intellij.refactoring.util.occurrences; /** * @author dsl diff --git a/java/java-impl/src/com/intellij/refactoring/util/occurences/OccurenceFilter.java b/java/java-impl/src/com/intellij/refactoring/util/occurrences/OccurrenceFilter.java similarity index 83% rename from java/java-impl/src/com/intellij/refactoring/util/occurences/OccurenceFilter.java rename to java/java-impl/src/com/intellij/refactoring/util/occurrences/OccurrenceFilter.java index cb586f3c7b69..8ecfe534648e 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/occurences/OccurenceFilter.java +++ b/java/java-impl/src/com/intellij/refactoring/util/occurrences/OccurrenceFilter.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.refactoring.util.occurences; +package com.intellij.refactoring.util.occurrences; import com.intellij.psi.*; -public interface OccurenceFilter { - boolean isOK(PsiExpression occurence); +public interface OccurrenceFilter { + boolean isOK(PsiExpression occurrence); } diff --git a/java/java-impl/src/com/intellij/refactoring/util/occurences/OccurenceManager.java b/java/java-impl/src/com/intellij/refactoring/util/occurrences/OccurrenceManager.java similarity index 87% rename from java/java-impl/src/com/intellij/refactoring/util/occurences/OccurenceManager.java rename to java/java-impl/src/com/intellij/refactoring/util/occurrences/OccurrenceManager.java index cd8aeb717e5a..943038383e6a 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/occurences/OccurenceManager.java +++ b/java/java-impl/src/com/intellij/refactoring/util/occurrences/OccurrenceManager.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.refactoring.util.occurences; +package com.intellij.refactoring.util.occurrences; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiExpression; @@ -21,8 +21,8 @@ import com.intellij.psi.PsiExpression; /** * @author dsl */ -public interface OccurenceManager { - PsiExpression[] getOccurences(); +public interface OccurrenceManager { + PsiExpression[] getOccurrences(); boolean isInFinalContext(); PsiElement getAnchorStatementForAll(); diff --git a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterTest.java b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterTest.java index 8033fb3795d6..83cef1f0fba2 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterTest.java @@ -16,12 +16,11 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiExpression; import com.intellij.psi.PsiLocalVariable; import com.intellij.psi.PsiMethod; -import com.intellij.psi.util.PsiTreeUtil; import com.intellij.refactoring.introduceField.ElementToWorkOn; import com.intellij.refactoring.introduceParameter.IntroduceParameterHandler; import com.intellij.refactoring.introduceParameter.IntroduceParameterProcessor; import com.intellij.refactoring.introduceParameter.Util; -import com.intellij.refactoring.util.occurences.ExpressionOccurenceManager; +import com.intellij.refactoring.util.occurrences.ExpressionOccurrenceManager; import com.intellij.testFramework.LightCodeInsightTestCase; import com.intellij.testFramework.TestDataPath; import gnu.trove.TIntArrayList; @@ -360,7 +359,7 @@ public class IntroduceParameterTest extends LightCodeInsightTestCase { } else { initializer = expr; - occurences = new ExpressionOccurenceManager(expr, method, null).findExpressionOccurrences(); + occurences = new ExpressionOccurrenceManager(expr, method, null).findExpressionOccurrences(); } TIntArrayList parametersToRemove = removeUnusedParameters ? Util.findParametersToRemove(method, initializer, occurences) : new TIntArrayList(); new IntroduceParameterProcessor( diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/duplicateStringLiteral/DuplicateStringLiteralInspection.java b/plugins/java-i18n/src/com/intellij/codeInspection/duplicateStringLiteral/DuplicateStringLiteralInspection.java index 88a5ae3675b7..3eee1e36f37d 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/duplicateStringLiteral/DuplicateStringLiteralInspection.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/duplicateStringLiteral/DuplicateStringLiteralInspection.java @@ -35,9 +35,9 @@ import com.intellij.psi.util.PsiFormatUtil; import com.intellij.psi.util.PsiFormatUtilBase; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.refactoring.introduceField.IntroduceConstantHandler; -import com.intellij.refactoring.util.occurences.BaseOccurenceManager; -import com.intellij.refactoring.util.occurences.OccurenceFilter; -import com.intellij.refactoring.util.occurences.OccurenceManager; +import com.intellij.refactoring.util.occurrences.BaseOccurrenceManager; +import com.intellij.refactoring.util.occurrences.OccurrenceFilter; +import com.intellij.refactoring.util.occurrences.OccurrenceManager; import com.intellij.ui.DocumentAdapter; import com.intellij.util.CommonProcessors; import com.intellij.util.Function; @@ -313,18 +313,18 @@ public class DuplicateStringLiteralInspection extends BaseLocalInspectionTool { } final PsiExpression[] expressionArray = expressions.toArray(new PsiExpression[expressions.size()]); final IntroduceConstantHandler handler = new IntroduceConstantHandler() { - protected OccurenceManager createOccurenceManager(PsiExpression selectedExpr, PsiClass parentClass) { - final OccurenceFilter filter = new OccurenceFilter() { - public boolean isOK(PsiExpression occurence) { + protected OccurrenceManager createOccurenceManager(PsiExpression selectedExpr, PsiClass parentClass) { + final OccurrenceFilter filter = new OccurrenceFilter() { + public boolean isOK(PsiExpression occurrence) { return true; } }; - return new BaseOccurenceManager(filter) { - protected PsiExpression[] defaultOccurences() { + return new BaseOccurrenceManager(filter) { + protected PsiExpression[] defaultOccurrences() { return expressionArray; } - protected PsiExpression[] findOccurences() { + protected PsiExpression[] findOccurrences() { return expressionArray; } };