From 82b2e7833278b2f558f8a856e8f5c54bc9077aab Mon Sep 17 00:00:00 2001
From: Alexander Zolotov <goldifit@gmail.com>
Date: Thu, 10 May 2018 14:42:15 +0300
Subject: [PATCH] Reimplement component as a service

---
 .../xdebugger/memory/component/MemoryViewManager.java  |  7 +++----
 resources/src/componentSets/Debugger.xml               | 10 ++++------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/memory/component/MemoryViewManager.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/memory/component/MemoryViewManager.java
index aafe4fcd4c08..a8b96aa9cf7c 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/memory/component/MemoryViewManager.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/memory/component/MemoryViewManager.java
@@ -2,9 +2,8 @@
 package com.intellij.xdebugger.memory.component;
 
 import com.intellij.openapi.Disposable;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.components.ApplicationComponent;
 import com.intellij.openapi.components.PersistentStateComponent;
+import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import com.intellij.util.EventDispatcher;
@@ -12,7 +11,7 @@ import com.intellij.xdebugger.memory.event.MemoryViewManagerListener;
 import org.jetbrains.annotations.NotNull;
 
 @State(name = "MemoryViewSettings", storages = @Storage("memory.view.xml"))
-public class MemoryViewManager implements ApplicationComponent, PersistentStateComponent<MemoryViewManagerState> {
+public class MemoryViewManager implements PersistentStateComponent<MemoryViewManagerState> {
   public static final String MEMORY_VIEW_CONTENT = "MemoryView";
 
   private final EventDispatcher<MemoryViewManagerListener> myDispatcher =
@@ -20,7 +19,7 @@ public class MemoryViewManager implements ApplicationComponent, PersistentStateC
   private MemoryViewManagerState myState = new MemoryViewManagerState();
 
   public static MemoryViewManager getInstance() {
-    return ApplicationManager.getApplication().getComponent(MemoryViewManager.class);
+    return ServiceManager.getService(MemoryViewManager.class);
   }
 
   @NotNull
diff --git a/resources/src/componentSets/Debugger.xml b/resources/src/componentSets/Debugger.xml
index fd19ca8fc1cb..f7273569da6d 100644
--- a/resources/src/componentSets/Debugger.xml
+++ b/resources/src/componentSets/Debugger.xml
@@ -1,10 +1,4 @@
 <idea-plugin>
-  <application-components>
-    <component>
-      <implementation-class>com.intellij.xdebugger.memory.component.MemoryViewManager</implementation-class>
-    </component>
-  </application-components>
-
   <project-components>
     <component>
       <interface-class>com.intellij.debugger.ui.DebuggerPanelsManager</interface-class>
@@ -31,6 +25,10 @@
     </component>
   </project-components>
 
+  <extensions defaultExtensionNs="com.intellij">
+    <applicationService serviceImplementation="com.intellij.xdebugger.memory.component.MemoryViewManager"/>
+  </extensions>
+
   <!--
   <actions>
     <group id="CommonViews">