notnull

2026-09-27 10:03:11 +07:00 · 2011-01-19 12:41:25 +03:00
parent 0882f6165f
commit 10a56b8f74
75 changed files with 137 additions and 3 deletions
@@ -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";
@@ -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();
  }
@@ -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();
      }
@@ -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";
  }
@@ -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();
  }
@@ -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();
  }
@@ -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();
  }
@@ -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();
  }
@@ -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();
  }
@@ -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();
  }
@@ -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";
@@ -340,6 +340,7 @@ public class ArtifactsStructureConfigurable extends BaseStructureConfigurable {
    return false;
  }

+  @NotNull
  public String getId() {
    return "project.artifacts";
  }
@@ -273,6 +273,7 @@ public class FacetStructureConfigurable extends BaseStructureConfigurable {
    return "reference.settingsdialog.project.structure.facet";
  }

+  @NotNull
  public String getId() {
    return "project.facets";
  }
@@ -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";
@@ -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";
@@ -530,6 +530,7 @@ public class ModuleStructureConfigurable extends BaseStructureConfigurable imple
    return null;
  }

+  @NotNull
  @NonNls
  public String getId() {
    return "project.structure";
@@ -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";
@@ -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";
  }
@@ -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();
    }
@@ -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();
    }
@@ -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";
  }
@@ -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";
  }
@@ -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";
  }
@@ -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;
  }
@@ -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";
    }
@@ -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";
  }
@@ -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;
  }
@@ -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();
  }
@@ -729,6 +729,7 @@ public class AllFileTemplatesConfigurable implements SearchableConfigurable {
    createTemplate(preferredName, extension, text);
  }

+  @NotNull
  public String getId() {
    return "fileTemplates";
  }
@@ -345,6 +345,7 @@ public class ScopeChooserConfigurable extends MasterDetailsComponent implements
    }
  }

+  @NotNull
  @NonNls
  public String getId() {
    return getHelpTopic();
@@ -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();
  }
@@ -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;
  }
@@ -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();
  }
@@ -101,6 +101,7 @@ public abstract class LanguagePerFileConfigurable<T> implements SearchableConfig
    return myTreeView;
  }

+  @NotNull
  public String getId() {
    return getDisplayName();
  }
@@ -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();
  }
@@ -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();
  }
@@ -168,6 +168,7 @@ public class GeneralSettingsConfigurable extends CompositeConfigurable<Searchabl
    }
  }

+  @NotNull
  public String getId() {
    return getHelpTopic();
  }
@@ -97,6 +97,7 @@ public class PasswordSafeConfigurable implements SearchableConfigurable {
  /**
   * {@inheritDoc}
   */
+  @NotNull
  public String getId() {
    return "application.passwordSafe";
  }
@@ -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();
  }
@@ -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();
  }
@@ -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();
  }
@@ -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();
  }
@@ -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";
  }
@@ -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();
  }
@@ -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() : "";
@@ -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();
  }
@@ -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";
  }
@@ -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();
@@ -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();
  }
@@ -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();
  }
@@ -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();
  }
@@ -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();
  }
@@ -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();
  }
@@ -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();
      }
@@ -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";
  }
@@ -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";
  }
@@ -286,6 +286,7 @@ public class CopyrightProfilesPanel extends MasterDetailsComponent implements Se
    });
  }

+  @NotNull
  public String getId() {
    return getHelpTopic();
  }
@@ -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";
  }
@@ -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();
  }
@@ -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();
  }
@@ -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";
  }
@@ -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();
  }
@@ -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();
  }
@@ -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();
  }
@@ -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();
  }
@@ -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();
  }
@@ -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();
  }
@@ -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();
  }
@@ -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();
  }
@@ -110,6 +110,7 @@ public class TaskConfigurable extends BindableConfigurable implements Searchable
  public void disposeUIResources() {
  }

+  @NotNull
  public String getId() {
    return "tasks";
  }
@@ -216,6 +216,7 @@ public final class GuiDesignerConfigurable implements SearchableConfigurable {
    }
  }

+  @NotNull
  public String getId() {
    return getHelpTopic();
  }
@@ -119,6 +119,7 @@ public class FileAssociationsConfigurable implements SearchableConfigurable, Non
        }
    }

+    @NotNull
    public String getId() {
        return getHelpTopic();
    }
@@ -150,6 +150,7 @@ class XsltConfigImpl extends XsltConfig implements JDOMExternalizable, Applicati
            myShowLinkedFiles.setSelected(myConfig.SHOW_LINKED_FILES);
        }

+        @NotNull
        public String getId() {
          return getHelpTopic();
        }
@@ -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();
  }
@@ -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";
  }