From cc68adee4ecfe59a5c90d9770ffa87891b9cf28b Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 13 Apr 2011 19:32:43 +0200
Subject: [PATCH] Cleanup

---
 .../move/moveMembers/MockMoveMembersOptions.java         | 4 ++--
 .../intellij/refactoring/BaseRefactoringProcessor.java   | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/java/testFramework/src/com/intellij/refactoring/move/moveMembers/MockMoveMembersOptions.java b/java/testFramework/src/com/intellij/refactoring/move/moveMembers/MockMoveMembersOptions.java
index b10bc2e57495..bc6b7473ad2b 100644
--- a/java/testFramework/src/com/intellij/refactoring/move/moveMembers/MockMoveMembersOptions.java
+++ b/java/testFramework/src/com/intellij/refactoring/move/moveMembers/MockMoveMembersOptions.java
@@ -17,6 +17,7 @@ package com.intellij.refactoring.move.moveMembers;
 
 import com.intellij.psi.PsiMember;
 import com.intellij.psi.PsiModifier;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
 
@@ -47,7 +48,7 @@ public class MockMoveMembersOptions implements MoveMembersOptions {
     return true;
   }
 
-  public void setMemberVisibility(String visibility) {
+  public void setMemberVisibility(@Nullable String visibility) {
     myMemberVisibility = visibility;
   }
 
@@ -60,5 +61,4 @@ public class MockMoveMembersOptions implements MoveMembersOptions {
   public String getTargetClassName() {
     return myTargetClassName;
   }
-
 }
diff --git a/platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java
index a5670b2e26b8..d8c4d996c419 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java
@@ -149,7 +149,7 @@ public abstract class BaseRefactoringProcessor {
     final Ref<UsageInfo[]> refUsages = new Ref<UsageInfo[]>();
     final Ref<Language> refErrorLanguage = new Ref<Language>();
     final Ref<Boolean> refProcessCanceled = new Ref<Boolean>();
-    final Ref<Boolean> dumbModeOccured = new Ref<Boolean>();
+    final Ref<Boolean> dumbModeOccurred = new Ref<Boolean>();
 
     final Runnable findUsagesRunnable = new Runnable() {
       public void run() {
@@ -163,7 +163,7 @@ public abstract class BaseRefactoringProcessor {
           refProcessCanceled.set(Boolean.TRUE);
         }
         catch (IndexNotReadyException e) {
-          dumbModeOccured.set(Boolean.TRUE);
+          dumbModeOccurred.set(Boolean.TRUE);
         }
       }
     };
@@ -176,13 +176,12 @@ public abstract class BaseRefactoringProcessor {
       Messages.showErrorDialog(myProject, RefactoringBundle.message("unsupported.refs.found", refErrorLanguage.get().getDisplayName()), RefactoringBundle.message("error.title"));
       return;
     }
-    if (!dumbModeOccured.isNull()) {
+    if (!dumbModeOccurred.isNull()) {
       DumbService.getInstance(myProject).showDumbModeNotification("Usage search is not available until indices are ready");
       return;
     }
     if (!refProcessCanceled.isNull()) {
-      Messages.showErrorDialog(myProject, "Index corruption detected. Please retry the refactoring - indexes will be rebuilt automatically",
-                               RefactoringBundle.message("error.title"));
+      Messages.showErrorDialog(myProject, "Index corruption detected. Please retry the refactoring - indexes will be rebuilt automatically", RefactoringBundle.message("error.title"));
       return;
     }