Merge pull request #8936 from mbien/fix-git-context-menu_delivery

Fixes git DeleteBranchAction activation logic.

Author: ebarboni

ide/git/src/org/netbeans/modules/git/ui/branch/Bundle.properties

@@ -32,8 +32,9 @@ LBL_DeleteBranchAction.progressName=Deleting Branch {0}
 LBL_DeleteBranchAction.notMerged=Branch Not Fully Merged
 MSG_DeleteBranchAction.notMerged=Branch {0} has not been fully merged yet.\n\
 Do you still want to delete the branch?
+MSG_DeleteBranchAction.noOtherBranches=Repository does not have any other branches
 LBL_DeleteBranchAction.confirmation=Delete Branch
-MSG_DeleteBranchAction.confirmation=Do you really want to delete branch {0}
+MSG_DeleteBranchAction.confirmation=Do you really want to delete branch {0}?
 CreateBranchPanel.cbCheckoutBranch.text=Check&out Created Branch
 CreateBranchPanel.cbCheckoutBranch.TTtext=Checkout the branch right after it is created
 

ide/git/src/org/netbeans/modules/git/ui/branch/DeleteBranchAction.java

@@ -22,7 +22,6 @@
 import org.netbeans.modules.git.client.GitClientExceptionHandler;
 import java.io.File;
 import java.util.HashMap;
-import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.netbeans.libs.git.GitBranch;
@@ -38,7 +37,6 @@
 import org.openide.NotifyDescriptor;
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionRegistration;
-import org.openide.nodes.Node;
 import org.openide.util.NbBundle;
 
 /**
@@ -58,6 +56,9 @@ protected void performAction(File repository, File[] roots, VCSContext context)
         branches.remove(info.getActiveBranch().getName());
 
         if (branches.isEmpty()) {
+            DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(
+                    NbBundle.getMessage(DeleteBranchAction.class, "MSG_DeleteBranchAction.noOtherBranches")
+            ));
             return;
         }
 
@@ -67,23 +68,6 @@ protected void performAction(File repository, File[] roots, VCSContext context)
         }
     }
 
-    @Override
-    protected boolean enable(Node[] activatedNodes) {
-        if (!super.enable(activatedNodes)) {
-            return false;
-        }
-
-        // require 2+ branches
-        Map.Entry<File, File[]> actionRoots = getActionRoots(getCurrentContext(activatedNodes));
-        if (actionRoots != null) {
-            RepositoryInfo info = RepositoryInfo.getInstance(actionRoots.getKey());
-
-            return info != null && info.getBranches().size() > 1;
-        }
-
-        return false;
-    }
-
     public void deleteBranch(final File repository, final String branchName) {
         NotifyDescriptor nd = new NotifyDescriptor.Confirmation(NbBundle.getMessage(DeleteBranchAction.class, "MSG_DeleteBranchAction.confirmation", branchName), //NOI18N
             NbBundle.getMessage(DeleteBranchAction.class, "LBL_DeleteBranchAction.confirmation"), //NOI18N

ide/git/src/org/netbeans/modules/git/utils/GitUtils.java

@@ -417,9 +417,8 @@ public static Set<File> getRepositoryRoots (Collection<File> roots) {
     }
 
     /**
-     *
-     * @param ctx
-     * @return
+     * Returns the repository and its roots. May open a selection dialog if
+     * there is more than one repository in the provided context.
      */
     public static HashMap.SimpleImmutableEntry<File, File[]> getActionRoots(VCSContext ctx) {
         Set<File> rootsSet = ctx.getRootFiles();