diff options
Diffstat (limited to 'plugins/ui-designer/src/com')
-rw-r--r-- | plugins/ui-designer/src/com/intellij/uiDesigner/actions/PreviewFormAction.java | 11 | ||||
-rw-r--r-- | plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java | 16 |
2 files changed, 12 insertions, 15 deletions
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 ce26a9b44264..49766b110bfa 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/PreviewFormAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/PreviewFormAction.java @@ -25,6 +25,8 @@ 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.ExecutionUtil; import com.intellij.execution.runners.ProgramRunner; import com.intellij.lang.properties.PropertiesFileType; import com.intellij.lang.properties.PropertiesReferenceManager; @@ -312,12 +314,9 @@ public final class PreviewFormAction extends AnAction{ } try { - final RunProfile profile = new MyRunProfile(module, parameters, tempPath, - UIDesignerBundle.message("progress.preview.started", formFile.getPresentableUrl())); - 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)); + RunProfile profile = new MyRunProfile(module, parameters, tempPath, + UIDesignerBundle.message("progress.preview.started", formFile.getPresentableUrl())); + 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 284ce42ec867..6ecb61920100 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java @@ -16,12 +16,14 @@ package com.intellij.uiDesigner.snapShooter; -import com.intellij.execution.*; +import com.intellij.execution.ExecutionException; +import com.intellij.execution.RunManager; +import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.application.ApplicationConfiguration; import com.intellij.execution.application.ApplicationConfigurationType; import com.intellij.execution.executors.DefaultRunExecutor; -import com.intellij.execution.runners.ExecutionEnvironment; -import com.intellij.execution.runners.ProgramRunner; +import com.intellij.execution.runners.ExecutionEnvironmentBuilder; +import com.intellij.execution.runners.ExecutionUtil; import com.intellij.execution.util.JreVersionDetector; import com.intellij.icons.AllIcons; import com.intellij.ide.IdeView; @@ -168,13 +170,9 @@ public class CreateSnapShotAction extends AnAction { }); } }); - + try { - final ProgramRunner runner = RunnerRegistry.getInstance().getRunner(DefaultRunExecutor.EXECUTOR_ID, appConfig); - LOG.assertTrue(runner != null, "Runner MUST not be null!"); - Executor executor = DefaultRunExecutor.getRunExecutorInstance(); - runner.execute( - new ExecutionEnvironment(executor, runner, snapshotConfiguration, project)); + ExecutionEnvironmentBuilder.create(DefaultRunExecutor.getRunExecutorInstance(), snapshotConfiguration).buildAndExecute(); } catch (ExecutionException ex) { Messages.showMessageDialog(project, UIDesignerBundle.message("snapshot.run.error", ex.getMessage()), |