From 92696623d4cd47f80d960db7d402eb4e2581027e Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Tue, 1 Mar 2011 21:17:20 +0100
Subject: [PATCH] NPE

---
 .../InplaceIntroduceParameterPopup.java               |  2 +-
 .../introduceParameter/IntroduceParameterHandler.java | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java
index cce7d69e081a..468109d654fb 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java
@@ -362,7 +362,7 @@ class InplaceIntroduceParameterPopup extends IntroduceParameterSettingsUI {
           final PsiType defaultType = myTypeSelectorManager.getTypeSelector().getSelectedType();
           final String propName = myLocalVar != null ? JavaCodeStyleManager
             .getInstance(myProject).variableNameToPropertyName(myLocalVar.getName(), VariableKind.LOCAL_VARIABLE) : null;
-          final String[] names = IntroduceParameterHandler.createNameSuggestionGenerator(myExpr, propName)
+          final String[] names = IntroduceParameterHandler.createNameSuggestionGenerator(myExpr, propName, myProject)
             .getSuggestedNameInfo(defaultType).names;
           final PsiParameter parameter = createParameterToStartTemplateOn(names, defaultType);
           if (parameter != null) {
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 1a8665a108d2..463b38926bd7 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java
@@ -26,7 +26,6 @@ package com.intellij.refactoring.introduceParameter;
 
 import com.intellij.codeInsight.CodeInsightUtil;
 import com.intellij.codeInsight.completion.JavaCompletionUtil;
-import com.intellij.ide.util.SuperMethodWarningUtil;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
@@ -37,7 +36,6 @@ import com.intellij.openapi.editor.colors.EditorColorsManager;
 import com.intellij.openapi.editor.markup.*;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.popup.*;
-import com.intellij.openapi.ui.popup.util.BaseListPopupStep;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.Pass;
 import com.intellij.openapi.util.TextRange;
@@ -254,10 +252,11 @@ public class IntroduceParameterHandler extends IntroduceHandlerBase implements R
   }
 
   protected static NameSuggestionsGenerator createNameSuggestionGenerator(final PsiExpression expr,
-                                                                          final String propName) {
+                                                                          final String propName,
+                                                                          final Project project) {
     return new NameSuggestionsGenerator() {
       public SuggestedNameInfo getSuggestedNameInfo(PsiType type) {
-        final JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(expr.getProject());
+        final JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(project);
         final SuggestedNameInfo info = codeStyleManager.suggestVariableName(VariableKind.PARAMETER, propName, expr, type);
         final String[] strings = JavaCompletionUtil
           .completeVariableNameForRefactoring(codeStyleManager, type, VariableKind.LOCAL_VARIABLE, info);
@@ -277,7 +276,7 @@ public class IntroduceParameterHandler extends IntroduceHandlerBase implements R
     /* do nothing */
   }
 
-  private static List<PsiMethod> getEnclosingMethods(PsiMethod nearest) {
+  public static List<PsiMethod> getEnclosingMethods(PsiMethod nearest) {
     List<PsiMethod> enclosingMethods = new ArrayList<PsiMethod>();
     enclosingMethods.add(nearest);
     PsiMethod method = nearest;
@@ -406,7 +405,7 @@ public class IntroduceParameterHandler extends IntroduceHandlerBase implements R
                                                   ? new TypeSelectorManagerImpl(myProject, initializerType, myExpr, occurences)
                                                   : new TypeSelectorManagerImpl(myProject, initializerType, occurences);
 
-        NameSuggestionsGenerator nameSuggestionsGenerator = createNameSuggestionGenerator(myExpr, propName);
+        NameSuggestionsGenerator nameSuggestionsGenerator = createNameSuggestionGenerator(myExpr, propName, myProject);
         boolean isInplaceAvailableOnDataContext = myEditor != null && myEditor.getSettings().isVariableInplaceRenameEnabled();
 
         if (!isInplaceAvailableOnDataContext) {