diff --git a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java b/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java index 5f3e20cfa075..5b9618b6fa40 100644 --- a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java +++ b/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java @@ -31,7 +31,6 @@ import com.intellij.openapi.editor.*; import com.intellij.openapi.editor.actionSystem.EditorActionHandler; import com.intellij.openapi.editor.actionSystem.EditorActionManager; import com.intellij.openapi.editor.actionSystem.TypedAction; -import com.intellij.openapi.editor.ex.DocumentEx; import com.intellij.openapi.editor.impl.DocumentImpl; import com.intellij.openapi.editor.impl.EditorImpl; import com.intellij.openapi.fileEditor.FileEditorManager; @@ -708,22 +707,4 @@ public abstract class CodeInsightTestCase extends PsiTestCase { assertNotNull("Package " + name + " not found", aPackage); return aPackage; } - protected void registerResourceTemporarily(final String url, final String location) { - ApplicationManager.getApplication().runWriteAction(new Runnable() { - public void run() { - ExternalResourceManager.getInstance().addResource(url, location); - } - }); - - Disposer.register(getTestRootDisposable(), new Disposable() { - @Override - public void dispose() { - ApplicationManager.getApplication().runWriteAction(new Runnable() { - public void run() { - ExternalResourceManager.getInstance().removeResource(url); - } - }); - } - }); - } } diff --git a/xml/impl/src/com/intellij/javaee/ExternalResourceManagerImpl.java b/xml/impl/src/com/intellij/javaee/ExternalResourceManagerImpl.java index 95447fb12515..1c5ebec66047 100644 --- a/xml/impl/src/com/intellij/javaee/ExternalResourceManagerImpl.java +++ b/xml/impl/src/com/intellij/javaee/ExternalResourceManagerImpl.java @@ -17,6 +17,7 @@ package com.intellij.javaee; import com.intellij.application.options.PathMacrosImpl; import com.intellij.application.options.ReplacePathToMacroMap; +import com.intellij.openapi.Disposable; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.ExpandMacroToPathMap; import com.intellij.openapi.components.ServiceManager; @@ -428,6 +429,25 @@ public class ExternalResourceManagerImpl extends ExternalResourceManagerEx imple fireExternalResourceChanged(); } + public static void registerResourceTemporarily(final String url, final String location, Disposable disposable) { + ApplicationManager.getApplication().runWriteAction(new Runnable() { + public void run() { + getInstance().addResource(url, location); + } + }); + + Disposer.register(disposable, new Disposable() { + @Override + public void dispose() { + ApplicationManager.getApplication().runWriteAction(new Runnable() { + public void run() { + getInstance().removeResource(url); + } + }); + } + }); + } + static class Resource { String file; ClassLoader classLoader;