From b2f23f2eb97c0ac5ddb21b6efb16968b8c2ead6b Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 12 May 2011 13:29:00 +0400
Subject: [PATCH] condition to insert final tweaks

---
 .../refactoring/introduceVariable/IntroduceVariableBase.java  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java
index 6605d527652c..8bbcae485a23 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java
@@ -771,9 +771,7 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase impleme
     final String variableName = suggestedName.names[0];
     final boolean replaceAll =
       replaceChoice == OccurrencesChooser.ReplaceChoice.ALL || replaceChoice == OccurrencesChooser.ReplaceChoice.NO_WRITE;
-    final boolean declareFinal =
-      !anyAssignmentLHS && (replaceAll &&
-                            declareFinalIfAll || createFinals(project));
+    final boolean declareFinal = replaceAll && (declareFinalIfAll || !anyAssignmentLHS) || createFinals(project);
     final boolean replaceWrite = anyAssignmentLHS && replaceChoice == OccurrencesChooser.ReplaceChoice.ALL;
     return new IntroduceVariableSettings() {
       @Override