From 4cddcc91a37845bd2e7a1de56f410e9ab2d38b06 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 2 Dec 2016 11:45:48 +0100
Subject: [PATCH] =?UTF-8?q?IDEA-164420=20Backward-incompatible=20changes?=
 =?UTF-8?q?=20in=20plugin=20SDK=20in=202016.3=20=E2=80=94=20restore=20Sche?=
 =?UTF-8?q?mesManager=20and=20KeymapManagerEx.getSchemesManager?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration-store-impl/src/SchemeManagerImpl.kt  |  2 +-
 .../intellij/openapi/keymap/ex/KeymapManagerEx.java    | 10 ++++++++++
 .../src/com/intellij/openapi/options/scheme.kt         |  3 +++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/platform/configuration-store-impl/src/SchemeManagerImpl.kt b/platform/configuration-store-impl/src/SchemeManagerImpl.kt
index 449d0d723ac5..b8029348d197 100644
--- a/platform/configuration-store-impl/src/SchemeManagerImpl.kt
+++ b/platform/configuration-store-impl/src/SchemeManagerImpl.kt
@@ -63,7 +63,7 @@ class SchemeManagerImpl<T : Scheme, MUTABLE_SCHEME : T>(val fileSpec: String,
                                                         val roamingType: RoamingType = RoamingType.DEFAULT,
                                                         val presentableName: String? = null,
                                                         private val isUseOldFileNameSanitize: Boolean = false,
-                                                        private val messageBus: MessageBus? = null) : SchemeManager<T>(), SafeWriteRequestor {
+                                                        private val messageBus: MessageBus? = null) : SchemesManager<T>(), SafeWriteRequestor {
   private val isLoadingSchemes = AtomicBoolean()
 
   private val schemesRef = AtomicReference(ContainerUtil.createLockFreeCopyOnWriteList<T>() as ConcurrentList<T>)
diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/ex/KeymapManagerEx.java b/platform/platform-impl/src/com/intellij/openapi/keymap/ex/KeymapManagerEx.java
index dafa3048c562..977d33a65f44 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/ex/KeymapManagerEx.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/ex/KeymapManagerEx.java
@@ -19,6 +19,7 @@ import com.intellij.openapi.keymap.Keymap;
 import com.intellij.openapi.keymap.KeymapManager;
 import com.intellij.openapi.keymap.KeymapManagerListener;
 import com.intellij.openapi.options.SchemeManager;
+import com.intellij.openapi.options.SchemesManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -52,6 +53,15 @@ public abstract class KeymapManagerEx extends KeymapManager {
 
   public abstract SchemeManager<Keymap> getSchemeManager();
 
+  /**
+   * @deprecated Please use {@link #getSchemeManager()}
+   */
+  @SuppressWarnings("deprecation")
+  @Deprecated
+  public final SchemesManager<Keymap> getSchemesManager() {
+    return (SchemesManager<Keymap>)getSchemeManager();
+  }
+
   public abstract void addWeakListener(@NotNull KeymapManagerListener listener);
 
   public abstract void removeWeakListener(@NotNull KeymapManagerListener listenerToRemove);
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/options/scheme.kt b/platform/projectModel-impl/src/com/intellij/openapi/options/scheme.kt
index a355103708ff..775a7f5c00a3 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/options/scheme.kt
+++ b/platform/projectModel-impl/src/com/intellij/openapi/options/scheme.kt
@@ -21,6 +21,9 @@ import com.intellij.openapi.components.ServiceManager
 import com.intellij.openapi.project.Project
 import org.jdom.Parent
 
+@Deprecated("Please use SchemeManager")
+abstract class SchemesManager<T : Scheme> : SchemeManager<T>()
+
 interface ExternalizableScheme : Scheme {
   fun setName(value: String)
 }