From 66f67529fa9cf66d78f0ba71ec4a882abf50fea7 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Thu, 14 Aug 2014 08:15:35 +0200 Subject: [PATCH] avoid misuse (remove execute(env) from util) --- .../src/com/intellij/execution/JavaExecutionUtil.java | 2 +- .../com/intellij/javadoc/JavadocGenerationManager.java | 2 +- .../execution/runners/ExecutionEnvironmentBuilder.java | 5 +++++ .../com/intellij/execution/runners/ExecutionUtil.java | 5 ----- .../actions/AbstractRerunFailedTestsAction.java | 10 +++++----- .../src/com/intellij/execution/junit/TestPackage.java | 2 +- .../intellij/uiDesigner/actions/PreviewFormAction.java | 2 +- .../uiDesigner/snapShooter/CreateSnapShotAction.java | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java b/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java index 3c75e2fb381e..4c59e267b209 100644 --- a/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java +++ b/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java @@ -59,7 +59,7 @@ public class JavaExecutionUtil { final DefaultRunProfile profile = new DefaultRunProfile(project, cmdLine, contentName, icon, filters); ExecutionEnvironmentBuilder builder = ExecutionEnvironmentBuilder.createOrNull(project, DefaultRunExecutor.getRunExecutorInstance(), profile); if (builder != null) { - ExecutionUtil.execute(builder.build()); + builder.buildAndExecute(); return true; } return false; diff --git a/java/java-impl/src/com/intellij/javadoc/JavadocGenerationManager.java b/java/java-impl/src/com/intellij/javadoc/JavadocGenerationManager.java index 927e95678724..3589918fe4a1 100644 --- a/java/java-impl/src/com/intellij/javadoc/JavadocGenerationManager.java +++ b/java/java-impl/src/com/intellij/javadoc/JavadocGenerationManager.java @@ -80,7 +80,7 @@ public final class JavadocGenerationManager implements PersistentStateComponent< public void generateJavadoc(AnalysisScope scope) { myConfiguration.setGenerationScope(scope); try { - ExecutionUtil.execute(ExecutionEnvironmentBuilder.create(myProject, DefaultRunExecutor.getRunExecutorInstance(), myConfiguration).build()); + ExecutionEnvironmentBuilder.create(myProject, DefaultRunExecutor.getRunExecutorInstance(), myConfiguration).buildAndExecute(); } catch (ExecutionException e) { ExecutionErrorDialog.show(e, CommonBundle.getErrorTitle(), myProject); 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 c2e8da97988f..c73d040def28 100644 --- a/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironmentBuilder.java +++ b/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironmentBuilder.java @@ -256,4 +256,9 @@ public final class ExecutionEnvironmentBuilder { } return environment; } + + public void buildAndExecute() throws ExecutionException { + ExecutionEnvironment environment = build(); + myRunner.execute(environment); + } } diff --git a/platform/lang-api/src/com/intellij/execution/runners/ExecutionUtil.java b/platform/lang-api/src/com/intellij/execution/runners/ExecutionUtil.java index 30237d3106be..0d15a272498c 100644 --- a/platform/lang-api/src/com/intellij/execution/runners/ExecutionUtil.java +++ b/platform/lang-api/src/com/intellij/execution/runners/ExecutionUtil.java @@ -169,9 +169,4 @@ public class ExecutionUtil { return null; } } - - public static void execute(@NotNull ExecutionEnvironment environment) throws ExecutionException { - //noinspection ConstantConditions - environment.getRunner().execute(environment); - } } diff --git a/platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java b/platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java index d6addaef928e..30f8599e2aaf 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java @@ -241,11 +241,11 @@ public class AbstractRerunFailedTestsAction extends AnAction implements AnAction private void performAction(ProgramRunner runner, MyRunProfile profile, Executor executor) { try { - runner.execute(new ExecutionEnvironmentBuilder(myEnvironment) - .runner(runner) - .executor(executor) - .runProfile(profile) - .build()); + new ExecutionEnvironmentBuilder(myEnvironment) + .runner(runner) + .executor(executor) + .runProfile(profile) + .buildAndExecute(); } catch (ExecutionException e1) { LOG.error(e1); diff --git a/plugins/junit/src/com/intellij/execution/junit/TestPackage.java b/plugins/junit/src/com/intellij/execution/junit/TestPackage.java index 949f35822f20..3d3c2da89143 100644 --- a/plugins/junit/src/com/intellij/execution/junit/TestPackage.java +++ b/plugins/junit/src/com/intellij/execution/junit/TestPackage.java @@ -439,7 +439,7 @@ public class TestPackage extends TestObject { try { Executor executor = myConsoleProperties.isDebug() ? DefaultDebugExecutor.getDebugExecutorInstance() : DefaultRunExecutor.getRunExecutorInstance(); - ExecutionUtil.execute(ExecutionEnvironmentBuilder.create(myProject, executor, myConfiguration).contentToReuse(null).build()); + ExecutionEnvironmentBuilder.create(myProject, executor, myConfiguration).contentToReuse(null).buildAndExecute(); Balloon balloon = myToolWindowManager.getToolWindowBalloon(myTestRunDebugId); if (balloon != null) { balloon.hide(); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/PreviewFormAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/PreviewFormAction.java index 4c39d778ad3c..49766b110bfa 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/PreviewFormAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/PreviewFormAction.java @@ -316,7 +316,7 @@ public final class PreviewFormAction extends AnAction{ try { RunProfile profile = new MyRunProfile(module, parameters, tempPath, UIDesignerBundle.message("progress.preview.started", formFile.getPresentableUrl())); - ExecutionUtil.execute(ExecutionEnvironmentBuilder.create(module.getProject(), DefaultRunExecutor.getRunExecutorInstance(), profile).build()); + ExecutionEnvironmentBuilder.create(module.getProject(), DefaultRunExecutor.getRunExecutorInstance(), profile).buildAndExecute(); } catch (ExecutionException e) { Messages.showErrorDialog( diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java index 09f7c2b51063..6ecb61920100 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java @@ -172,7 +172,7 @@ public class CreateSnapShotAction extends AnAction { }); try { - ExecutionUtil.execute(ExecutionEnvironmentBuilder.create(DefaultRunExecutor.getRunExecutorInstance(), snapshotConfiguration).build()); + ExecutionEnvironmentBuilder.create(DefaultRunExecutor.getRunExecutorInstance(), snapshotConfiguration).buildAndExecute(); } catch (ExecutionException ex) { Messages.showMessageDialog(project, UIDesignerBundle.message("snapshot.run.error", ex.getMessage()),