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

fix tests — dispose run content descriptor on project dispose

Browse Source
This commit is contained in:
Vladimir Krivosheev
2014-09-05 10:31:41 +02:00
parent 0e24b7c6fe
commit 9debbd72d1
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java
+1 -4
View File
@@ -34,7 +34,6 @@ import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Disposer;
import com.intellij.unscramble.AnalyzeStacktraceUtil;
import com.intellij.unscramble.ThreadDumpConsoleFactory;
import com.intellij.unscramble.ThreadDumpParser;
@@ -100,9 +99,7 @@ public class DefaultJavaProgramRunner extends JavaPatchableProgramRunner {
if (shouldAddDefaultActions) {
addDefaultActions(contentBuilder);
}
RunContentDescriptor contentDescriptor = contentBuilder.showRunContent(env.getContentToReuse());
Disposer.register(env.getProject(), contentDescriptor);
return contentDescriptor;
return contentBuilder.showRunContent(env.getContentToReuse());
}
@Deprecated
platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java
+1
View File
@@ -222,6 +222,7 @@ public class RunContentBuilder extends RunTab {
public RunContentDescriptor showRunContent(@Nullable RunContentDescriptor reuseContent) {
RunContentDescriptor descriptor = createDescriptor();
Disposer.register(descriptor, this);
Disposer.register(myProject, myRunContentDescriptor);
myRunContentDescriptor = descriptor;
RunContentManagerImpl.copyContentAndBehavior(descriptor, reuseContent);
return descriptor;
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java
+1
View File
@@ -133,6 +133,7 @@ public class XDebugSessionTab extends DebuggerSessionTabBase {
myConsole = session.getConsoleView();
myRunContentDescriptor = new RunContentDescriptor(myConsole, session.getDebugProcess().getProcessHandler(), myUi.getComponent(), session.getSessionName(), icon);
Disposer.register(myRunContentDescriptor, this);
Disposer.register(myProject, myRunContentDescriptor);
}
@Nullable