diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/RunBuildAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/RunBuildAction.java index 77a4ad998af4..e52453070a0e 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/RunBuildAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/RunBuildAction.java @@ -38,12 +38,12 @@ public class RunBuildAction extends MavenAction { } private static boolean checkOrPerform(DataContext context, boolean perform) { - final MavenProject project = MavenActionUtil.getMavenProject(context); - if (project == null) return false; - final List goals = MavenDataKeys.MAVEN_GOALS.getData(context); if (goals == null || goals.isEmpty()) return false; + final MavenProject project = MavenActionUtil.getMavenProject(context); + if (project == null) return false; + if (!perform) return true; final MavenRunnerParameters params = new MavenRunnerParameters(true, diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/actions/AssignShortcutAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/actions/AssignShortcutAction.java index 1fb5d6afee79..4b34acede751 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/actions/AssignShortcutAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/actions/AssignShortcutAction.java @@ -50,14 +50,14 @@ public class AssignShortcutAction extends MavenAction { @Nullable private static String getGoalActionId(DataContext context) { - MavenProject project = MavenActionUtil.getMavenProject(context); - if (project == null) return null; - final List goals = MavenDataKeys.MAVEN_GOALS.getData(context); if (goals == null || goals.size() != 1) { return null; } + MavenProject project = MavenActionUtil.getMavenProject(context); + if (project == null) return null; + String goal = goals.get(0); return getShortcutsManager(context).getActionId(project.getPath(), goal); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/actions/ToggleBeforeRunTaskAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/actions/ToggleBeforeRunTaskAction.java index cbbf24fc8c6a..26dea4fc2634 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/actions/ToggleBeforeRunTaskAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/actions/ToggleBeforeRunTaskAction.java @@ -58,11 +58,12 @@ public class ToggleBeforeRunTaskAction extends MavenToggleAction { @Nullable protected static Pair getTaskDesc(DataContext context) { + List goals = MavenDataKeys.MAVEN_GOALS.getData(context); + if (goals == null || goals.size() != 1) return null; + MavenProject mavenProject = MavenActionUtil.getMavenProject(context); if (mavenProject == null) return null; - List goals = MavenDataKeys.MAVEN_GOALS.getData(context); - if (goals == null || goals.size() != 1) return null; return Pair.create(mavenProject, goals.get(0)); } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/actions/ToggleCompilerTasksAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/actions/ToggleCompilerTasksAction.java index cf17db4b7237..b610c1149d54 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/actions/ToggleCompilerTasksAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/actions/ToggleCompilerTasksAction.java @@ -53,12 +53,12 @@ public abstract class ToggleCompilerTasksAction extends MavenToggleAction { } protected static List getTasks(DataContext context) { - MavenProject project = MavenActionUtil.getMavenProject(context); - if (project == null) return Collections.emptyList(); - final List goals = MavenDataKeys.MAVEN_GOALS.getData(context); if (goals == null || goals.isEmpty()) return Collections.emptyList(); + MavenProject project = MavenActionUtil.getMavenProject(context); + if (project == null) return Collections.emptyList(); + List result = new ArrayList(); for (String each : goals) { result.add(new MavenCompilerTask(project.getPath(), each));