Maven: not-null assertion fix for Maven actions

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/ReimportAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/ReimportAction.java
index b40c7f0a4ff3f6ae1d2947bdbb37757cdf77bbfd..5e104b6bb1576209da2a7119d8463126179ce905 100644 (file)
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/ReimportAction.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/ReimportAction.java
@@ -17,11 +17,12 @@ package org.jetbrains.idea.maven.project.actions;
 
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import org.jetbrains.idea.maven.project.MavenProjectsManager;
+import org.jetbrains.idea.maven.utils.actions.MavenActionUtil;
 
 public class ReimportAction extends MavenProjectsManagerAction {
   @Override
   protected boolean isAvailable(AnActionEvent e) {
-    return true;
+    return MavenActionUtil.hasProject(e.getDataContext());
   }
 
   @Override

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/RemoveManagedFilesAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/RemoveManagedFilesAction.java
index a55446e3f83f917ad29daaf6a762855daed33ea7..eda90d0ab8b0beb2309dffd2025d3f11bee00753 100644 (file)
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/RemoveManagedFilesAction.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/RemoveManagedFilesAction.java
@@ -24,6 +24,8 @@ import org.jetbrains.idea.maven.utils.actions.MavenActionUtil;
 public class RemoveManagedFilesAction extends MavenAction {
   @Override
   protected boolean isAvailable(AnActionEvent e) {
+    if (!super.isAvailable(e)) return false;
+
     final DataContext context = e.getDataContext();
     for (VirtualFile each : MavenActionUtil.getMavenProjectsFiles(context)) {
       if (MavenActionUtil.getProjectsManager(context).isManagedFile(each)) return true;

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/actions/MavenAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/actions/MavenAction.java
index b5f8af2aa2824e67f287554219f36e0a5f1e772e..812dbb085dcf0c799d96e1dbef9b9221b9c464f9 100644 (file)
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/actions/MavenAction.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/actions/MavenAction.java
@@ -30,7 +30,7 @@ public abstract class MavenAction extends AnAction implements DumbAware {
   }
 
   protected boolean isAvailable(AnActionEvent e) {
-    return MavenActionUtil.getProject(e.getDataContext()) != null;
+    return MavenActionUtil.hasProject(e.getDataContext());
   }
 
   protected boolean isVisible(AnActionEvent e) {

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/actions/MavenActionUtil.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/actions/MavenActionUtil.java
index 26114abaefb315ff9b7dffa6f9339cc3c9257ef3..4ac420cdb3045b82beee36907aa72f076e614380 100644 (file)
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/actions/MavenActionUtil.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/actions/MavenActionUtil.java
@@ -34,6 +34,10 @@ public class MavenActionUtil {
   private MavenActionUtil() {
   }
 
+  public static boolean hasProject(DataContext context) {
+    return PlatformDataKeys.PROJECT.getData(context) != null;
+  }
+
   @NotNull
   public static Project getProject(DataContext context) {
     return PlatformDataKeys.PROJECT.getData(context);

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/actions/MavenToggleAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/actions/MavenToggleAction.java
index 09ad1d396c53689f2f3f928036fa5dde2646ba20..942c821c531a3d9738375e704da2603e29dadf0b 100644 (file)
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/actions/MavenToggleAction.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/actions/MavenToggleAction.java
@@ -27,7 +27,7 @@ public abstract class MavenToggleAction extends ToggleAction implements DumbAwar
   }
 
   protected boolean isAvailable(AnActionEvent e) {
-    return true;
+    return MavenActionUtil.hasProject(e.getDataContext());
   }
 
   public final boolean isSelected(AnActionEvent e) {