IDEA-164420 Backward-incompatible changes in plugin SDK in 2016.3 — restore SchemesManager and KeymapManagerEx.getSchemesManager

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>)

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);

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)
 }