From d2a3db0c64416324f5ad39072dec606779446288 Mon Sep 17 00:00:00 2001 From: anna Date: Mon, 6 Jun 2011 19:59:51 +0400 Subject: [PATCH] introduce variable: do not save final state it wasn't change --- .../introduceVariable/VariableInplaceIntroducer.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/introduceVariable/VariableInplaceIntroducer.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/VariableInplaceIntroducer.java index ee6803b14264..94c058c0cd63 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceVariable/VariableInplaceIntroducer.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceVariable/VariableInplaceIntroducer.java @@ -118,7 +118,10 @@ public class VariableInplaceIntroducer extends AbstractInplaceVariableIntroducer return; } LOG.assertTrue(psiVariable.isValid()); - saveSettings(psiVariable); + TypeSelectorManagerImpl.typeSelected(psiVariable.getType(), myDefaultType.getType()); + if (myCanBeFinalCb != null) { + JavaRefactoringSettings.getInstance().INTRODUCE_LOCAL_CREATE_FINALS = psiVariable.hasModifierProperty(PsiModifier.FINAL); + } adjustLine(psiVariable, document); int startOffset = getExprMarker() != null && getExprMarker().isValid() ? getExprMarker().getStartOffset() : psiVariable.getTextOffset(); @@ -178,11 +181,6 @@ public class VariableInplaceIntroducer extends AbstractInplaceVariableIntroducer } } - protected void saveSettings(PsiVariable psiVariable) { - TypeSelectorManagerImpl.typeSelected(psiVariable.getType(), myDefaultType.getType()); - JavaRefactoringSettings.getInstance().INTRODUCE_LOCAL_CREATE_FINALS = psiVariable.hasModifierProperty(PsiModifier.FINAL); - } - @Nullable protected JComponent getComponent() {