diff options
Diffstat (limited to 'plugins/maven/src/main/java')
4 files changed, 28 insertions, 18 deletions
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenResumeAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenResumeAction.java index 927b087a9fce..6d58aa895f6a 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenResumeAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenResumeAction.java @@ -301,7 +301,7 @@ public class MavenResumeAction extends AnAction { runConfiguration.getRunnerParameters().setGoals(goals); - myRunner.execute(new ExecutionEnvironmentBuilder(myEnvironment).setContentToReuse(null).setRunProfile(runConfiguration).build()); + myRunner.execute(new ExecutionEnvironmentBuilder(myEnvironment).contentToReuse(null).runProfile(runConfiguration).build()); } catch (RunCanceledByUserException ignore) { } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfigurationType.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfigurationType.java index 3747107fb223..bada6c044354 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfigurationType.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfigurationType.java @@ -59,10 +59,12 @@ public class MavenRunConfigurationType implements ConfigurationType { */ MavenRunConfigurationType() { myFactory = new ConfigurationFactory(this) { + @Override public RunConfiguration createTemplateConfiguration(Project project) { return new MavenRunConfiguration(project, this, ""); } + @Override public RunConfiguration createTemplateConfiguration(Project project, RunManager runManager) { return new MavenRunConfiguration(project, this, ""); } @@ -99,22 +101,27 @@ public class MavenRunConfigurationType implements ConfigurationType { }; } + @Override public String getDisplayName() { return RunnerBundle.message("maven.run.configuration.name"); } + @Override public String getConfigurationTypeDescription() { return RunnerBundle.message("maven.run.configuration.description"); } + @Override public Icon getIcon() { return MavenIcons.Phase; } + @Override public ConfigurationFactory[] getConfigurationFactories() { return new ConfigurationFactory[]{myFactory}; } + @Override @NonNls @NotNull public String getId() { @@ -187,29 +194,26 @@ public class MavenRunConfigurationType implements ConfigurationType { ProgramRunner runner = DefaultJavaProgramRunner.getInstance(); Executor executor = DefaultRunExecutor.getRunExecutorInstance(); - ExecutionEnvironment env = new ExecutionEnvironment(executor, runner, configSettings, project); - try { - runner.execute(env, callback); + runner.execute(new ExecutionEnvironment(executor, runner, configSettings, project), callback); } catch (ExecutionException e) { MavenUtil.showError(project, "Failed to execute Maven goal", e); } } + @NotNull public static RunnerAndConfigurationSettings createRunnerAndConfigurationSettings(@Nullable MavenGeneralSettings generalSettings, - @Nullable MavenRunnerSettings runnerSettings, - MavenRunnerParameters params, - Project project) { + @Nullable MavenRunnerSettings runnerSettings, + MavenRunnerParameters params, + Project project) { MavenRunConfigurationType type = ConfigurationTypeUtil.findConfigurationType(MavenRunConfigurationType.class); - final RunnerAndConfigurationSettings settings = RunManagerEx.getInstanceEx(project) - .createConfiguration(generateName(project, params), type.myFactory); + RunnerAndConfigurationSettings settings = RunManager.getInstance(project).createRunConfiguration(generateName(project, params), type.myFactory); MavenRunConfiguration runConfiguration = (MavenRunConfiguration)settings.getConfiguration(); runConfiguration.setRunnerParameters(params); runConfiguration.setGeneralSettings(generalSettings); runConfiguration.setRunnerSettings(runnerSettings); - return settings; } } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/actions/MavenRunConfigurationMenu.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/actions/MavenRunConfigurationMenu.java index 4566689ed55e..7cbccc6b4a7a 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/actions/MavenRunConfigurationMenu.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/actions/MavenRunConfigurationMenu.java @@ -29,9 +29,7 @@ public class MavenRunConfigurationMenu extends DefaultActionGroup implements Dum Executor[] executors = ExecutorRegistry.getInstance().getRegisteredExecutors(); for (int i = executors.length; --i >= 0; ) { final ProgramRunner runner = RunnerRegistry.getInstance().getRunner(executors[i].getId(), settings.getConfiguration()); - AnAction action = new ExecuteMavenRunConfigurationAction(executors[i], runner != null, project, settings); - addAction(action, Constraints.FIRST); } @@ -57,9 +55,9 @@ public class MavenRunConfigurationMenu extends DefaultActionGroup implements Dum @Override public void actionPerformed(AnActionEvent event) { - if (!myEnabled) return; - - ProgramRunnerUtil.executeConfiguration(myProject, mySettings, myExecutor); + if (myEnabled) { + ProgramRunnerUtil.executeConfiguration(myProject, mySettings, myExecutor); + } } @Override diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectImportProvider.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectImportProvider.java index b54da50c1396..f74a98a3476b 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectImportProvider.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectImportProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -43,8 +43,11 @@ public class MavenProjectImportProvider extends ProjectImportProvider { public ModuleWizardStep[] createSteps(final WizardContext wizardContext) { final ProjectWizardStepFactory stepFactory = ProjectWizardStepFactory.getInstance(); - return new ModuleWizardStep[]{new MavenProjectImportStep(wizardContext), new SelectProfilesStep(wizardContext), + return new ModuleWizardStep[]{ + new MavenProjectImportStep(wizardContext), + new SelectProfilesStep(wizardContext), new SelectImportedProjectsStep<MavenProject>(wizardContext) { + @Override protected String getElementText(final MavenProject project) { final StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append(project.getMavenId()); @@ -71,15 +74,20 @@ public class MavenProjectImportProvider extends ProjectImportProvider { return !MavenProjectsManager.getInstance(project).isIgnored(mavenProject); } + @Override public void updateDataModel() { super.updateDataModel(); getWizardContext().setProjectName(((MavenProjectBuilder)getBuilder()).getSuggestedProjectName()); } + @Override public String getHelpId() { return "reference.dialogs.new.project.import.maven.page3"; } - }, stepFactory.createProjectJdkStep(wizardContext), stepFactory.createNameAndLocationStep(wizardContext)}; + }, + stepFactory.createProjectJdkStep(wizardContext), + stepFactory.createNameAndLocationStep(wizardContext) + }; } @Override |