From 6692b862b01afbd59f4e04b42c7bf23944a24ec7 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Fri, 25 Mar 2011 12:46:38 +0100
Subject: [PATCH] choose method to introduce parameter to: choose from valid
 methods only

---
 .../introduceParameter/IntroduceParameterHandler.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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 b8d27999117c..89b5b5b85567 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java
@@ -164,8 +164,9 @@ public class IntroduceParameterHandler extends IntroduceHandlerBase implements R
     final Introducer introducer = new Introducer(project, expr, localVar, editor);
     final boolean unitTestMode = ApplicationManager.getApplication().isUnitTestMode();
     if (validEnclosingMethods.size() == 1 || unitTestMode) {
-      if (validEnclosingMethods.get(0).findDeepestSuperMethod() == null || unitTestMode) {
-        introducer.introduceParameter(method, method);
+      final PsiMethod methodToIntroduceParameterTo = validEnclosingMethods.get(0);
+      if (methodToIntroduceParameterTo.findDeepestSuperMethod() == null || unitTestMode) {
+        introducer.introduceParameter(methodToIntroduceParameterTo, methodToIntroduceParameterTo);
         return true;
       }
     }
@@ -176,8 +177,8 @@ public class IntroduceParameterHandler extends IntroduceHandlerBase implements R
   }
 
   private void chooseMethodToIntroduceParameter(final Editor editor,
-                                                       final List<PsiMethod> validEnclosingMethods,
-                                                       final Introducer introducer) {
+                                                final List<PsiMethod> validEnclosingMethods,
+                                                final Introducer introducer) {
     final JPanel panel = new JPanel(new BorderLayout());
     final JCheckBox superMethod = new JCheckBox("Use super method of", true);
     superMethod.setMnemonic('U');