From cc85f03cb28317ac53a379d757e7be5bb60b96fe Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Mon, 22 Jun 2015 15:17:52 +0200
Subject: [PATCH] =?UTF-8?q?cleanup,=20addScheme=20method=20to=20avoid=20bo?=
 =?UTF-8?q?ol=20flag=20using=20(in=20most=20cases=20this=20flag=20should?=
 =?UTF-8?q?=20be=20false,=20not=20true,=20because=20it=20is=20not=20scheme?=
 =?UTF-8?q?=20manager=20responsibility=20to=20resolve=20name=20conflict=20?=
 =?UTF-8?q?=E2=80=94=20but=20for=20now=20we=20continue=20to=20use=20"true"?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/intellij/openapi/options/SchemesManager.java   | 4 ++++
 .../codeInsight/template/impl/TemplateSettings.java        | 2 +-
 .../codeInspection/ex/InspectionProfileManagerImpl.java    | 4 ++--
 .../psi/impl/source/codeStyle/CodeStyleSchemesImpl.java    | 2 +-
 .../editor/colors/impl/EditorColorsManagerImpl.java        | 4 ++--
 .../openapi/fileTypes/impl/FileTypeManagerImpl.java        | 4 ++--
 .../intellij/openapi/keymap/impl/KeymapManagerImpl.java    | 7 +++----
 .../com/intellij/openapi/options/SchemesManagerImpl.java   | 2 +-
 8 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/platform/core-api/src/com/intellij/openapi/options/SchemesManager.java b/platform/core-api/src/com/intellij/openapi/options/SchemesManager.java
index a4d033eea370..88f6e37ce838 100644
--- a/platform/core-api/src/com/intellij/openapi/options/SchemesManager.java
+++ b/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}
    */
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java
index c49b12d624d2..f4ab401480c8 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java
+++ b/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);
   }
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionProfileManagerImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionProfileManagerImpl.java
index eb8225f3044a..2c37ad105a89 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionProfileManagerImpl.java
+++ b/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
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleSchemesImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleSchemesImpl.java
index c21bdf2d2ed0..2aba8a53efd6 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleSchemesImpl.java
+++ b/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);
   }
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java
index 9b0a5ffb734d..a84a594b224f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java
+++ b/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);
     }
   }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java
index 43f718741c0d..8e605292a0ea 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java
+++ b/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();
       }
diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java
index 4d30edd1c633..b4181d614e72 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java
+++ b/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);
       }
diff --git a/platform/platform-impl/src/com/intellij/openapi/options/SchemesManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/options/SchemesManagerImpl.java
index b23199bb9791..fb74c8ad3297 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/SchemesManagerImpl.java
+++ b/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);