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

pass RunProfile explicitly in run configuration patching methods

Browse Source
This commit is contained in:
Dmitry Jemerov
2013-07-22 18:13:26 +02:00
parent 2b3253d83c
commit 2bc5606407
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java
+3 -3
View File
@@ -61,8 +61,8 @@ public class DefaultJavaProgramRunner extends JavaPatchableProgramRunner {
}
@Override
public void patch(JavaParameters javaParameters, RunnerSettings settings, final boolean beforeExecution) throws ExecutionException {
runCustomPatchers(javaParameters, settings, Executor.EXECUTOR_EXTENSION_NAME.findExtension(DefaultRunExecutor.class));
public void patch(JavaParameters javaParameters, RunnerSettings settings, RunProfile runProfile, final boolean beforeExecution) throws ExecutionException {
runCustomPatchers(javaParameters, Executor.EXECUTOR_EXTENSION_NAME.findExtension(DefaultRunExecutor.class), runProfile);
}
@Override
@@ -74,7 +74,7 @@ public class DefaultJavaProgramRunner extends JavaPatchableProgramRunner {
boolean shouldAddDefaultActions = true;
if (state instanceof JavaCommandLine) {
final JavaParameters parameters = ((JavaCommandLine)state).getJavaParameters();
patch(parameters, env.getRunnerSettings(), true);
patch(parameters, env.getRunnerSettings(), env.getRunProfile(), true);
final ProcessProxy proxy = ProcessProxyFactory.getInstance().createCommandLineProxy((JavaCommandLine)state);
executionResult = state.execute(executor, this);
if (proxy != null && executionResult != null) {
java/execution/openapi/src/com/intellij/execution/runners/JavaPatchableProgramRunner.java
+6 -6
View File
@@ -21,21 +21,21 @@ import com.intellij.execution.configurations.JavaParameters;
import com.intellij.execution.configurations.RunProfile;
import com.intellij.execution.configurations.RunnerSettings;
import com.intellij.openapi.util.JDOMExternalizable;
import org.jetbrains.annotations.Nullable;
/**
* @author spleaner
*/
public abstract class JavaPatchableProgramRunner<Settings extends JDOMExternalizable> extends GenericProgramRunner<Settings> {
public abstract void patch(JavaParameters javaParameters, RunnerSettings settings, final boolean beforeExecution) throws ExecutionException;
public abstract void patch(JavaParameters javaParameters, RunnerSettings settings, RunProfile runProfile, final boolean beforeExecution) throws ExecutionException;
protected static void runCustomPatchers(JavaParameters javaParameters, @Nullable RunnerSettings settings, Executor executor) {
if (settings != null) {
final RunProfile profile = settings.getRunProfile();
protected static void runCustomPatchers(JavaParameters javaParameters,
Executor executor,
RunProfile runProfile) {
if (runProfile != null) {
for (JavaProgramPatcher patcher : JavaProgramPatcher.EP_NAME.getExtensions()) {
patcher.patchJavaParameters(executor, profile, javaParameters);
patcher.patchJavaParameters(executor, runProfile, javaParameters);
}
}
}