From f463c8d48e26dec87df32ca76d13dbc0a08c3de6 Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Thu, 28 Apr 2011 14:35:49 +0200 Subject: [PATCH] Maven: 'Maven goal before run' fixed (IDEA-68421) --- .../idea/maven/navigator/SelectMavenGoalDialog.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectMavenGoalDialog.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectMavenGoalDialog.java index 972b5fc82742..24f904a13855 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectMavenGoalDialog.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectMavenGoalDialog.java @@ -16,6 +16,7 @@ package org.jetbrains.idea.maven.navigator; import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.io.FileUtil; import com.intellij.ui.treeStructure.SimpleNode; @@ -27,9 +28,11 @@ public class SelectMavenGoalDialog extends SelectFromMavenProjectsDialog { super(project, title, MavenProjectsStructure.GoalNode.class, new NodeSelector() { public boolean shouldSelect(SimpleNode node) { if (node instanceof MavenProjectsStructure.GoalNode) { - MavenProjectsStructure.GoalNode goalNode = (MavenProjectsStructure.GoalNode)node; - return FileUtil.pathsEqual(goalNode.getProjectPath(), projectPath) - && goalNode.getGoal().equals(goal); + MavenProjectsStructure.GoalNode eachGoalNode = (MavenProjectsStructure.GoalNode)node; + String goalNodeProjectPath = eachGoalNode.getProjectPath(); + return goalNodeProjectPath != null && projectPath != null + && FileUtil.pathsEqual(goalNodeProjectPath, projectPath) + && Comparing.equal(eachGoalNode.getGoal(), goal); } return false; }