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

continue: avoid to register XDebugSessionTab as disposable parent — to avoid memory leaks (Disposer holds instance of XDebugSession)

Browse Source 
lazy init LogFilesManager (not required for all xdebug session tabs)
This commit is contained in:
Vladimir Krivosheev
2014-09-04 20:50:00 +02:00
parent ff7173742b
commit 2ff1570268
19 changed files with 231 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java
+5 -4
View File
@@ -97,11 +97,12 @@ public class DefaultJavaProgramRunner extends JavaPatchableProgramRunner {
onProcessStarted(env.getRunnerSettings(), executionResult);
final RunContentBuilder contentBuilder = new RunContentBuilder(executionResult, env);
Disposer.register(env.getProject(), contentBuilder);
if (shouldAddDefaultActions) {
addDefaultActions(contentBuilder);
}
return contentBuilder.showRunContent(env.getContentToReuse());
RunContentDescriptor contentDescriptor = contentBuilder.showRunContent(env.getContentToReuse());
Disposer.register(env.getProject(), contentDescriptor);
return contentDescriptor;
}
@Deprecated
@@ -116,7 +117,7 @@ public class DefaultJavaProgramRunner extends JavaPatchableProgramRunner {
final ExecutionResult executionResult = contentBuilder.getExecutionResult();
final ExecutionConsole executionConsole = executionResult.getExecutionConsole();
final JComponent consoleComponent = executionConsole != null ? executionConsole.getComponent() : null;
final ControlBreakAction controlBreakAction = new ControlBreakAction(contentBuilder.getProcessHandler());
final ControlBreakAction controlBreakAction = new ControlBreakAction(executionResult.getProcessHandler());
if (consoleComponent != null) {
controlBreakAction.registerCustomShortcutSet(controlBreakAction.getShortcutSet(), consoleComponent);
final ProcessHandler processHandler = executionResult.getProcessHandler();
@@ -130,7 +131,7 @@ public class DefaultJavaProgramRunner extends JavaPatchableProgramRunner {
});
}
contentBuilder.addAction(controlBreakAction);
contentBuilder.addAction(new SoftExitAction(contentBuilder.getProcessHandler()));
contentBuilder.addAction(new SoftExitAction(executionResult.getProcessHandler()));
}