diff --git a/images/src/org/intellij/images/options/impl/OptionsConfigurabe.java b/images/src/org/intellij/images/options/impl/OptionsConfigurabe.java
index 19bd30221f5b..f885805fc8d1 100644
--- a/images/src/org/intellij/images/options/impl/OptionsConfigurabe.java
+++ b/images/src/org/intellij/images/options/impl/OptionsConfigurabe.java
@@ -24,6 +24,7 @@ import org.intellij.images.ImagesBundle;
 import org.intellij.images.options.Options;
 import org.intellij.images.options.OptionsManager;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -100,6 +101,7 @@ public final class OptionsConfigurabe extends BaseConfigurableWithChangeSupport
       util.editConfigurable(project, new OptionsConfigurabe());
     }
 
+  @NotNull
   @NonNls
   public String getId() {
     return "Images";
diff --git a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java
index 201dbe7760b3..c217042b54da 100644
--- a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java
+++ b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java
@@ -18,6 +18,7 @@ import com.intellij.ui.TableUtil;
 import com.intellij.util.containers.HashMap;
 import com.intellij.util.ui.ItemRemovable;
 import com.intellij.util.ui.Table;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import javax.swing.border.TitledBorder;
@@ -69,6 +70,7 @@ public class AnnotationProcessorsConfigurable implements SearchableConfigurable
     return "reference.projectsettings.compiler.annotationProcessors";
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java
index 99b0b10c2744..576c43a07979 100644
--- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java
+++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java
@@ -26,12 +26,12 @@ import com.intellij.openapi.fileChooser.FileChooserDescriptor;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
-import com.intellij.openapi.options.ShowSettingsUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vcs.FileStatusManager;
 import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -63,6 +63,7 @@ public class CompilerConfigurable implements SearchableConfigurable.Parent {
     return "project.propCompiler";
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
@@ -178,6 +179,7 @@ public class CompilerConfigurable implements SearchableConfigurable.Parent {
           excludes.disposeUIResources();
         }
 
+      @NotNull
       public String getId() {
         return getHelpTopic();
       }
diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java
index db6787ed882e..f260768ba51d 100644
--- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java
+++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java
@@ -24,6 +24,7 @@ import com.intellij.openapi.compiler.CompilerBundle;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.project.Project;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.util.ArrayList;
@@ -148,6 +149,7 @@ public class CompilerUIConfigurable implements SearchableConfigurable {
     return null;
   }
 
+  @NotNull
   public String getId() {
     return "compiler.general";
   }
diff --git a/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java b/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java
index 6a87175f4712..0614ec5b25b1 100644
--- a/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java
+++ b/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java
@@ -25,6 +25,7 @@ import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Comparing;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
@@ -91,6 +92,7 @@ public class JavaCompilersTab implements SearchableConfigurable {
     return "reference.projectsettings.compiler.javacompiler";
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/java/compiler/impl/src/com/intellij/compiler/options/RmicConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/RmicConfigurable.java
index dfc5442ad66d..55ff69f568d5 100644
--- a/java/compiler/impl/src/com/intellij/compiler/options/RmicConfigurable.java
+++ b/java/compiler/impl/src/com/intellij/compiler/options/RmicConfigurable.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.compiler.CompilerBundle;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.ui.RawCommandLineEditor;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.event.ItemEvent;
@@ -69,6 +70,7 @@ public class RmicConfigurable implements SearchableConfigurable {
     return "reference.projectsettings.compiler.rmicompiler";
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerDataViewsConfigurable.java b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerDataViewsConfigurable.java
index ce3f24a7aff0..634ce76433dd 100644
--- a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerDataViewsConfigurable.java
+++ b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerDataViewsConfigurable.java
@@ -25,6 +25,7 @@ import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.registry.ui.RegistryCheckBox;
 import com.intellij.ui.StateRestoringCheckBox;
 import com.intellij.ui.classFilter.ClassFilterEditor;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
@@ -289,6 +290,7 @@ public class DebuggerDataViewsConfigurable implements SearchableConfigurable {
     return "reference.idesettings.debugger.dataviews";
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerHotswapConfigurable.java b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerHotswapConfigurable.java
index 21e47d2a959a..ab4b831b9548 100644
--- a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerHotswapConfigurable.java
+++ b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerHotswapConfigurable.java
@@ -17,6 +17,7 @@ package com.intellij.debugger.settings;
 
 import com.intellij.debugger.DebuggerBundle;
 import com.intellij.openapi.options.SearchableConfigurable;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import javax.swing.border.Border;
@@ -83,6 +84,7 @@ public class DebuggerHotswapConfigurable implements SearchableConfigurable {
     return "reference.idesettings.debugger.hotswap";
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSteppingConfigurable.java b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSteppingConfigurable.java
index 0cb14afb34ee..4b2fac5bc214 100644
--- a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSteppingConfigurable.java
+++ b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSteppingConfigurable.java
@@ -19,6 +19,7 @@ import com.intellij.debugger.DebuggerBundle;
 import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.project.Project;
 import com.intellij.ui.classFilter.ClassFilterEditor;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
@@ -87,6 +88,7 @@ public class DebuggerSteppingConfigurable implements SearchableConfigurable {
     return "reference.idesettings.debugger.stepping";
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/UserRenderersConfigurable.java b/java/debugger/impl/src/com/intellij/debugger/settings/UserRenderersConfigurable.java
index f3a0dda1e15a..8629cfa09a2b 100644
--- a/java/debugger/impl/src/com/intellij/debugger/settings/UserRenderersConfigurable.java
+++ b/java/debugger/impl/src/com/intellij/debugger/settings/UserRenderersConfigurable.java
@@ -27,6 +27,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.ui.DocumentAdapter;
 import com.intellij.util.containers.InternalIterator;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
@@ -68,6 +69,7 @@ public class UserRenderersConfigurable implements SearchableConfigurable {
     return "reference.idesettings.debugger.typerenderers"; 
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java
index 63132c974ee3..9007a6d9f0c8 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java
@@ -138,6 +138,7 @@ public class ProjectStructureConfigurable extends BaseConfigurable implements Se
     myUiState.sideProportion = sideProportion != null ? Float.parseFloat(sideProportion) : 0;
   }
 
+  @NotNull
   @NonNls
   public String getId() {
     return "project.structure";
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurable.java
index 7a4ad7c84be6..d82671ef4b17 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurable.java
@@ -340,6 +340,7 @@ public class ArtifactsStructureConfigurable extends BaseStructureConfigurable {
     return false;
   }
 
+  @NotNull
   public String getId() {
     return "project.artifacts";
   }
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java
index 597615be4395..e5eb0f045588 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java
@@ -273,6 +273,7 @@ public class FacetStructureConfigurable extends BaseStructureConfigurable {
     return "reference.settingsdialog.project.structure.facet";
   }
 
+  @NotNull
   public String getId() {
     return "project.facets";
   }
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/GlobalLibrariesConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/GlobalLibrariesConfigurable.java
index 864886be2b3b..8ac240060a2a 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/GlobalLibrariesConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/GlobalLibrariesConfigurable.java
@@ -22,6 +22,7 @@ import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar;
 import com.intellij.openapi.ui.MasterDetailsStateService;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -44,6 +45,7 @@ public class GlobalLibrariesConfigurable extends BaseLibrariesConfigurable {
     return null;
   }
 
+  @NotNull
   @NonNls
   public String getId() {
     return "global.libraries";
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java
index 334da5596982..613d0ab370f9 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java
@@ -102,6 +102,7 @@ public class JdkListConfigurable extends BaseStructureConfigurable {
     return myCurrentConfigurable != null ? myCurrentConfigurable.getHelpTopic() : "reference.settingsdialog.project.structure.jdk";
   }
 
+  @NotNull
   @NonNls
   public String getId() {
     return "jdk.list";
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java
index cd13f8c68cf6..07c7d6a59d2e 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java
@@ -530,6 +530,7 @@ public class ModuleStructureConfigurable extends BaseStructureConfigurable imple
     return null;
   }
 
+  @NotNull
   @NonNls
   public String getId() {
     return "project.structure";
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectLibrariesConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectLibrariesConfigurable.java
index 09ee673ec935..d2cb1f580067 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectLibrariesConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectLibrariesConfigurable.java
@@ -22,6 +22,7 @@ import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar;
 import com.intellij.openapi.ui.MasterDetailsStateService;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -43,6 +44,7 @@ public class ProjectLibrariesConfigurable extends BaseLibrariesConfigurable {
     return null;
   }
 
+  @NotNull
   @NonNls
   public String getId() {
     return "project.libraries";
diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeCompletionOptions.java b/platform/lang-impl/src/com/intellij/application/options/CodeCompletionOptions.java
index 957a8fb87ef6..c09424d2f1f6 100644
--- a/platform/lang-impl/src/com/intellij/application/options/CodeCompletionOptions.java
+++ b/platform/lang-impl/src/com/intellij/application/options/CodeCompletionOptions.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.application.ApplicationBundle;
 import com.intellij.openapi.options.BaseConfigurable;
 import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.util.IconLoader;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -61,6 +62,7 @@ public class CodeCompletionOptions extends BaseConfigurable implements Searchabl
     return "reference.settingsdialog.IDE.editor.code.completion";
   }
 
+  @NotNull
   public String getId() {
     return "editor.preferences.completion";
   }
diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java
index 940e10d04a9c..d95032495139 100644
--- a/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java
@@ -29,6 +29,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsProvider;
 import com.intellij.psi.impl.source.codeStyle.CodeStyleSchemeImpl;
 import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.util.ArrayList;
@@ -281,6 +282,7 @@ public class CodeStyleSchemesConfigurable extends SearchableConfigurable.Parent.
     return false;
   }
 
+  @NotNull
   public String getId() {
     return "preferences.sourceCode";
   }
@@ -367,6 +369,7 @@ public class CodeStyleSchemesConfigurable extends SearchableConfigurable.Parent.
 
     }
 
+    @NotNull
     public String getId() {
       return "preferences.sourceCode." + getDisplayName();
     }
diff --git a/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java b/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java
index ee604d992eca..6beb28ed4419 100644
--- a/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java
+++ b/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java
@@ -957,6 +957,7 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract
     }
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
@@ -1093,6 +1094,7 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract
       }
     }
 
+    @NotNull
     public String getId() {
       return ColorAndFontOptions.this.getId() + "." + getDisplayName();
     }
diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsConfigurable.java
index c7c60f89cfcd..49bb84e74286 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsConfigurable.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.application.ApplicationBundle;
 import com.intellij.openapi.options.AbstractConfigurableEP;
 import com.intellij.openapi.options.CompositeConfigurable;
 import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
@@ -62,6 +63,7 @@ public class AutoImportOptionsConfigurable extends CompositeConfigurable<AutoImp
     return myPanel;
   }
 
+  @NotNull
   public String getId() {
     return "editor.preferences.import";
   }
diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java
index 301c863480bc..ee100e72655d 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java
@@ -29,6 +29,7 @@ import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Pair;
 import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
@@ -104,6 +105,7 @@ public class CodeFoldingConfigurable extends CompositeConfigurable<CodeFoldingOp
     return AbstractConfigurableEP.createConfigurables(CodeFoldingOptionsProviderEP.EP_NAME);
   }
 
+  @NotNull
   public String getId() {
     return "editor.preferences.folding";
   }
diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/EditorAppearanceConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/editor/EditorAppearanceConfigurable.java
index 30ef19d7ef65..7f83a64d6180 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/EditorAppearanceConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/EditorAppearanceConfigurable.java
@@ -29,6 +29,7 @@ import com.intellij.openapi.options.CompositeConfigurable;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.UnnamedConfigurable;
 import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
@@ -189,6 +190,7 @@ public class EditorAppearanceConfigurable extends CompositeConfigurable<UnnamedC
     return AbstractConfigurableEP.createConfigurables(EP_NAME);
   }
 
+  @NotNull
   public String getId() {
     return "editor.preferences.appearance";
   }
diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptions.java b/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptions.java
index d317ac12feba..2c9e71c61fb4 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptions.java
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptions.java
@@ -23,6 +23,7 @@ import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.util.IconLoader;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.util.List;
@@ -52,6 +53,7 @@ public class EditorOptions implements SearchableConfigurable.Parent {
     return ID;
   }
 
+  @NotNull
   public String getId() {
     return ID;
   }
diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsPanel.java b/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsPanel.java
index aa6a45b2c4a0..3d946829b4dd 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsPanel.java
@@ -38,6 +38,7 @@ import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.util.SystemInfo;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
@@ -419,6 +420,7 @@ public class EditorOptionsPanel {
   }
 
   public class MyConfigurable implements SearchableConfigurable {
+    @NotNull
     public String getId() {
       return "Editor.Behavior";
     }
diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/EditorSmartKeysConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/editor/EditorSmartKeysConfigurable.java
index 62a83ec2cbdf..a990bb3f5b00 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/EditorSmartKeysConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/EditorSmartKeysConfigurable.java
@@ -30,6 +30,7 @@ import com.intellij.openapi.options.CompositeConfigurable;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.UnnamedConfigurable;
 import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
@@ -218,6 +219,7 @@ public class EditorSmartKeysConfigurable extends CompositeConfigurable<UnnamedCo
     }
   }
 
+  @NotNull
   public String getId() {
     return "editor.preferences.smartKeys";
   }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionSettingsConfigurable.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionSettingsConfigurable.java
index f9ebfb90b722..16023c1b8df5 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionSettingsConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionSettingsConfigurable.java
@@ -23,6 +23,7 @@ import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.ui.DetailsComponent;
 import com.intellij.openapi.util.IconLoader;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
@@ -99,6 +100,7 @@ public class IntentionSettingsConfigurable extends BaseConfigurable implements S
     return myPanel.showOption(this, option);
   }
 
+  @NotNull
   public String getId() {
     return HELP_ID;
   }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplatesConfigurable.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplatesConfigurable.java
index 2d573b2f71e0..8f86915b9100 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplatesConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplatesConfigurable.java
@@ -20,6 +20,7 @@ import com.intellij.codeInsight.CodeInsightBundle;
 import com.intellij.openapi.options.BaseConfigurable;
 import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.util.IconLoader;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -63,6 +64,7 @@ public class LiveTemplatesConfigurable extends BaseConfigurable implements Searc
     return "editing.templates";
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/AllFileTemplatesConfigurable.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/AllFileTemplatesConfigurable.java
index 3bf724a442ed..00e8e9083498 100644
--- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/AllFileTemplatesConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/AllFileTemplatesConfigurable.java
@@ -729,6 +729,7 @@ public class AllFileTemplatesConfigurable implements SearchableConfigurable {
     createTemplate(preferredName, extension, text);
   }
 
+  @NotNull
   public String getId() {
     return "fileTemplates";
   }
diff --git a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserConfigurable.java b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserConfigurable.java
index c978973e2bef..5c1ea5606de7 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserConfigurable.java
@@ -345,6 +345,7 @@ public class ScopeChooserConfigurable extends MasterDetailsComponent implements
     }
   }
 
+  @NotNull
   @NonNls
   public String getId() {
     return getHelpTopic();
diff --git a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeConfigurable.java b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeConfigurable.java
index 7dea8b5685f0..8cadef5cb45b 100644
--- a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeConfigurable.java
@@ -36,6 +36,7 @@ import com.intellij.psi.templateLanguages.TemplateDataLanguagePatterns;
 import com.intellij.ui.ListScrollingUtil;
 import com.intellij.ui.ListUtil;
 import com.intellij.ui.components.JBList;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -634,6 +635,7 @@ public class FileTypeConfigurable extends BaseConfigurable implements Searchable
     }
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java
index 82d13de537ed..f039a0e79af3 100644
--- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java
@@ -56,6 +56,7 @@ import com.intellij.util.containers.HashMap;
 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.JDOMException;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
@@ -245,6 +246,7 @@ public abstract class InspectionToolsConfigurable extends BaseConfigurable imple
     return "preferences.inspections";
   }
 
+  @NotNull
   public String getId() {
     return ID;
   }
diff --git a/platform/lang-impl/src/com/intellij/tools/ToolConfigurable.java b/platform/lang-impl/src/com/intellij/tools/ToolConfigurable.java
index 77d5d3852d8d..fdc19212ac8e 100644
--- a/platform/lang-impl/src/com/intellij/tools/ToolConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/tools/ToolConfigurable.java
@@ -19,6 +19,7 @@ package com.intellij.tools;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.util.IconLoader;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -67,6 +68,7 @@ public class ToolConfigurable implements SearchableConfigurable {
   }
 
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/platform/lang-impl/src/com/intellij/util/ui/tree/LanguagePerFileConfigurable.java b/platform/lang-impl/src/com/intellij/util/ui/tree/LanguagePerFileConfigurable.java
index 9824edbc3e5e..1cee5348b136 100644
--- a/platform/lang-impl/src/com/intellij/util/ui/tree/LanguagePerFileConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/util/ui/tree/LanguagePerFileConfigurable.java
@@ -101,6 +101,7 @@ public abstract class LanguagePerFileConfigurable<T> implements SearchableConfig
     return myTreeView;
   }
 
+  @NotNull
   public String getId() {
     return getDisplayName();
   }
diff --git a/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroConfigurable.java b/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroConfigurable.java
index 46574935594b..f4fa0bd7d49d 100644
--- a/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroConfigurable.java
+++ b/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroConfigurable.java
@@ -23,6 +23,7 @@ import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.project.ex.ProjectEx;
 import com.intellij.openapi.util.IconLoader;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -74,6 +75,7 @@ public class PathMacroConfigurable implements SearchableConfigurable {
     return ICON;
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/platform/platform-impl/src/com/intellij/ide/BrowserSettings.java b/platform/platform-impl/src/com/intellij/ide/BrowserSettings.java
index 5537704983f7..f991bb6a2946 100644
--- a/platform/platform-impl/src/com/intellij/ide/BrowserSettings.java
+++ b/platform/platform-impl/src/com/intellij/ide/BrowserSettings.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.util.IconLoader;
 import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 
@@ -30,6 +31,7 @@ public class BrowserSettings implements Configurable, SearchableConfigurable {
   private static final Icon ICON = IconLoader.getIcon("/general/browsersettings.png");
   private BrowserSettingsPanel mySettingsPanel;
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java b/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java
index e11111b063b8..9edbd1789109 100644
--- a/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java
+++ b/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java
@@ -168,6 +168,7 @@ public class GeneralSettingsConfigurable extends CompositeConfigurable<Searchabl
     }
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/platform/platform-impl/src/com/intellij/ide/passwordSafe/config/PasswordSafeConfigurable.java b/platform/platform-impl/src/com/intellij/ide/passwordSafe/config/PasswordSafeConfigurable.java
index fd2897acdd33..245f3e51afaa 100644
--- a/platform/platform-impl/src/com/intellij/ide/passwordSafe/config/PasswordSafeConfigurable.java
+++ b/platform/platform-impl/src/com/intellij/ide/passwordSafe/config/PasswordSafeConfigurable.java
@@ -97,6 +97,7 @@ public class PasswordSafeConfigurable implements SearchableConfigurable {
   /**
    * {@inheritDoc}
    */
+  @NotNull
   public String getId() {
     return "application.passwordSafe";
   }
diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java
index ed274b4ea6d0..bdad8cd80ef3 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java
@@ -26,6 +26,7 @@ import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.IconLoader;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -191,6 +192,7 @@ public class PluginManagerConfigurable extends BaseConfigurable implements Searc
     return IconLoader.getIcon("/general/pluginManager.png");
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationConfigurable.java b/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationConfigurable.java
index a9124787a986..f323c29639a4 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationConfigurable.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationConfigurable.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.options.BaseConfigurable;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.util.IconLoader;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -65,6 +66,7 @@ public class CustomizationConfigurable extends BaseConfigurable implements Searc
   public void disposeUIResources() {
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/platform/platform-impl/src/com/intellij/notification/impl/NotificationsConfigurable.java b/platform/platform-impl/src/com/intellij/notification/impl/NotificationsConfigurable.java
index e3ec28ef7735..94f944618f5f 100644
--- a/platform/platform-impl/src/com/intellij/notification/impl/NotificationsConfigurable.java
+++ b/platform/platform-impl/src/com/intellij/notification/impl/NotificationsConfigurable.java
@@ -22,6 +22,7 @@ import com.intellij.openapi.options.OptionalConfigurable;
 import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.util.Disposer;
 import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 
@@ -70,6 +71,7 @@ public class NotificationsConfigurable implements Configurable, SearchableConfig
     myComponent = null;
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffOptionsForm.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffOptionsForm.java
index d28122526563..ebf51bcdcae4 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffOptionsForm.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffOptionsForm.java
@@ -25,6 +25,7 @@ import com.intellij.util.config.BooleanProperty;
 import com.intellij.util.config.StringProperty;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -86,6 +87,7 @@ public class DiffOptionsForm implements SearchableConfigurable {
     return "diff";
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapConfigurable.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapConfigurable.java
index b66f29116523..86ab99bc4cf8 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapConfigurable.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapConfigurable.java
@@ -19,6 +19,7 @@ import com.intellij.openapi.keymap.KeyMapBundle;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.util.IconLoader;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 
@@ -46,6 +47,7 @@ public class KeymapConfigurable extends SearchableConfigurable.Parent.Abstract {
     return new Configurable[]{keymap, quickLists};
   }
 
+  @NotNull
   public String getId() {
     return "preferences.keymap.keymap";
   }
diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListsPanel.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListsPanel.java
index 79536bdaaa03..3391e5265194 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListsPanel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListsPanel.java
@@ -40,6 +40,7 @@ import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.ui.components.JBList;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
@@ -305,6 +306,7 @@ public class QuickListsPanel extends JPanel implements SearchableConfigurable, M
     return lists;
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/ProjectConfigurableWrapper.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/ProjectConfigurableWrapper.java
index d23f8805b4e9..1f178741d129 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/ex/ProjectConfigurableWrapper.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/ProjectConfigurableWrapper.java
@@ -22,6 +22,7 @@ import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -87,6 +88,7 @@ public class ProjectConfigurableWrapper implements SearchableConfigurable {
     return myDelegate.getIcon();
   }
 
+  @NotNull
   @NonNls
   public String getId() {
     return myDelegate instanceof SearchableConfigurable ? ((SearchableConfigurable)myDelegate).getId() : "";
diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java
index 9874a4cf0eac..cf2a2aef6cfc 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java
@@ -28,6 +28,7 @@ import com.intellij.ui.ListUtil;
 import com.intellij.ui.components.JBList;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.text.DateFormatUtil;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -221,6 +222,7 @@ public class UpdateSettingsConfigurable extends BaseConfigurable implements Sear
     }
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/PlatformFileEncodingConfigurable.java b/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/PlatformFileEncodingConfigurable.java
index e561c0ddb7b8..021c53c9d04b 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/PlatformFileEncodingConfigurable.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/PlatformFileEncodingConfigurable.java
@@ -7,6 +7,7 @@ import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.CharsetToolkit;
 import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.nio.charset.Charset;
@@ -21,6 +22,7 @@ public class PlatformFileEncodingConfigurable implements SearchableConfigurable
   private static final String SYSTEM_DEFAULT = IdeBundle.message("encoding.name.system.default");
   private PlatformEncodingOptionsPanel myPanel;
 
+  @NotNull
   public String getId() {
     return "GeneralEncodingOptions";
   }
diff --git a/platform/testFramework/src/com/intellij/testFramework/EditorListenerTracker.java b/platform/testFramework/src/com/intellij/testFramework/EditorListenerTracker.java
index 4f8844c88854..2abf32576ef0 100644
--- a/platform/testFramework/src/com/intellij/testFramework/EditorListenerTracker.java
+++ b/platform/testFramework/src/com/intellij/testFramework/EditorListenerTracker.java
@@ -40,7 +40,7 @@ public class EditorListenerTracker {
 
   public void checkListenersLeak() {
     try {
-// listeners may hang on default project
+      // listeners may hang on default project
       if (myDefaultProjectInitialized != ((ProjectManagerImpl)ProjectManager.getInstance()).isDefaultProjectInitialized()) return;
 
       EditorEventMulticasterImpl multicaster = (EditorEventMulticasterImpl)EditorFactory.getInstance().getEventMulticaster();
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictConfigurable.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictConfigurable.java
index 56e1dac04609..23ad4c732b2d 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictConfigurable.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictConfigurable.java
@@ -26,6 +26,7 @@ import com.intellij.ui.components.JBList;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -122,6 +123,7 @@ public class ChangelistConflictConfigurable extends BindableConfigurable impleme
     return "project.propVCSSupport.ChangelistConflict";
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/IgnoredSettingsPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/IgnoredSettingsPanel.java
index cc9c78d97b42..c42d53bfee7f 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/IgnoredSettingsPanel.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/IgnoredSettingsPanel.java
@@ -33,6 +33,7 @@ import com.intellij.ui.SimpleTextAttributes;
 import com.intellij.ui.components.JBList;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
@@ -167,6 +168,7 @@ public class IgnoredSettingsPanel implements SearchableConfigurable {
     return "project.propVCSSupport.Ignored.Files";
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueNavigationConfigurationPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueNavigationConfigurationPanel.java
index ebb2e5288029..2b991b221783 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueNavigationConfigurationPanel.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueNavigationConfigurationPanel.java
@@ -26,6 +26,7 @@ import com.intellij.ui.table.JBTable;
 import com.intellij.util.ui.ColumnInfo;
 import com.intellij.util.ui.ListTableModel;
 import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import javax.swing.event.ListSelectionEvent;
@@ -191,6 +192,7 @@ public class IssueNavigationConfigurationPanel extends JPanel implements Searcha
     return "project.propVCSSupport.Issue.Navigation";
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsBackgroundOperationsConfigurationPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsBackgroundOperationsConfigurationPanel.java
index ff135c05dc0a..1ea15e552f96 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsBackgroundOperationsConfigurationPanel.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsBackgroundOperationsConfigurationPanel.java
@@ -23,6 +23,7 @@ import com.intellij.openapi.vcs.VcsShowOptionsSettingImpl;
 import com.intellij.openapi.vcs.changes.RemoteRevisionsCache;
 import com.intellij.openapi.vcs.changes.committed.CacheSettingsPanel;
 import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -171,6 +172,7 @@ public class VcsBackgroundOperationsConfigurationPanel implements SearchableConf
     return "project.propVCSSupport.Background";
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsGeneralConfigurationPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsGeneralConfigurationPanel.java
index 46e5230c63d1..e17529dc7d63 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsGeneralConfigurationPanel.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsGeneralConfigurationPanel.java
@@ -26,6 +26,7 @@ import com.intellij.openapi.vcs.readOnlyHandler.ReadonlyStatusHandlerImpl;
 import com.intellij.openapi.vfs.ReadonlyStatusHandler;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
@@ -276,6 +277,7 @@ public class VcsGeneralConfigurationPanel implements SearchableConfigurable {
   public void disposeUIResources() {
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java
index 59b4ff570f5e..d23db396e4e3 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java
@@ -28,6 +28,7 @@ import com.intellij.openapi.vcs.changes.conflicts.ChangelistConflictConfigurable
 import com.intellij.openapi.vcs.changes.ui.IgnoredSettingsPanel;
 import com.intellij.openapi.vcs.impl.VcsDescriptor;
 import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.util.ArrayList;
@@ -94,6 +95,7 @@ public class VcsManagerConfigurable extends SearchableConfigurable.Parent.Abstra
     return ICON;
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
@@ -153,6 +155,7 @@ public class VcsManagerConfigurable extends SearchableConfigurable.Parent.Abstra
         return result.toArray(new Configurable[result.size()]);
       }
 
+      @NotNull
       public String getId() {
         return "project.propVCSSupport.vcses";
       }
@@ -209,6 +212,7 @@ public class VcsManagerConfigurable extends SearchableConfigurable.Parent.Abstra
         delegate.disposeUIResources();
       }
 
+      @NotNull
       public String getId() {
         return delegate instanceof SearchableConfigurable ? ((SearchableConfigurable) delegate).getId() : getHelpTopic();
       }
diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/Settings.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/Settings.java
index cb845123b188..b72b6ae63448 100644
--- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/Settings.java
+++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/Settings.java
@@ -24,6 +24,7 @@ import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.wm.ex.WindowManagerEx;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -113,6 +114,7 @@ public class Settings implements SearchableConfigurable {
     mySettingsUI = null;
   }
 
+  @NotNull
   public String getId() {
     return "IntelliLang.Configuration";
   }
diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java
index c8af799cb193..5deaa00d0348 100644
--- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java
+++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java
@@ -27,6 +27,7 @@ import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.project.Project;
 import com.maddyhome.idea.copyright.util.FileTypeUtil;
 import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.util.Arrays;
@@ -40,6 +41,7 @@ public class CopyrightFormattingConfigurable extends SearchableConfigurable.Pare
     myPanel = new TemplateCommentPanel(null, null, null, project);
   }
 
+  @NotNull
   public String getId() {
     return "template.copyright.formatting";
   }
diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProfilesPanel.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProfilesPanel.java
index adea978588f7..79c6ea143e93 100644
--- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProfilesPanel.java
+++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProfilesPanel.java
@@ -286,6 +286,7 @@ public class CopyrightProfilesPanel extends MasterDetailsComponent implements Se
     });
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProjectConfigurable.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProjectConfigurable.java
index 2d5626c824ae..fd50a1afee86 100644
--- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProjectConfigurable.java
+++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProjectConfigurable.java
@@ -16,7 +16,6 @@
 
 package com.maddyhome.idea.copyright.ui;
 
-import com.intellij.openapi.components.ProjectComponent;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
@@ -98,6 +97,7 @@ public class CopyrightProjectConfigurable extends SearchableConfigurable.Parent.
     return true;
   }
 
+  @NotNull
   public String getId() {
     return "copyright";
   }
diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/TemplateCommentPanel.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/TemplateCommentPanel.java
index 338b91f5a7bc..aefc040dac23 100644
--- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/TemplateCommentPanel.java
+++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/TemplateCommentPanel.java
@@ -35,6 +35,7 @@ import com.maddyhome.idea.copyright.pattern.EntityUtil;
 import com.maddyhome.idea.copyright.pattern.VelocityHelper;
 import com.maddyhome.idea.copyright.util.FileTypeUtil;
 import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
@@ -442,6 +443,7 @@ public class TemplateCommentPanel implements SearchableConfigurable {
     }
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic() + "." + fileType.getName();
   }
diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubSettingsConfigurable.java b/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubSettingsConfigurable.java
index aadbf6f1f55c..334b0b6154bd 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubSettingsConfigurable.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubSettingsConfigurable.java
@@ -3,6 +3,7 @@ package org.jetbrains.plugins.github.ui;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.util.IconLoader;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.github.GithubSettings;
 
 import javax.swing.*;
@@ -62,6 +63,7 @@ public class GitHubSettingsConfigurable implements SearchableConfigurable {
     mySettingsPane = null;
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfigurable.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfigurable.java
index 108dfcb2c426..24c5342d5e3d 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfigurable.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfigurable.java
@@ -30,6 +30,7 @@ import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.groovy.GroovyIcons;
 
 import javax.swing.*;
@@ -71,6 +72,7 @@ public class GroovyCompilerConfigurable implements SearchableConfigurable {
   }
 
 
+  @NotNull
   public String getId() {
     return "Groovy compiler";
   }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/filters/GroovyDebuggerSettingsConfigurable.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/filters/GroovyDebuggerSettingsConfigurable.java
index f07ceafe695e..280a38190c4b 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/filters/GroovyDebuggerSettingsConfigurable.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/filters/GroovyDebuggerSettingsConfigurable.java
@@ -18,6 +18,7 @@ package org.jetbrains.plugins.groovy.debugger.filters;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
 import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.groovy.GroovyBundle;
 import org.jetbrains.plugins.groovy.GroovyIcons;
 
@@ -59,6 +60,7 @@ public class GroovyDebuggerSettingsConfigurable implements SearchableConfigurabl
     return "reference.idesettings.debugger.groovy";
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/util/SdkHomeConfigurable.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/util/SdkHomeConfigurable.java
index 02e0f1c66b6d..f5afdaefcacc 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/util/SdkHomeConfigurable.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/util/SdkHomeConfigurable.java
@@ -24,6 +24,7 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
@@ -101,6 +102,7 @@ public abstract class SdkHomeConfigurable implements SearchableConfigurable {
     return null;
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenServicesConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenServicesConfigurable.java
index 1906590c48d4..1d644a0ad1e8 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenServicesConfigurable.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenServicesConfigurable.java
@@ -32,6 +32,7 @@ import com.intellij.util.Processor;
 import com.intellij.util.text.DateFormatUtil;
 import com.intellij.util.ui.AnimatedIcon;
 import com.intellij.util.ui.AsyncProcessIcon;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.idea.maven.model.MavenRepositoryInfo;
 import org.jetbrains.idea.maven.services.MavenServicesManager;
 import org.jetbrains.idea.maven.utils.RepositoryAttachHandler;
@@ -221,6 +222,7 @@ public class MavenServicesConfigurable extends BaseConfigurable implements Searc
     return "reference.settings.project.maven.repository.indices";
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralConfigurable.java
index 366a5d6a7442..02aadaa438d3 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralConfigurable.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralConfigurable.java
@@ -22,6 +22,7 @@ import com.intellij.openapi.util.Pair;
 import com.intellij.util.Function;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.maven.execution.MavenExecutionOptions;
 import org.jetbrains.idea.maven.utils.ComboBoxUtil;
@@ -183,6 +184,7 @@ public abstract class MavenGeneralConfigurable implements SearchableConfigurable
     return "reference.settings.dialog.project.maven";
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenIgnoredFilesConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenIgnoredFilesConfigurable.java
index e75c569dd819..6938e478a9ea 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenIgnoredFilesConfigurable.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenIgnoredFilesConfigurable.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.util.io.FileUtil;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.maven.utils.MavenUIUtil;
 import org.jetbrains.idea.maven.utils.MavenUtil;
@@ -99,6 +100,7 @@ public class MavenIgnoredFilesConfigurable implements SearchableConfigurable {
     return "reference.settings.project.maven.ignored.files";
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingConfigurable.java
index 51deed949bb0..f31a4f0b19f1 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingConfigurable.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingConfigurable.java
@@ -19,6 +19,7 @@ import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -66,6 +67,7 @@ public class MavenImportingConfigurable implements SearchableConfigurable {
     return "reference.settings.project.maven.importing";
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenSettings.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenSettings.java
index 7d43768b2469..d83fabc6efe7 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenSettings.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenSettings.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.IconLoader;
 import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.idea.maven.indices.MavenServicesConfigurable;
 import org.jetbrains.idea.maven.project.*;
 import org.jetbrains.idea.maven.execution.MavenRunnerConfigurable;
@@ -97,6 +98,7 @@ public class MavenSettings implements SearchableConfigurable.Parent {
     return myChildren.toArray(new Configurable[myChildren.size()]);
   }
 
+  @NotNull
   public String getId() {
     return MavenSettings.class.getSimpleName();
   }
diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettingsManager.java b/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettingsManager.java
index 7804f12971f8..aae70db22a6b 100644
--- a/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettingsManager.java
+++ b/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettingsManager.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.spellchecker.util.SpellCheckerBundle;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -51,6 +52,7 @@ public class SpellCheckerSettingsManager implements SearchableConfigurable {
      return "reference.settings.ide.settings.spelling";
    }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskConfigurable.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskConfigurable.java
index 15ea7b0a3d49..342c13c23433 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskConfigurable.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskConfigurable.java
@@ -110,6 +110,7 @@ public class TaskConfigurable extends BindableConfigurable implements Searchable
   public void disposeUIResources() {
   }
 
+  @NotNull
   public String getId() {
     return "tasks";
   }
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java b/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java
index 4a21256dfc9c..c096fa29d5f1 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java
@@ -216,6 +216,7 @@ public final class GuiDesignerConfigurable implements SearchableConfigurable {
     }
   }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/FileAssociationsConfigurable.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/FileAssociationsConfigurable.java
index 81600d469ee5..f05906dfb8ed 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/FileAssociationsConfigurable.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/FileAssociationsConfigurable.java
@@ -119,6 +119,7 @@ public class FileAssociationsConfigurable implements SearchableConfigurable, Non
         }
     }
 
+    @NotNull
     public String getId() {
         return getHelpTopic();
     }
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltConfigImpl.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltConfigImpl.java
index 6e5965c418d6..d3c97a08cff1 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltConfigImpl.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltConfigImpl.java
@@ -150,6 +150,7 @@ class XsltConfigImpl extends XsltConfig implements JDOMExternalizable, Applicati
             myShowLinkedFiles.setSelected(myConfig.SHOW_LINKED_FILES);
         }
 
+        @NotNull
         public String getId() {
           return getHelpTopic();
         }
diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathConfigurable.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathConfigurable.java
index 7e54dacfb109..cb8cfd84f26a 100644
--- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathConfigurable.java
+++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathConfigurable.java
@@ -19,6 +19,7 @@ import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.util.IconLoader;
 import org.intellij.plugins.xpathView.ui.ConfigUI;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -39,6 +40,7 @@ public class XPathConfigurable implements SearchableConfigurable {
         return "xpath.settings";
     }
 
+  @NotNull
   public String getId() {
     return getHelpTopic();
   }
diff --git a/xml/impl/src/com/intellij/javaee/ExternalResourceConfigurable.java b/xml/impl/src/com/intellij/javaee/ExternalResourceConfigurable.java
index 03c4aae00d50..52cc76871e9e 100644
--- a/xml/impl/src/com/intellij/javaee/ExternalResourceConfigurable.java
+++ b/xml/impl/src/com/intellij/javaee/ExternalResourceConfigurable.java
@@ -28,6 +28,7 @@ import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.Table;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.xml.XmlBundle;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -336,6 +337,7 @@ public class ExternalResourceConfigurable extends BaseConfigurable implements Se
     }
   }
 
+  @NotNull
   public String getId() {
     return "preferences.externalResources";
   }