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

don't use deprecated ctor ExecutionEnvironment

Browse Source
This commit is contained in:
Vladimir Krivosheev
2014-08-08 08:27:08 +02:00
parent 089d65efcf
commit c8751a74a0
7 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
+2 -2
View File
@@ -21,6 +21,7 @@ import com.intellij.execution.filters.Filter;
import com.intellij.execution.filters.TextConsoleBuilder;
import com.intellij.execution.filters.TextConsoleBuilderFactory;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.execution.runners.ExecutionEnvironmentBuilder;
import com.intellij.execution.runners.ProgramRunner;
import com.intellij.execution.util.ExecutionErrorDialog;
import com.intellij.openapi.actionSystem.DataContext;
@@ -58,8 +59,7 @@ public class JavaExecutionUtil {
final DefaultRunProfile profile = new DefaultRunProfile(project, cmdLine, contentName, icon, filters);
final ProgramRunner runner = RunnerRegistry.getInstance().getRunner(DefaultRunExecutor.EXECUTOR_ID, profile);
if (runner != null) {
Executor executor = DefaultRunExecutor.getRunExecutorInstance();
runner.execute(new ExecutionEnvironment(profile, executor, project, null));
runner.execute(new ExecutionEnvironmentBuilder(project, DefaultRunExecutor.getRunExecutorInstance()).runProfile(profile).build());
return true;
}
java/java-impl/src/com/intellij/javadoc/JavadocGenerationManager.java
+2 -2
View File
@@ -21,7 +21,7 @@ import com.intellij.execution.ExecutionException;
import com.intellij.execution.Executor;
import com.intellij.execution.RunnerRegistry;
import com.intellij.execution.executors.DefaultRunExecutor;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.execution.runners.ExecutionEnvironmentBuilder;
import com.intellij.execution.runners.ProgramRunner;
import com.intellij.execution.util.ExecutionErrorDialog;
import com.intellij.openapi.components.*;
@@ -85,7 +85,7 @@ public final class JavadocGenerationManager implements PersistentStateComponent<
final ProgramRunner runner = RunnerRegistry.getInstance().getRunner(DefaultRunExecutor.EXECUTOR_ID, myConfiguration);
assert runner != null;
Executor executor = DefaultRunExecutor.getRunExecutorInstance();
runner.execute(new ExecutionEnvironment(myConfiguration ,executor, myProject, null));
runner.execute(new ExecutionEnvironmentBuilder(myProject, executor).runProfile(myConfiguration).build());
}
catch (ExecutionException e) {
ExecutionErrorDialog.show(e, CommonBundle.getErrorTitle(), myProject);
java/java-tests/testSrc/com/intellij/execution/ConfigurationsTest.java
+3 -2
View File
@@ -9,6 +9,7 @@ import com.intellij.execution.junit.*;
import com.intellij.execution.junit2.configuration.JUnitConfigurable;
import com.intellij.execution.junit2.configuration.JUnitConfigurationModel;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.execution.runners.ExecutionEnvironmentBuilder;
import com.intellij.execution.testframework.TestSearchScope;
import com.intellij.execution.ui.CommonJavaParametersPanel;
import com.intellij.openapi.module.Module;
@@ -421,7 +422,7 @@ public class ConfigurationsTest extends BaseConfigurationTestCase {
private JavaParameters checkCanRun(RunConfiguration configuration) throws ExecutionException {
final RunProfileState state;
state = configuration.getState(MOCK_EXECUTOR, new ExecutionEnvironment(new MockProfile(), MOCK_EXECUTOR, myProject, null));
state = configuration.getState(MOCK_EXECUTOR, new ExecutionEnvironmentBuilder(myProject, MOCK_EXECUTOR).runProfile(new MockProfile()).build());
assertNotNull(state);
assertTrue(state instanceof JavaCommandLine);
if (state instanceof TestPackage) {
@@ -465,7 +466,7 @@ public class ConfigurationsTest extends BaseConfigurationTestCase {
}
final RunProfileState state = configuration
.getState(MOCK_EXECUTOR, new ExecutionEnvironment(new MockProfile(), MOCK_EXECUTOR, myProject, null));
.getState(MOCK_EXECUTOR, new ExecutionEnvironmentBuilder(myProject, MOCK_EXECUTOR).runProfile(new MockProfile()).build());
assertTrue(state instanceof JavaCommandLine);
try {
platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironment.java
+1
View File
@@ -102,6 +102,7 @@ public class ExecutionEnvironment extends UserDataHolderBase {
/**
* @deprecated, use {@link com.intellij.execution.runners.ExecutionEnvironmentBuilder} instead
* to remove in IDEA 15
*/
public ExecutionEnvironment(@NotNull RunProfile runProfile,
@NotNull Executor executor,
platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironmentBuilder.java
+9
View File
@@ -88,6 +88,11 @@ public final class ExecutionEnvironmentBuilder {
return this;
}
public ExecutionEnvironmentBuilder runnerSettings(@Nullable RunnerSettings runnerSettings) {
myRunnerSettings = runnerSettings;
return this;
}
public ExecutionEnvironmentBuilder setConfigurationSettings(@Nullable ConfigurationPerRunnerSettings configurationSettings) {
myConfigurationSettings = configurationSettings;
return this;
@@ -99,6 +104,10 @@ public final class ExecutionEnvironmentBuilder {
}
public ExecutionEnvironmentBuilder setRunProfile(@NotNull RunProfile runProfile) {
return runProfile(runProfile);
}
public ExecutionEnvironmentBuilder runProfile(@NotNull RunProfile runProfile) {
myRunProfile = runProfile;
return this;
}
plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java
+2 -1
View File
@@ -25,6 +25,7 @@ import com.intellij.execution.executors.DefaultRunExecutor;
import com.intellij.execution.impl.DefaultJavaProgramRunner;
import com.intellij.execution.process.*;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.execution.runners.ExecutionEnvironmentBuilder;
import com.intellij.execution.runners.ProgramRunner;
import com.intellij.execution.ui.RunContentDescriptor;
import com.intellij.openapi.Disposable;
@@ -234,7 +235,7 @@ public abstract class GroovyCompilerTestCase extends JavaCodeInsightFixtureTestC
ProgramRunner runner,
RunProfile configuration) throws ExecutionException {
final Executor executor = Executor.EXECUTOR_EXTENSION_NAME.findExtension(executorClass);
final ExecutionEnvironment environment = new ExecutionEnvironment(configuration, executor, getProject(), null);
final ExecutionEnvironment environment = new ExecutionEnvironmentBuilder(getProject(), executor).runProfile(configuration).build();
final Semaphore semaphore = new Semaphore();
semaphore.down();
plugins/ui-designer/src/com/intellij/uiDesigner/actions/PreviewFormAction.java
+2 -1
View File
@@ -25,6 +25,7 @@ import com.intellij.execution.executors.DefaultRunExecutor;
import com.intellij.execution.process.ProcessAdapter;
import com.intellij.execution.process.ProcessEvent;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.execution.runners.ExecutionEnvironmentBuilder;
import com.intellij.execution.runners.ProgramRunner;
import com.intellij.lang.properties.PropertiesFileType;
import com.intellij.lang.properties.PropertiesReferenceManager;
@@ -317,7 +318,7 @@ public final class PreviewFormAction extends AnAction{
ProgramRunner defaultRunner = RunnerRegistry.getInstance().getRunner(DefaultRunExecutor.EXECUTOR_ID, profile);
LOG.assertTrue(defaultRunner != null);
Executor executor = DefaultRunExecutor.getRunExecutorInstance();
defaultRunner.execute(new ExecutionEnvironment(profile, executor, module.getProject(), null));
defaultRunner.execute(new ExecutionEnvironmentBuilder(module.getProject(), executor).runProfile(profile).build());
}
catch (ExecutionException e) {
Messages.showErrorDialog(