EA-26903 - NPE: NotInSuperOrThisCallFilterBase.isOK

This commit is contained in:
anna
2011-04-13 15:11:30 +02:00
parent d93112a377
commit acac378713
2 changed files with 2 additions and 2 deletions
@@ -149,7 +149,7 @@ public class IntroduceConstantHandler extends BaseExpressionToFieldHandler {
if (editor != null && editor.getSettings().isVariableInplaceRenameEnabled()) {
new InplaceIntroduceConstantPopup(project, editor, parentClass, expr, localVariable, occurences, typeSelectorManager,
anchorElement, anchorElementIfAll,
createOccurenceManager(expr, parentClass)).performInplaceIntroduce();
expr != null ? createOccurenceManager(expr, parentClass) : null).performInplaceIntroduce();
return null;
}
@@ -108,7 +108,7 @@ public class IntroduceFieldHandler extends BaseExpressionToFieldHandler {
if (editor != null && editor.getSettings().isVariableInplaceRenameEnabled()) {
myInplaceIntroduceFieldPopup =
new InplaceIntroduceFieldPopup(localVariable, parentClass, declareStatic, currentMethodConstructor, occurences, expr, typeSelectorManager, editor,
allowInitInMethod, allowInitInMethodIfAll, anchorElement, anchorElementIfAll, createOccurenceManager(expr, parentClass));
allowInitInMethod, allowInitInMethodIfAll, anchorElement, anchorElementIfAll, expr != null ? createOccurenceManager(expr, parentClass) : null);
myInplaceIntroduceFieldPopup.startTemplate();
return null;
}