From 6f3aad31edae6298fe3f42ab4270d94660d8b24c Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Fri, 24 Apr 2015 12:33:56 +0200 Subject: [PATCH] cleanup --- .../debugger/impl/GenericDebuggerRunner.java | 13 +-- .../debugger/ui/DebuggerPanelsManager.java | 21 ----- .../intellij/execution/ExecutionManager.java | 24 +---- .../intellij/execution/RunProfileStarter.java | 20 +--- .../configurations/MockCommandLineState.java | 38 -------- .../runners/ExecutionEnvironment.java | 45 +-------- .../runners/ExecutionEnvironmentBuilder.java | 93 +------------------ .../execution/ui/RunContentDescriptor.java | 22 +---- .../execution/impl/ExecutionManagerImpl.java | 23 +---- .../execution/runners/RunContentBuilder.java | 16 +--- .../actions/RerunFailedTestsAction.java | 45 ++++++++- .../com/intellij/xdebugger/XDebugProcess.java | 28 +----- .../intellij/xdebugger/XDebuggerManager.java | 14 +-- .../xdebugger/impl/XDebuggerManagerImpl.java | 16 +--- .../python/debugger/PyDebugRunner.java | 18 ++-- .../jetbrains/python/run/PythonRunner.java | 12 +-- 16 files changed, 73 insertions(+), 375 deletions(-) delete mode 100644 platform/lang-api/src/com/intellij/execution/configurations/MockCommandLineState.java diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunner.java b/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunner.java index cba2d3ef9b67..932137e4f4e1 100644 --- a/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunner.java +++ b/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunner.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,12 +30,10 @@ import com.intellij.execution.Executor; import com.intellij.execution.configurations.*; import com.intellij.execution.executors.DefaultDebugExecutor; import com.intellij.execution.runners.ExecutionEnvironment; -import com.intellij.execution.runners.ExecutionEnvironmentBuilder; import com.intellij.execution.runners.JavaPatchableProgramRunner; import com.intellij.execution.ui.RunContentDescriptor; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.options.SettingsEditor; -import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.xdebugger.XDebugProcess; import com.intellij.xdebugger.XDebugProcessStarter; @@ -59,14 +57,9 @@ public class GenericDebuggerRunner extends JavaPatchableProgramRunner getRunner() { return myRunner; diff --git a/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironmentBuilder.java b/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironmentBuilder.java index 6bdb1942171e..c586a45ed1ba 100644 --- a/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironmentBuilder.java +++ b/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironmentBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -108,15 +108,6 @@ public final class ExecutionEnvironmentBuilder { myExecutor = copySource.getExecutor(); } - @SuppressWarnings("UnusedDeclaration") - @Deprecated - /** - * to remove in IDEA 15 - */ - public ExecutionEnvironmentBuilder setTarget(@NotNull ExecutionTarget target) { - return target(target); - } - public ExecutionEnvironmentBuilder target(@Nullable ExecutionTarget target) { if (target != null) { myTarget = target; @@ -129,16 +120,6 @@ public final class ExecutionEnvironmentBuilder { return this; } - @SuppressWarnings("UnusedDeclaration") - @Deprecated - /** - * to remove in IDEA 15 - */ - public ExecutionEnvironmentBuilder setRunnerAndSettings(@NotNull ProgramRunner programRunner, - @NotNull RunnerAndConfigurationSettings settings) { - return runnerAndSettings(programRunner, settings); - } - public ExecutionEnvironmentBuilder runnerAndSettings(@NotNull ProgramRunner runner, @NotNull RunnerAndConfigurationSettings settings) { myRunnerAndConfigurationSettings = settings; @@ -149,103 +130,31 @@ public final class ExecutionEnvironmentBuilder { return this; } - @SuppressWarnings("UnusedDeclaration") - @Deprecated - /** - * to remove in IDEA 15 - */ - public ExecutionEnvironmentBuilder setRunnerSettings(@Nullable RunnerSettings runnerSettings) { - myRunnerSettings = runnerSettings; - return this; - } - public ExecutionEnvironmentBuilder runnerSettings(@Nullable RunnerSettings runnerSettings) { myRunnerSettings = runnerSettings; return this; } - @SuppressWarnings("UnusedDeclaration") - @Deprecated - /** - * to remove in IDEA 15 - */ - public ExecutionEnvironmentBuilder setConfigurationSettings(@Nullable ConfigurationPerRunnerSettings configurationSettings) { - myConfigurationSettings = configurationSettings; - return this; - } - - @SuppressWarnings("UnusedDeclaration") - @Deprecated - /** - * to remove in IDEA 15 - */ - public ExecutionEnvironmentBuilder setContentToReuse(@Nullable RunContentDescriptor contentToReuse) { - contentToReuse(contentToReuse); - return this; - } - public ExecutionEnvironmentBuilder contentToReuse(@Nullable RunContentDescriptor contentToReuse) { myContentToReuse = contentToReuse; return this; } - @SuppressWarnings("UnusedDeclaration") - @Deprecated - /** - * to remove in IDEA 15 - */ - public ExecutionEnvironmentBuilder setRunProfile(@NotNull RunProfile runProfile) { - return runProfile(runProfile); - } - public ExecutionEnvironmentBuilder runProfile(@NotNull RunProfile runProfile) { myRunProfile = runProfile; return this; } - @SuppressWarnings("UnusedDeclaration") - @Deprecated - /** - * to remove in IDEA 15 - */ - public ExecutionEnvironmentBuilder setRunnerId(@Nullable String runnerId) { - myRunnerId = runnerId; - return this; - } - public ExecutionEnvironmentBuilder runner(@NotNull ProgramRunner runner) { myRunner = runner; return this; } - public ExecutionEnvironmentBuilder assignNewId() { - myAssignNewId = true; - return this; - } - - @SuppressWarnings("UnusedDeclaration") - @Deprecated - /** - * to remove in IDEA 15 - */ - public ExecutionEnvironmentBuilder setDataContext(@Nullable DataContext dataContext) { - return dataContext(dataContext); - } - public ExecutionEnvironmentBuilder dataContext(@Nullable DataContext dataContext) { myDataContext = dataContext; return this; } - @SuppressWarnings("UnusedDeclaration") - @Deprecated - /** - * to remove in IDEA 15 - */ - public ExecutionEnvironmentBuilder setExecutor(@NotNull Executor executor) { - return executor(executor); - } - public ExecutionEnvironmentBuilder executor(@NotNull Executor executor) { myExecutor = executor; return this; diff --git a/platform/lang-api/src/com/intellij/execution/ui/RunContentDescriptor.java b/platform/lang-api/src/com/intellij/execution/ui/RunContentDescriptor.java index 2ac1c1412cf9..9fdfe75c1c53 100644 --- a/platform/lang-api/src/com/intellij/execution/ui/RunContentDescriptor.java +++ b/platform/lang-api/src/com/intellij/execution/ui/RunContentDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -164,26 +164,6 @@ public class RunContentDescriptor implements Disposable { myContent = content; } - @SuppressWarnings("UnusedDeclaration") - @Nullable - @Deprecated - /** - * @deprecated Use {@link com.intellij.execution.runners.ExecutionUtil#restart(RunContentDescriptor)} instead - * to remove in IDEA 15 - */ - public Runnable getRestarter() { - return myRestarter; - } - - @SuppressWarnings("UnusedDeclaration") - @Deprecated - /** - * @deprecated to remove in IDEA 15 - */ - public void setRestarter(@Nullable Runnable runnable) { - myRestarter = runnable; - } - public boolean isActivateToolWindowWhenAdded() { return myActivateToolWindowWhenAdded; } diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.java index b8b8a27ed6e0..027839d54ddb 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.java @@ -216,7 +216,7 @@ public class ExecutionManagerImpl extends ExecutionManager implements Disposable try { project.getMessageBus().syncPublisher(EXECUTION_TOPIC).processStarting(executor.getId(), environment); - final RunContentDescriptor descriptor = starter.execute(project, executor, state, environment.getContentToReuse(), environment); + final RunContentDescriptor descriptor = starter.execute(state, environment); if (descriptor != null) { environment.setContentToReuse(descriptor); final Trinity trinity = @@ -300,27 +300,6 @@ public class ExecutionManagerImpl extends ExecutionManager implements Disposable return builder; } - @Override - public void restartRunProfile(@NotNull Project project, - @NotNull Executor executor, - @NotNull ExecutionTarget target, - @Nullable RunnerAndConfigurationSettings configuration, - @Nullable RunContentDescriptor currentDescriptor) { - ExecutionEnvironmentBuilder builder = createEnvironmentBuilder(project, executor, configuration); - restartRunProfile(builder.target(target).contentToReuse(currentDescriptor).build()); - } - - @Override - public void restartRunProfile(@Nullable ProgramRunner runner, - @NotNull ExecutionEnvironment environment, - @Nullable RunContentDescriptor currentDescriptor) { - ExecutionEnvironmentBuilder builder = new ExecutionEnvironmentBuilder(environment).contentToReuse(currentDescriptor); - if (runner != null) { - builder.runner(runner); - } - restartRunProfile(builder.build()); - } - public static boolean isProcessRunning(@Nullable RunContentDescriptor descriptor) { ProcessHandler processHandler = descriptor == null ? null : descriptor.getProcessHandler(); return processHandler != null && !processHandler.isProcessTerminated(); diff --git a/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java b/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java index 841c13f1eb7d..49bf1a737f25 100644 --- a/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java +++ b/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,20 +49,6 @@ public class RunContentBuilder extends RunTab { private final List myRunnerActions = new SmartList(); private final ExecutionResult myExecutionResult; - /** - * @deprecated use {@link #RunContentBuilder(com.intellij.execution.ExecutionResult, ExecutionEnvironment)} - * to remove in IDEA 14 - */ - @SuppressWarnings("UnusedParameters") - public RunContentBuilder(@NotNull Project project, - ProgramRunner runner, - Executor executor, - ExecutionResult executionResult, - @NotNull ExecutionEnvironment environment) { - //noinspection deprecation - this(runner, executionResult, environment); - } - /** * @deprecated use {@link #RunContentBuilder(com.intellij.execution.ExecutionResult, ExecutionEnvironment)} * to remove in IDEA 15 diff --git a/platform/testRunner/src/com/intellij/execution/testframework/actions/RerunFailedTestsAction.java b/platform/testRunner/src/com/intellij/execution/testframework/actions/RerunFailedTestsAction.java index af15e3c14ce1..655981fcdea6 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/actions/RerunFailedTestsAction.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/actions/RerunFailedTestsAction.java @@ -1,12 +1,55 @@ +/* + * Copyright 2000-2015 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.execution.testframework.actions; +import com.intellij.execution.ExecutionManager; +import com.intellij.execution.ui.RunContentDescriptor; +import com.intellij.execution.ui.layout.ViewContext; +import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.DataContext; +import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; +import javax.swing.*; + class RerunFailedTestsAction extends AnAction { @Override public void actionPerformed(@NotNull AnActionEvent e) { - throw new IllegalStateException("Action only as template"); + Project project = e.getProject(); + if (project == null) { + return; + } + + RunContentDescriptor content = ExecutionManager.getInstance(project).getContentManager().getSelectedContent(); + if (content == null) { + return; + } + + JComponent component = content.getComponent(); + if (component == null) { + return; + } + + @SuppressWarnings("ConstantConditions") + DataContext dataContext = DataManager.getInstance().getDataContext(component); + ViewContext viewContext = ViewContext.CONTEXT_KEY.getData(dataContext); + if (viewContext != null) { + + } } } diff --git a/platform/xdebugger-api/src/com/intellij/xdebugger/XDebugProcess.java b/platform/xdebugger-api/src/com/intellij/xdebugger/XDebugProcess.java index d7499346099f..c8cf928e126c 100644 --- a/platform/xdebugger-api/src/com/intellij/xdebugger/XDebugProcess.java +++ b/platform/xdebugger-api/src/com/intellij/xdebugger/XDebugProcess.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,6 @@ package com.intellij.xdebugger; import com.intellij.execution.filters.TextConsoleBuilderFactory; import com.intellij.execution.process.ProcessHandler; import com.intellij.execution.ui.ExecutionConsole; -import com.intellij.execution.ui.RunnerLayoutUi; import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.xdebugger.breakpoints.XBreakpointHandler; import com.intellij.xdebugger.evaluation.XDebuggerEditorsProvider; @@ -201,30 +200,10 @@ public abstract class XDebugProcess { return null; } - /** - * @deprecated Override {@link #createTabLayouter()} and {@link com.intellij.xdebugger.ui.XDebugTabLayouter#registerAdditionalContent} instead - * to remove in IDEA 15 - */ - @SuppressWarnings("UnusedParameters") - @Deprecated - public void registerAdditionalContent(@NotNull RunnerLayoutUi ui) { - } - - @SuppressWarnings("UnusedParameters") - @Deprecated - /** - * @deprecated Override {@link #registerAdditionalActions(com.intellij.openapi.actionSystem.ActionGroup, com.intellij.openapi.actionSystem.ActionGroup, com.intellij.openapi.actionSystem.ActionGroup)} instead - * to remove in IDEA 15 - */ - public void registerAdditionalActions(@NotNull DefaultActionGroup leftToolbar, @NotNull DefaultActionGroup topToolbar) { - } - /** * Override this method to provide additional actions in 'Debug' tool window */ public void registerAdditionalActions(@NotNull DefaultActionGroup leftToolbar, @NotNull DefaultActionGroup topToolbar, @NotNull DefaultActionGroup settings) { - //noinspection deprecation - registerAdditionalActions(leftToolbar, topToolbar); } /** @@ -245,11 +224,6 @@ public abstract class XDebugProcess { @NotNull public XDebugTabLayouter createTabLayouter() { return new XDebugTabLayouter() { - @Override - public void registerAdditionalContent(@NotNull RunnerLayoutUi ui) { - //noinspection deprecation - XDebugProcess.this.registerAdditionalContent(ui); - } }; } diff --git a/platform/xdebugger-api/src/com/intellij/xdebugger/XDebuggerManager.java b/platform/xdebugger-api/src/com/intellij/xdebugger/XDebuggerManager.java index cb65b84af9d9..200ce02608ec 100644 --- a/platform/xdebugger-api/src/com/intellij/xdebugger/XDebuggerManager.java +++ b/platform/xdebugger-api/src/com/intellij/xdebugger/XDebuggerManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,6 @@ package com.intellij.xdebugger; import com.intellij.execution.ExecutionException; import com.intellij.execution.runners.ExecutionEnvironment; -import com.intellij.execution.runners.ProgramRunner; import com.intellij.execution.ui.ExecutionConsole; import com.intellij.execution.ui.RunContentDescriptor; import com.intellij.openapi.project.Project; @@ -57,17 +56,6 @@ public abstract class XDebuggerManager { @Nullable public abstract XDebugSession getCurrentSession(); - /** - * @deprecated use {@link #startSession(com.intellij.execution.runners.ExecutionEnvironment, XDebugProcessStarter)} instead - * to remove in IDEA 15 - */ - @NotNull - @Deprecated - public abstract XDebugSession startSession(@NotNull ProgramRunner runner, - @NotNull ExecutionEnvironment env, - @Nullable RunContentDescriptor contentToReuse, - @NotNull XDebugProcessStarter processStarter) throws ExecutionException; - /** * Start a new debugging session. Use this method only if debugging is started by using standard 'Debug' action i.e. this methods is called * from {@link com.intellij.execution.runners.ProgramRunner#execute} method. Otherwise use {@link #startSessionAndShowTab} method diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java index c7665fa18b96..7e0f55a3204d 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java @@ -22,8 +22,6 @@ import com.intellij.execution.Executor; import com.intellij.execution.executors.DefaultDebugExecutor; import com.intellij.execution.process.ProcessHandler; import com.intellij.execution.runners.ExecutionEnvironment; -import com.intellij.execution.runners.ProgramRunner; -import com.intellij.execution.runners.RunContentBuilder; import com.intellij.execution.ui.ExecutionConsole; import com.intellij.execution.ui.RunContentDescriptor; import com.intellij.execution.ui.RunContentManager; @@ -34,7 +32,10 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.*; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.markup.GutterIconRenderer; -import com.intellij.openapi.fileEditor.*; +import com.intellij.openapi.fileEditor.FileDocumentManagerAdapter; +import com.intellij.openapi.fileEditor.FileEditorManager; +import com.intellij.openapi.fileEditor.FileEditorManagerAdapter; +import com.intellij.openapi.fileEditor.FileEditorManagerListener; import com.intellij.openapi.project.Project; import com.intellij.openapi.startup.StartupManager; import com.intellij.openapi.util.Disposer; @@ -165,15 +166,6 @@ public class XDebuggerManagerImpl extends XDebuggerManager return COMPONENT_NAME; } - @Override - @NotNull - public XDebugSession startSession(@NotNull ProgramRunner runner, - @NotNull ExecutionEnvironment environment, - @Nullable RunContentDescriptor contentToReuse, - @NotNull XDebugProcessStarter processStarter) throws ExecutionException { - return startSession(contentToReuse, processStarter, new XDebugSessionImpl(RunContentBuilder.fix(environment, runner), this)); - } - @Override @NotNull public XDebugSession startSession(@NotNull ExecutionEnvironment environment, @NotNull XDebugProcessStarter processStarter) throws ExecutionException { diff --git a/python/src/com/jetbrains/python/debugger/PyDebugRunner.java b/python/src/com/jetbrains/python/debugger/PyDebugRunner.java index f5f25106982c..cfe7701e5e0c 100644 --- a/python/src/com/jetbrains/python/debugger/PyDebugRunner.java +++ b/python/src/com/jetbrains/python/debugger/PyDebugRunner.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -82,19 +82,17 @@ public class PyDebugRunner extends GenericProgramRunner { } @Override - protected RunContentDescriptor doExecute(@NotNull final Project project, @NotNull RunProfileState profileState, - RunContentDescriptor contentToReuse, - @NotNull ExecutionEnvironment env) throws ExecutionException { + protected RunContentDescriptor doExecute(@NotNull RunProfileState state, @NotNull final ExecutionEnvironment environment) throws ExecutionException { FileDocumentManager.getInstance().saveAllDocuments(); - final PythonCommandLineState pyState = (PythonCommandLineState)profileState; + final PythonCommandLineState pyState = (PythonCommandLineState)state; final ServerSocket serverSocket = PythonCommandLineState.createServerSocket(); final int serverLocalPort = serverSocket.getLocalPort(); - RunProfile profile = env.getRunProfile(); - final ExecutionResult result = pyState.execute(env.getExecutor(), createCommandLinePatchers(project, pyState, profile, serverLocalPort)); + RunProfile profile = environment.getRunProfile(); + final ExecutionResult result = pyState.execute(environment.getExecutor(), createCommandLinePatchers(environment.getProject(), pyState, profile, serverLocalPort)); - final XDebugSession session = XDebuggerManager.getInstance(project). - startSession(this, env, contentToReuse, new XDebugProcessStarter() { + final XDebugSession session = XDebuggerManager.getInstance(environment.getProject()). + startSession(environment, new XDebugProcessStarter() { @Override @NotNull public XDebugProcess start(@NotNull final XDebugSession session) { @@ -102,7 +100,7 @@ public class PyDebugRunner extends GenericProgramRunner { new PyDebugProcess(session, serverSocket, result.getExecutionConsole(), result.getProcessHandler(), pyState.isMultiprocessDebug()); - createConsoleCommunicationAndSetupActions(project, result, pyDebugProcess, session); + createConsoleCommunicationAndSetupActions(environment.getProject(), result, pyDebugProcess, session); return pyDebugProcess; diff --git a/python/src/com/jetbrains/python/run/PythonRunner.java b/python/src/com/jetbrains/python/run/PythonRunner.java index 62424ce26b89..8509b55bb531 100644 --- a/python/src/com/jetbrains/python/run/PythonRunner.java +++ b/python/src/com/jetbrains/python/run/PythonRunner.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,6 @@ import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.runners.RunContentBuilder; import com.intellij.execution.ui.RunContentDescriptor; import com.intellij.openapi.fileEditor.FileDocumentManager; -import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; /** @@ -43,12 +42,7 @@ public class PythonRunner extends DefaultProgramRunner { } @Override - protected RunContentDescriptor doExecute( - @NotNull Project project, - @NotNull RunProfileState state, - RunContentDescriptor contentToReuse, - @NotNull ExecutionEnvironment env - ) throws ExecutionException { + protected RunContentDescriptor doExecute(@NotNull RunProfileState state, @NotNull ExecutionEnvironment env) throws ExecutionException { FileDocumentManager.getInstance().saveAllDocuments(); ExecutionResult executionResult; @@ -59,6 +53,6 @@ public class PythonRunner extends DefaultProgramRunner { else { executionResult = state.execute(env.getExecutor(), this); } - return executionResult == null ? null : new RunContentBuilder(executionResult, env).showRunContent(contentToReuse); + return executionResult == null ? null : new RunContentBuilder(executionResult, env).showRunContent(env.getContentToReuse()); } }