MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

EclipseModuleManagerImpl is a service, so, must be registered as a service

Browse Source
This commit is contained in:
Vladimir Krivosheev
2015-07-22 18:57:29 +02:00
parent 4c6f8353cb
commit b65583d8e4
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/openapi/module/ModuleServiceManager.java
+20 -1
View File
@@ -16,6 +16,9 @@
package com.intellij.openapi.module;
import com.intellij.openapi.application.Application;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -23,12 +26,28 @@ import org.jetbrains.annotations.Nullable;
* @author yole
*/
public class ModuleServiceManager {
private static final Logger LOG = Logger.getInstance(ModuleServiceManager.class);
private ModuleServiceManager() {
}
@Nullable
public static <T> T getService(@NotNull Module module, @NotNull Class<T> serviceClass) {
//noinspection unchecked
return (T)module.getPicoContainer().getComponentInstance(serviceClass.getName());
T instance = (T)module.getPicoContainer().getComponentInstance(serviceClass.getName());
if (instance == null) {
instance = module.getComponent(serviceClass);
if (instance != null) {
Application app = ApplicationManager.getApplication();
String message = serviceClass.getName() + " requested as a service, but it is a component - convert it to a service or change call to module.getComponent()";
if (app.isUnitTestMode()) {
LOG.error(message);
}
else {
LOG.warn(message);
}
}
}
return instance;
}
}
plugins/eclipse/resources/META-INF/plugin.xml
+2 -5
View File
@@ -30,12 +30,9 @@
name="Eclipse XML Profile"
implementationClass="org.jetbrains.idea.eclipse.importer.EclipseCodeStyleSchemeImporter"
schemeClass="com.intellij.psi.codeStyle.CodeStyleScheme"/>
<moduleService serviceImplementation="org.jetbrains.idea.eclipse.config.EclipseModuleManagerImpl"/>
</extensions>
<module-components>
<component>
<implementation-class>org.jetbrains.idea.eclipse.config.EclipseModuleManagerImpl</implementation-class>
</component>
</module-components>
<actions>
<action id="ExportToEclipse" class="org.jetbrains.idea.eclipse.export.ExportEclipseProjectsAction" text="Export to Eclipse...">
<add-to-group group-id="ExportImportGroup" anchor="last"/>