From 1de917d3d6c82700f522fbd23d7bf0b008ec35b1 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 29 Jan 2015 20:39:23 +0300
Subject: [PATCH] @NotNull

---
 .../introduceParameter/AbstractJavaInplaceIntroducer.java | 2 +-
 .../introduceVariable/JavaVariableInplaceIntroducer.java  | 8 ++++++--
 .../introduce/inplace/AbstractInplaceIntroducer.java      | 2 +-
 .../introduce/GrAbstractInplaceIntroducer.java            | 2 +-
 .../introduce/field/GrInplaceFieldIntroducer.java         | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/introduceParameter/AbstractJavaInplaceIntroducer.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/AbstractJavaInplaceIntroducer.java
index 76ac3fd7e55f..2ce7340632c9 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/AbstractJavaInplaceIntroducer.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/AbstractJavaInplaceIntroducer.java
@@ -92,7 +92,7 @@ public abstract class AbstractJavaInplaceIntroducer extends AbstractInplaceIntro
   }
 
   @Override
-  protected void restoreState(PsiVariable psiField) {
+  protected void restoreState(@NotNull PsiVariable psiField) {
     final SmartTypePointer typePointer = SmartTypePointerManager.getInstance(myProject).createSmartTypePointer(getType());
     super.restoreState(psiField);
     for (PsiExpression occurrence : myOccurrences) {
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceVariable/JavaVariableInplaceIntroducer.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/JavaVariableInplaceIntroducer.java
index 9a5a59ff8a80..d68e683de6ce 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceVariable/JavaVariableInplaceIntroducer.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceVariable/JavaVariableInplaceIntroducer.java
@@ -46,6 +46,7 @@ import com.intellij.refactoring.rename.inplace.VariableInplaceRenamer;
 import com.intellij.refactoring.ui.TypeSelectorManagerImpl;
 import com.intellij.refactoring.util.RefactoringUtil;
 import com.intellij.ui.NonFocusableCheckBox;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -128,7 +129,7 @@ public class JavaVariableInplaceIntroducer extends AbstractJavaInplaceIntroducer
   }
 
   @Override
-  protected void restoreState(PsiVariable psiField) {
+  protected void restoreState(@NotNull PsiVariable psiField) {
     if (myDeleteSelf) return;
     super.restoreState(psiField);
   }
@@ -142,7 +143,10 @@ public class JavaVariableInplaceIntroducer extends AbstractJavaInplaceIntroducer
   @Override
   protected void performCleanup() {
     super.performCleanup();
-    super.restoreState(getVariable());
+    PsiVariable variable = getVariable();
+    if (variable != null) {
+      super.restoreState(variable);
+    }
   }
 
   @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 e8343be3f02f..ea0b8bad56e0 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
@@ -464,7 +464,7 @@ public abstract class AbstractInplaceIntroducer<V extends PsiNameIdentifierOwner
     }
   }
 
-  protected void restoreState(final V psiField) {
+  protected void restoreState(@NotNull final V psiField) {
     if (!ReadonlyStatusHandler.ensureDocumentWritable(myProject, InjectedLanguageUtil.getTopLevelEditor(myEditor).getDocument())) return;
     ApplicationManager.getApplication().runWriteAction(new Runnable() {
       @Override
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/GrAbstractInplaceIntroducer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/GrAbstractInplaceIntroducer.java
index abcf02e3db38..7e0f4bac8375 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/GrAbstractInplaceIntroducer.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/GrAbstractInplaceIntroducer.java
@@ -226,7 +226,7 @@ public abstract class GrAbstractInplaceIntroducer<Settings extends GrIntroduceSe
   protected abstract Settings getSettings();
 
   @Override
-  protected void restoreState(GrVariable psiField) {
+  protected void restoreState(@NotNull GrVariable psiField) {
     PsiType declaredType = psiField.getDeclaredType();
     myTypePointer = declaredType != null ? SmartTypePointerManager.getInstance(myProject).createSmartTypePointer(declaredType) : null;
     super.restoreState(psiField);
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrInplaceFieldIntroducer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrInplaceFieldIntroducer.java
index d5cdb8c74cf6..8f1cbf0b1454 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrInplaceFieldIntroducer.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrInplaceFieldIntroducer.java
@@ -238,7 +238,7 @@ public class GrInplaceFieldIntroducer extends GrAbstractInplaceIntroducer<GrIntr
   }
 
   @Override
-  protected void restoreState(GrVariable psiField) {
+  protected void restoreState(@NotNull GrVariable psiField) {
     myIsStatic = psiField.hasModifierProperty(PsiModifier.STATIC);
 
     super.restoreState(psiField);