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

ComponentManager uses PluginDescriptor, not IdeaPluginDescriptor

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-08-18 18:32:15 +02:00
parent f5e0dca40c
commit 74cd0d153c
5 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/components/ComponentConfig.java → platform/core-api/src/com/intellij/openapi/components/ComponentConfig.java
+2 -2
View File
@@ -16,7 +16,7 @@
package com.intellij.openapi.components;
import com.intellij.ide.plugins.IdeaPluginDescriptor;
import com.intellij.openapi.extensions.PluginDescriptor;
import com.intellij.util.xmlb.annotations.MapAnnotation;
import com.intellij.util.xmlb.annotations.Property;
import com.intellij.util.xmlb.annotations.Tag;
@@ -46,7 +46,7 @@ public class ComponentConfig {
public Map<String,String> options = new HashMap<String, String>();
@Transient
public IdeaPluginDescriptor pluginDescriptor;
public PluginDescriptor pluginDescriptor;
@Transient
public ClassLoader getClassLoader() {
platform/platform-api/src/com/intellij/openapi/components/ComponentManagerConfig.java → platform/core-api/src/com/intellij/openapi/components/ComponentManagerConfig.java
View File
platform/platform-impl/src/com/intellij/openapi/components/ex/ComponentManagerEx.java
+2 -5
View File
@@ -15,13 +15,10 @@
*/
package com.intellij.openapi.components.ex;
import com.intellij.ide.plugins.IdeaPluginDescriptor;
import com.intellij.notification.Notification;
import com.intellij.openapi.components.ComponentConfig;
import com.intellij.openapi.components.ComponentManager;
import com.intellij.openapi.components.impl.stores.IComponentStore;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
import com.intellij.openapi.extensions.PluginDescriptor;
import java.util.Map;
@@ -40,7 +37,7 @@ public interface ComponentManagerEx extends ComponentManager {
void registerComponent(Class interfaceClass, Class implementationClass, Map options);
void registerComponent(ComponentConfig config);
void registerComponent(ComponentConfig config, IdeaPluginDescriptor pluginDescriptor);
void registerComponent(ComponentConfig config, PluginDescriptor pluginDescriptor);
IComponentStore getComponentStore();
}
platform/platform-impl/src/com/intellij/openapi/components/impl/ComponentManagerConfigurator.java
+4 -4
View File
@@ -15,8 +15,8 @@
*/
package com.intellij.openapi.components.impl;
import com.intellij.ide.plugins.IdeaPluginDescriptor;
import com.intellij.openapi.components.ComponentConfig;
import com.intellij.openapi.extensions.PluginDescriptor;
class ComponentManagerConfigurator {
private final ComponentManagerImpl myComponentManager;
@@ -25,13 +25,13 @@ class ComponentManagerConfigurator {
myComponentManager = componentManager;
}
private void loadConfiguration(final ComponentConfig[] configs, final boolean defaultProject, final IdeaPluginDescriptor descriptor) {
private void loadConfiguration(final ComponentConfig[] configs, final boolean defaultProject, final PluginDescriptor descriptor) {
for (ComponentConfig config : configs) {
loadSingleConfig(defaultProject, config, descriptor);
}
}
private void loadSingleConfig(final boolean defaultProject, final ComponentConfig config, final IdeaPluginDescriptor descriptor) {
private void loadSingleConfig(final boolean defaultProject, final ComponentConfig config, final PluginDescriptor descriptor) {
if (defaultProject && config.skipForDefaultProject) return;
if (!myComponentManager.isComponentSuitable(config.options)) return;
@@ -39,7 +39,7 @@ class ComponentManagerConfigurator {
}
public void loadComponentsConfiguration(final ComponentConfig[] components,
final IdeaPluginDescriptor descriptor,
final PluginDescriptor descriptor,
final boolean defaultProject) {
if (components == null) return;
platform/platform-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java
+3 -3
View File
@@ -16,7 +16,6 @@
package com.intellij.openapi.components.impl;
import com.intellij.diagnostic.PluginException;
import com.intellij.ide.plugins.IdeaPluginDescriptor;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ex.ApplicationManagerEx;
import com.intellij.openapi.application.impl.ApplicationInfoImpl;
@@ -24,6 +23,7 @@ import com.intellij.openapi.components.*;
import com.intellij.openapi.components.ex.ComponentManagerEx;
import com.intellij.openapi.components.impl.stores.IComponentStore;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.extensions.PluginDescriptor;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
@@ -279,7 +279,7 @@ public abstract class ComponentManagerImpl extends UserDataHolderBase implements
}
@SuppressWarnings({"NonPrivateFieldAccessedInSynchronizedContext"})
public synchronized void registerComponent(final ComponentConfig config, final IdeaPluginDescriptor pluginDescriptor) {
public synchronized void registerComponent(final ComponentConfig config, final PluginDescriptor pluginDescriptor) {
if (isHeadless()) {
String headlessImplClass = config.headlessImplementationClass;
if (headlessImplClass != null) {
@@ -390,7 +390,7 @@ public abstract class ComponentManagerImpl extends UserDataHolderBase implements
getComponents();
}
protected void loadComponentsConfiguration(ComponentConfig[] components, @Nullable final IdeaPluginDescriptor descriptor, final boolean defaultProject) {
protected void loadComponentsConfiguration(ComponentConfig[] components, @Nullable final PluginDescriptor descriptor, final boolean defaultProject) {
myConfigurator.loadComponentsConfiguration(components, descriptor, defaultProject);
}