CustomActionsSchema converted to service

platform/platform-impl/src/com/intellij/ide/ui/customization/CustomActionsSchema.java

@@ -20,9 +20,9 @@ import com.intellij.openapi.actionSystem.ActionGroup;
 import com.intellij.openapi.actionSystem.ActionManager;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.IdeActions;
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.PathManager;
-import com.intellij.openapi.components.ExportableApplicationComponent;
+import com.intellij.openapi.components.ExportableComponent;
+import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.keymap.impl.ui.ActionsTreeUtil;
 import com.intellij.openapi.keymap.impl.ui.Group;
@@ -48,7 +48,8 @@ import java.util.List;
  * User: anna
  * Date: Jan 20, 2005
  */
-public class CustomActionsSchema implements ExportableApplicationComponent, NamedJDOMExternalizable {
+public class CustomActionsSchema implements ExportableComponent, NamedJDOMExternalizable {
+
   @NonNls private static final String ACTIONS_SCHEMA = "custom_actions_schema";
   @NonNls private static final String ACTIVE = "active";
   @NonNls private static final String ELEMENT_ACTION = "action";
@@ -79,7 +80,7 @@ public class CustomActionsSchema implements ExportableApplicationComponent, Name
   private static final Logger LOG = Logger.getInstance("#" + CustomActionsSchema.class.getName());
 
   public static CustomActionsSchema getInstance() {
-    return ApplicationManager.getApplication().getComponent(CustomActionsSchema.class);
+    return ServiceManager.getService(CustomActionsSchema.class);
   }
 
   public void addAction(ActionUrl url) {
@@ -338,17 +339,6 @@ public void removeIconCustomization(String actionId) {
     return IdeBundle.message("title.custom.actions.schemas");
   }
 
-  @NotNull
-  public String getComponentName() {
-    return "com.intellij.ide.ui.customization.CustomizableActionsSchemas";
-  }
-
-  public void initComponent() {
-  }
-
-  public void disposeComponent() {
-  }
-
   public String getExternalFileName() {
     return "customization";
   }

platform/platform-resources/src/META-INF/PlatformExtensions.xml

@@ -20,6 +20,8 @@
   <applicationService serviceInterface="com.intellij.openapi.progress.ProgressManager"
                       serviceImplementation="com.intellij.openapi.progress.impl.ProgressManagerImpl"/>
 
+  <applicationService serviceImplementation="com.intellij.ide.ui.customization.CustomActionsSchema"/>
+
   <undoProvider implementation="com.intellij.openapi.command.impl.FileUndoProvider"/>
   <projectUndoProvider implementation="com.intellij.openapi.command.impl.FileUndoProvider"/>
 

platform/platform-resources/src/componentSets/Platform.xml

@@ -75,9 +75,6 @@
     <component>
       <implementation-class>com.intellij.ide.TipOfTheDayManager</implementation-class>
     </component>
-    <component>
-      <implementation-class>com.intellij.ide.ui.customization.CustomActionsSchema</implementation-class>
-    </component>
     <component>
       <interface-class>com.intellij.ide.ui.LafManager</interface-class>
       <implementation-class>com.intellij.ide.ui.LafManagerImpl</implementation-class>