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

Corrected classloader usage.

Browse Source
This commit is contained in:
Alexander Kireyev
2005-03-02 16:58:49 +03:00
parent 11a9b9f171
commit c1e3a91cb7
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/source/com/intellij/openapi/extensions/ExtensionsArea.java
+1
View File
@@ -41,4 +41,5 @@ public interface ExtensionsArea {
String getAreaClass();
void registerExtensionPoint(String extensionPointName, String extensionPointBeanClass, PluginDescriptor descriptor);
}
extensions/source/com/intellij/openapi/extensions/impl/ExtensionComponentAdapter.java
+8 -1
View File
@@ -9,6 +9,9 @@ import com.intellij.openapi.extensions.PluginAware;
import com.intellij.openapi.extensions.ReaderConfigurator;
import com.intellij.openapi.extensions.PluginDescriptor;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.XppDriver;
import com.thoughtworks.xstream.core.DefaultClassMapper;
import com.thoughtworks.xstream.core.util.CompositeClassLoader;
import org.jdom.Element;
import org.picocontainer.PicoContainer;
import org.picocontainer.PicoInitializationException;
@@ -38,7 +41,11 @@ public class ExtensionComponentAdapter extends ConstructorInjectionComponentAdap
if (myComponentInstance == null) {
if (!Element.class.equals(getComponentImplementation())) {
XStream xStream = new XStream(new PropertyReflectionProvider());
final CompositeClassLoader classLoader = new CompositeClassLoader();
if (myPluginDescriptor.getPluginClassLoader() != null) {
classLoader.add(myPluginDescriptor.getPluginClassLoader());
}
XStream xStream = new XStream(new PropertyReflectionProvider(), new DefaultClassMapper(classLoader), new XppDriver());
xStream.registerConverter(new ElementConverter());
Object componentInstance = super.getComponentInstance(container);
if (componentInstance instanceof ReaderConfigurator) {
extensions/source/com/intellij/openapi/extensions/impl/ExtensionsAreaImpl.java
+1 -1
View File
@@ -88,7 +88,7 @@ public class ExtensionsAreaImpl implements ExtensionsArea {
if (className == null) {
throw new RuntimeException("No class specified for extension point: " + epName);
}
registerExtensionPoint(epName, className);
registerExtensionPoint(epName, className, pluginDescriptor);
}
public void registerExtension(final String pluginName, final Element extensionElement) {