From 5510997e7f8ade56ac318e7fb0a00bd92d4e6e1e Mon Sep 17 00:00:00 2001
From: anna <anna.kozlova@jetbrains.com>
Date: Wed, 29 Jun 2011 17:40:49 +0400
Subject: [PATCH] prevent possible NPE

---
 .../InplaceIntroduceParameterPopup.java                   | 7 ++++---
 .../introduce/inplace/AbstractInplaceIntroducer.java      | 8 +++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java
index 454e24e40e06..324f4f6af465 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java
@@ -200,12 +200,13 @@ public class InplaceIntroduceParameterPopup extends AbstractJavaInplaceIntroduce
   }
 
   @Override
-  protected void updateTitle(PsiVariable variable) {
+  protected void updateTitle(@Nullable PsiVariable variable) {
+    if (variable == null) return;
     updateTitle(variable, variable.getName());
   }
 
   @Override
-  protected void updateTitle(PsiVariable variable, String value) {
+  protected void updateTitle(@Nullable PsiVariable variable, String value) {
     final PsiElement declarationScope = variable != null ? ((PsiParameter)variable).getDeclarationScope() : null;
     if (declarationScope instanceof PsiMethod) {
       final PsiMethod psiMethod = (PsiMethod)declarationScope;
@@ -226,8 +227,8 @@ public class InplaceIntroduceParameterPopup extends AbstractJavaInplaceIntroduce
         myLabel.append(variable == parameter ? value : parameter.getName(), attr);
       }
       myLabel.append(")", SimpleTextAttributes.GRAYED_ATTRIBUTES);
+      revalidate();
     }
-    revalidate();
   }
 
   @Override
diff --git a/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java b/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java
index c53255d6cb2f..76f99b5a8949 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java
@@ -72,7 +72,7 @@ public abstract class AbstractInplaceIntroducer<V extends PsiNameIdentifierOwner
   protected String myConstantName;
   public static final Key<AbstractInplaceIntroducer> ACTIVE_INTRODUCE = Key.create("ACTIVE_INTRODUCE");
 
-  protected SimpleColoredComponent myLabel = new SimpleColoredComponent();
+  protected final SimpleColoredComponent myLabel = new SimpleColoredComponent();
   private DocumentAdapter myDocumentAdapter;
   protected final JPanel myWholePanel;
 
@@ -190,13 +190,15 @@ public abstract class AbstractInplaceIntroducer<V extends PsiNameIdentifierOwner
     return result.get();
   }
 
-  protected void updateTitle(V variable, String value) {
+  protected void updateTitle(@Nullable V variable, String value) {
+    if (variable == null) return;
     myLabel.clear();
     myLabel.append(variable.getText().replace(variable.getName(), value), SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES);
     revalidate();
   }
 
-  protected void updateTitle(V variable) {
+  protected void updateTitle(@Nullable V variable) {
+    if (variable == null) return;
     myLabel.clear();
     myLabel.append(variable.getText(), SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES);
     revalidate();