cleanup, addScheme method to avoid bool flag using (in most cases this flag should be false, not true, because it is not scheme manager responsibility to resolve name conflict — but for now we continue to use "true")

platform/core-api/src/com/intellij/openapi/options/SchemesManager.java

@@ -31,6 +31,10 @@ public abstract class SchemesManager<T extends Scheme, E extends ExternalizableS
 
   public abstract void addNewScheme(@NotNull T scheme, boolean replaceExisting);
 
+  public void addScheme(@NotNull T scheme) {
+    addNewScheme(scheme, true);
+  }
+
   /**
    * Consider to use {@link #setSchemes}
    */

platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java

@@ -355,7 +355,7 @@ public class TemplateSettings implements PersistentStateComponent<TemplateSettin
     TemplateGroup group = mySchemesManager.findSchemeByName(groupName);
     if (group == null) {
       group = new TemplateGroup(groupName);
-      mySchemesManager.addNewScheme(group, true);
+      mySchemesManager.addScheme(group);
     }
     group.addElement(templateImpl);
   }

platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionProfileManagerImpl.java

@@ -229,7 +229,7 @@ public class InspectionProfileManagerImpl extends InspectionProfileManager imple
 
   @Override
   public void updateProfile(@NotNull Profile profile) {
-    mySchemesManager.addNewScheme(profile, true);
+    mySchemesManager.addScheme(profile);
     updateProfileImpl(profile);
   }
 
@@ -323,7 +323,7 @@ public class InspectionProfileManagerImpl extends InspectionProfileManager imple
 
   @Override
   public void addProfile(@NotNull final Profile profile) {
-    mySchemesManager.addNewScheme(profile, true);
+    mySchemesManager.addScheme(profile);
   }
 
   @Override

platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleSchemesImpl.java

@@ -153,6 +153,6 @@ public abstract class CodeStyleSchemesImpl extends CodeStyleSchemes {
 
   @Override
   public void addScheme(@NotNull CodeStyleScheme scheme) {
-    mySchemesManager.addNewScheme(scheme, true);
+    mySchemesManager.addScheme(scheme);
   }
 }

platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java

@@ -196,7 +196,7 @@ public class EditorColorsManagerImpl extends EditorColorsManager implements Pers
   @Override
   public void addColorsScheme(@NotNull EditorColorsScheme scheme) {
     if (!isDefaultScheme(scheme) && !StringUtil.isEmpty(scheme.getName())) {
-      mySchemesManager.addNewScheme(scheme, true);
+      mySchemesManager.addScheme(scheme);
     }
   }
 
@@ -211,7 +211,7 @@ public class EditorColorsManagerImpl extends EditorColorsManager implements Pers
 
   private void addDefaultSchemes() {
     for (DefaultColorsScheme defaultScheme : myDefaultColorSchemesManager.getAllSchemes()) {
-      mySchemesManager.addNewScheme(defaultScheme, true);
+      mySchemesManager.addScheme(defaultScheme);
     }
   }
 

platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java

@@ -1109,7 +1109,7 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements Persistent
    */
   private void registerFileTypeWithoutNotification(@NotNull FileType fileType, @NotNull List<FileNameMatcher> matchers, boolean addScheme) {
     if (addScheme) {
-      mySchemesManager.addNewScheme(fileType, true);
+      mySchemesManager.addScheme(fileType);
     }
     for (FileNameMatcher matcher : matchers) {
       myPatternsTable.addAssociation(matcher, fileType);
@@ -1261,7 +1261,7 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements Persistent
       }
     }
     for (FileType fileType : fileTypes) {
-      mySchemesManager.addNewScheme(fileType, true);
+      mySchemesManager.addScheme(fileType);
       if (fileType instanceof AbstractFileType) {
         ((AbstractFileType)fileType).initSupport();
       }

platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java

@@ -54,7 +54,7 @@ public class KeymapManagerImpl extends KeymapManagerEx implements PersistentStat
 
   public static boolean ourKeymapManagerInitialized = false;
 
-  KeymapManagerImpl(DefaultKeymap defaultKeymap, SchemesManagerFactory factory) {
+  KeymapManagerImpl(@NotNull DefaultKeymap defaultKeymap, @NotNull SchemesManagerFactory factory) {
     BaseSchemeProcessor<KeymapImpl> schemeProcessor = new BaseSchemeProcessor<KeymapImpl>() {
       @NotNull
       @Override
@@ -77,12 +77,11 @@ public class KeymapManagerImpl extends KeymapManagerEx implements PersistentStat
     };
     mySchemesManager = factory.createSchemesManager(KEYMAPS_DIR_PATH, schemeProcessor, RoamingType.PER_USER);
 
-    Keymap[] keymaps = defaultKeymap.getKeymaps();
     String systemDefaultKeymap = WelcomeWizardUtil.getWizardMacKeymap() != null
                                  ? WelcomeWizardUtil.getWizardMacKeymap()
                                  : defaultKeymap.getDefaultKeymapName();
-    for (Keymap keymap : keymaps) {
-      mySchemesManager.addNewScheme(keymap, true);
+    for (Keymap keymap : defaultKeymap.getKeymaps()) {
+      mySchemesManager.addScheme(keymap);
       if (keymap.getName().equals(systemDefaultKeymap)) {
         setActiveKeymap(keymap);
       }

platform/platform-impl/src/com/intellij/openapi/options/SchemesManagerImpl.java

@@ -404,7 +404,7 @@ public final class SchemesManagerImpl<T extends Scheme, E extends Externalizable
     }
 
     //noinspection unchecked
-    addNewScheme((T)scheme, true);
+    addScheme((T)scheme);
     ExternalInfo info = getExternalInfo(scheme);
     info.setPreviouslySavedName(scheme.getName());
     info.setCurrentFileName(fileNameWithoutExtension);