From bdb9c397840f0b7c134c7a471c656a20f273f364 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Thu, 16 Jul 2015 15:36:20 +0200 Subject: [PATCH] =?UTF-8?q?cleanup=20=E2=80=94=20default=20impl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/impl/stores/ApplicationStoreImpl.java | 6 ------ .../testSrc/ApplicationStoreTest.kt | 4 ---- .../openapi/components/impl/stores/ComponentStoreImpl.java | 4 +++- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/platform/configuration-store-impl/src/com/intellij/openapi/components/impl/stores/ApplicationStoreImpl.java b/platform/configuration-store-impl/src/com/intellij/openapi/components/impl/stores/ApplicationStoreImpl.java index 55962c918348..8537e7732127 100644 --- a/platform/configuration-store-impl/src/com/intellij/openapi/components/impl/stores/ApplicationStoreImpl.java +++ b/platform/configuration-store-impl/src/com/intellij/openapi/components/impl/stores/ApplicationStoreImpl.java @@ -108,10 +108,4 @@ public class ApplicationStoreImpl extends ComponentStoreImpl { public StateStorageManager getStateStorageManager() { return myStateStorageManager; } - - @Nullable - @Override - protected PathMacroManager getPathMacroManagerForDefaults() { - return null; - } } diff --git a/platform/configuration-store-impl/testSrc/ApplicationStoreTest.kt b/platform/configuration-store-impl/testSrc/ApplicationStoreTest.kt index 77748f5ecd95..92373f89fb91 100644 --- a/platform/configuration-store-impl/testSrc/ApplicationStoreTest.kt +++ b/platform/configuration-store-impl/testSrc/ApplicationStoreTest.kt @@ -186,10 +186,6 @@ public class ApplicationStoreTest : LightPlatformTestCase() { override fun dispose() { } - override fun getPathMacroManagerForDefaults(): PathMacroManager? { - return null - } - override fun getMessageBus(): MessageBus { return ApplicationManager.getApplication().getMessageBus() } diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ComponentStoreImpl.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ComponentStoreImpl.java index 360d3cded761..faf27e90cd38 100644 --- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ComponentStoreImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ComponentStoreImpl.java @@ -335,7 +335,9 @@ public abstract class ComponentStoreImpl implements IComponentStore { } @Nullable - protected abstract PathMacroManager getPathMacroManagerForDefaults(); + protected PathMacroManager getPathMacroManagerForDefaults() { + return null; + } @Nullable protected T getDefaultState(@NotNull Object component, @NotNull String componentName, @NotNull final Class stateClass) {