From 46697b3fe4a359705da4d25140399ebce17d5e62 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Tue, 25 Jun 2013 09:06:06 +0400
Subject: [PATCH] cleanup

---
 .../codeInsight/daemon/impl/GeneralHighlightingPass.java    | 6 ++++--
 .../intellij/openapi/vcs/impl/CodeSmellDetectorImpl.java    | 1 +
 .../intellij/openapi/actionSystem/ex/QuickListsManager.java | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java
index 61cafe44d797..226e49d1f4dd 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java
@@ -788,8 +788,10 @@ public class GeneralHighlightingPass extends ProgressableTextEditorHighlightingP
     return visitorArray;
   }
 
-  static void cancelAndRestartDaemonLater(ProgressIndicator progress, final Project project, TextEditorHighlightingPass pass) throws ProcessCanceledException {
-    PassExecutorService.log(progress, pass, "Cancel and restart");
+  static void cancelAndRestartDaemonLater(@NotNull ProgressIndicator progress,
+                                          @NotNull final Project project,
+                                          @NotNull TextEditorHighlightingPass passCalledFrom) throws ProcessCanceledException {
+    PassExecutorService.log(progress, passCalledFrom, "Cancel and restart");
     progress.cancel();
     ApplicationManager.getApplication().invokeLater(new Runnable() {
       @Override
diff --git a/platform/lang-impl/src/com/intellij/openapi/vcs/impl/CodeSmellDetectorImpl.java b/platform/lang-impl/src/com/intellij/openapi/vcs/impl/CodeSmellDetectorImpl.java
index f05dea6f77fe..4338dd2d8f81 100644
--- a/platform/lang-impl/src/com/intellij/openapi/vcs/impl/CodeSmellDetectorImpl.java
+++ b/platform/lang-impl/src/com/intellij/openapi/vcs/impl/CodeSmellDetectorImpl.java
@@ -158,6 +158,7 @@ public class CodeSmellDetectorImpl extends CodeSmellDetector {
     return result;
   }
 
+  @NotNull
   private List<CodeSmellInfo> findCodeSmells(@NotNull PsiFile psiFile, final ProgressIndicator progress, @NotNull Document document) {
     final List<CodeSmellInfo> result = new ArrayList<CodeSmellInfo>();
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickListsManager.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickListsManager.java
index fad128fc2318..176db4310364 100644
--- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickListsManager.java
+++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickListsManager.java
@@ -54,7 +54,7 @@ public class QuickListsManager implements ExportableApplicationComponent, NamedJ
   private final ActionManager myActionManager;
   private final SchemesManager<QuickList, QuickList> mySchemesManager;
 
-  private final static Logger LOG = Logger.getInstance("#" + QuickListsManager.class.getName());
+  private static final Logger LOG = Logger.getInstance("#" + QuickListsManager.class.getName());
 
   public static QuickListsManager getInstance() {
     return ApplicationManager.getApplication().getComponent(QuickListsManager.class);
@@ -116,7 +116,7 @@ public class QuickListsManager implements ExportableApplicationComponent, NamedJ
 
   public void initComponent() {
     mySchemesManager.loadSchemes();
-    registerActions();    
+    registerActions();
   }
 
   public void disposeComponent() {