From 638bacd7acd80510fb534be6c2ec21075c45db58 Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 7 Aug 2012 21:36:33 +0200 Subject: [PATCH] fix test: first create a newly introduced parameter, then delete the obsolete ones --- .../JavaIntroduceParameterMethodUsagesProcessor.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/introduceParameter/JavaIntroduceParameterMethodUsagesProcessor.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/JavaIntroduceParameterMethodUsagesProcessor.java index 3f16cfb1e0eb..3ce3c366a5a9 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/JavaIntroduceParameterMethodUsagesProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/JavaIntroduceParameterMethodUsagesProcessor.java @@ -193,7 +193,11 @@ public class JavaIntroduceParameterMethodUsagesProcessor implements IntroducePar final MethodJavaDocHelper javaDocHelper = new MethodJavaDocHelper(method); PsiElementFactory factory = JavaPsiFacade.getInstance(data.getProject()).getElementFactory(); - final PsiParameter[] parameters = method.getParameterList().getParameters(); + PsiParameter parameter = factory.createParameter(data.getParameterName(), data.getForcedType()); + PsiUtil.setModifierProperty(parameter, PsiModifier.FINAL, data.isDeclareFinal()); + + final PsiParameterList parameterList = method.getParameterList(); + final PsiParameter[] parameters = parameterList.getParameters(); data.getParametersToRemove().forEachDescending(new TIntProcedure() { public boolean execute(final int paramNum) { try { @@ -211,10 +215,7 @@ public class JavaIntroduceParameterMethodUsagesProcessor implements IntroducePar } }); - PsiParameter parameter = factory.createParameter(data.getParameterName(), data.getForcedType()); - PsiUtil.setModifierProperty(parameter, PsiModifier.FINAL, data.isDeclareFinal()); final PsiParameter anchorParameter = getAnchorParameter(method); - final PsiParameterList parameterList = method.getParameterList(); parameter = (PsiParameter)parameterList.addAfter(parameter, anchorParameter); JavaCodeStyleManager.getInstance(data.getProject()).shortenClassReferences(parameter); final PsiDocTag tagForAnchorParameter = javaDocHelper.getTagForParameter(anchorParameter);