From e9095a215386f05ee9c53eceeee79a2a7e99d01d Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 23 Mar 2015 16:57:12 +0100
Subject: [PATCH] extract parameter object: use renamed/retyped getters/setters
 (IDEA-138033)

---
 .../IntroduceParameterObjectProcessor.java                  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectProcessor.java b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectProcessor.java
index 54335f2363f9..7d73c576455f 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectProcessor.java
@@ -211,13 +211,15 @@ public class IntroduceParameterObjectProcessor extends FixableUsagesRefactoringP
       final ParameterChunk parameterChunk = ParameterChunk.getChunkByParameter(parameter, parameters);
 
       @NonNls String getter = parameterChunk != null ? parameterChunk.getter : null;
+      final String paramName = parameterChunk != null ? parameterChunk.parameter.name : replacedParameter.getName();
+      final PsiType paramType = parameterChunk != null ? parameterChunk.parameter.type : replacedParameter.getType();
       if (getter == null) {
-        getter = GenerateMembersUtil.suggestGetterName(replacedParameter.getName(), replacedParameter.getType(), myProject);
+        getter = GenerateMembersUtil.suggestGetterName(paramName, paramType, myProject);
         paramsNeedingGetters.add(replacedParameter);
       }
       @NonNls String setter = parameterChunk != null ? parameterChunk.setter : null;
       if (setter == null) {
-        setter = GenerateMembersUtil.suggestSetterName(replacedParameter.getName(), replacedParameter.getType(), myProject);
+        setter = GenerateMembersUtil.suggestSetterName(paramName, paramType, myProject);
       }
       if (RefactoringUtil.isPlusPlusOrMinusMinus(paramUsage.getParent())) {
         usages.add(new ReplaceParameterIncrementDecrement(paramUsage, fixedParamName, setter, getter));