Revoke removal actions if right-clicked group is not in SelectedGroup

JabRef · Oct 28, 2022 · 610dc63 · 610dc63
1 parent eee8322
commit 610dc63
Showing 1 changed file with 31 additions and 27 deletions.
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
@@ -399,39 +399,43 @@ public void removeSubgroups(GroupNodeViewModel group) {
 
     public void removeGroupKeepSubgroups(GroupNodeViewModel group) {
         boolean confirmed;
-        if (selectedGroups.size() <= 1) {
-            confirmed = dialogService.showConfirmationDialogAndWait(
-                    Localization.lang("Remove group"),
-                    Localization.lang("Remove group \"%0\" and keep its subgroups?", group.getDisplayName()),
-                    Localization.lang("Remove"));
-        } else {
-            confirmed = dialogService.showConfirmationDialogAndWait(
-                    Localization.lang("Remove groups"),
-                    Localization.lang("Remove all selected groups and keep their subgroups?"),
-                    Localization.lang("Remove all"));
-        }
+        if (selectedGroups.contains(group)) {
+            if (selectedGroups.size() <= 1) {
 
-        if (confirmed) {
-            // TODO: Add undo
-            // final UndoableAddOrRemoveGroup undo = new UndoableAddOrRemoveGroup(groupsRoot, node, UndoableAddOrRemoveGroup.REMOVE_NODE_KEEP_CHILDREN);
-            // panel.getUndoManager().addEdit(undo);
+                confirmed = dialogService.showConfirmationDialogAndWait(
+                        Localization.lang("Remove group"),
+                        Localization.lang("Remove group \"%0\" and keep its subgroups?", group.getDisplayName()),
+                        Localization.lang("Remove"));
+            } else {
+                confirmed = dialogService.showConfirmationDialogAndWait(
+                        Localization.lang("Remove groups"),
+                        Localization.lang("Remove all selected groups and keep their subgroups?"),
+                        Localization.lang("Remove all"));
+            }
 
-            List<GroupNodeViewModel> selectedGroupNodes = new ArrayList<>(selectedGroups);
-            selectedGroupNodes.forEach(eachNode -> {
-                GroupTreeNode groupNode = eachNode.getGroupNode();
+            if (confirmed) {
+                // TODO: Add undo
+                // final UndoableAddOrRemoveGroup undo = new UndoableAddOrRemoveGroup(groupsRoot, node, UndoableAddOrRemoveGroup.REMOVE_NODE_KEEP_CHILDREN);
+                // panel.getUndoManager().addEdit(undo);
 
-                groupNode.getParent()
-                         .ifPresent(parent -> groupNode.moveAllChildrenTo(parent, parent.getIndexOfChild(groupNode).get()));
-                groupNode.removeFromParent();
-            });
+                List<GroupNodeViewModel> selectedGroupNodes = new ArrayList<>(selectedGroups);
+                selectedGroupNodes.forEach(eachNode -> {
+                    GroupTreeNode groupNode = eachNode.getGroupNode();
 
-            if (selectedGroupNodes.size() > 1) {
-                dialogService.notify(Localization.lang("Removed all selected groups."));
-            } else {
-                dialogService.notify(Localization.lang("Removed group \"%0\".", group.getDisplayName()));
+                    groupNode.getParent()
+                             .ifPresent(parent -> groupNode.moveAllChildrenTo(parent, parent.getIndexOfChild(groupNode).get()));
+                    groupNode.removeFromParent();
+                });
+
+                if (selectedGroupNodes.size() > 1) {
+                    dialogService.notify(Localization.lang("Removed all selected groups."));
+                } else {
+                    dialogService.notify(Localization.lang("Removed group \"%0\".", group.getDisplayName()));
+                }
+                writeGroupChangesToMetaData();
             }
-            writeGroupChangesToMetaData();
         }
+
     }
 
     /**