Right click create group

CHANGELOG.md

@@ -11,6 +11,8 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 
 ### Added
 
+- We added the ability to add the current selection to a newly created group. [#11449](https://github.com/JabRef/jabref/issues/11449)
+
 ### Changed
 
 ### Fixed

src/main/java/module-info.java

@@ -46,7 +46,7 @@
     requires org.tinylog.impl;
 
     provides org.tinylog.writers.Writer
-    with org.jabref.gui.logging.GuiWriter;
+            with org.jabref.gui.logging.GuiWriter;
 
     // Preferences and XML
     requires java.prefs;

src/main/java/org/jabref/gui/StateManager.java

@@ -75,7 +75,12 @@ public class StateManager {
     private final ObservableList<String> searchHistory = FXCollections.observableArrayList();
 
     public StateManager() {
-        activeGroups.bind(Bindings.valueAt(selectedGroups, activeDatabase.orElseOpt(null).map(BibDatabaseContext::getUid)));
+        activeGroups.bind(Bindings.valueAt(
+            selectedGroups,
+            activeDatabase
+                .orElseOpt(null)
+                .map(BibDatabaseContext::getUid))
+            .orElse(FXCollections.observableArrayList()));
     }
 
     public ObservableList<SidePaneType> getVisibleSidePaneComponents() {
@@ -161,6 +166,7 @@ public void setActiveDatabase(BibDatabaseContext database) {
             LOGGER.info("No open database detected");
             activeDatabaseProperty().set(Optional.empty());
         } else {
+            selectedGroups.computeIfAbsent(database.getUid(), k -> FXCollections.emptyObservableList());
             activeDatabaseProperty().set(Optional.of(database));
         }
     }

src/main/java/org/jabref/gui/actions/ActionHelper.java

@@ -43,6 +43,26 @@ public static BooleanExpression needsStudyDatabase(StateManager stateManager) {
         return BooleanExpression.booleanExpression(binding);
     }
 
+    // Makes sure there is at least one group selected, and if there are multiple groups selected
+    // all have the same parent node.
+    public static BooleanExpression needsSelectedGroupsShareParent(StateManager stateManager) {
+        return Bindings.size(stateManager.activeGroupProperty()).isEqualTo(1)        // Is single element OR
+            .or(Bindings.size(stateManager.activeGroupProperty()).greaterThan(1)     // (Is multiple elements AND
+                .and(Bindings.createBooleanBinding(
+                    () -> stateManager.activeGroupProperty().stream()
+                        .allMatch(val ->                                                // The parent of the first element
+                            stateManager.activeGroupProperty()                          // is equal to the parent of all
+                                .getFirst()                                             // other elements
+                                .getParent()                                            // (including if they are null))
+                                    .map(node -> node.equals(val.getParent().get()))
+                                    .orElseGet(() -> val.getParent().isEmpty())),
+                stateManager.activeGroupProperty())));
+    }
+
+    public static BooleanExpression needsNotMultipleGroupsSelected(StateManager stateManager) {
+        return Bindings.size(stateManager.activeGroupProperty()).lessThan(2);
+    }
+
     public static BooleanExpression needsEntriesSelected(StateManager stateManager) {
         return Bindings.isNotEmpty(stateManager.getSelectedEntries());
     }

src/main/java/org/jabref/gui/actions/StandardActions.java

@@ -36,6 +36,8 @@ public enum StandardActions implements Action {
     EXTRACT_FILE_REFERENCES_OFFLINE(Localization.lang("Extract references from file (offline)"), IconTheme.JabRefIcons.FILE_STAR),
     OPEN_URL(Localization.lang("Open URL or DOI"), IconTheme.JabRefIcons.WWW, KeyBinding.OPEN_URL_OR_DOI),
     SEARCH_SHORTSCIENCE(Localization.lang("Search ShortScience")),
+    ADD_GROUP_FROM_SELECTION(Localization.lang("Add group from selection")),
+    ADD_SUBGROUP_FROM_SELECTION(Localization.lang("Add subgroup from selection")),
     MERGE_WITH_FETCHED_ENTRY(Localization.lang("Get bibliographic data from %0", "DOI/ISBN/...")),
     ATTACH_FILE(Localization.lang("Attach file"), IconTheme.JabRefIcons.ATTACH_FILE),
     ATTACH_FILE_FROM_URL(Localization.lang("Attach file from URL"), IconTheme.JabRefIcons.DOWNLOAD_FILE),

src/main/java/org/jabref/gui/exporter/ExportCommand.java

@@ -2,12 +2,12 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
+import javafx.collections.FXCollections;
 import javafx.stage.FileChooser;
 import javafx.util.Duration;
 
@@ -111,7 +111,7 @@ private void export(Path file, FileChooser.ExtensionFilter selectedExtensionFilt
             // All entries
             entries = stateManager.getActiveDatabase()
                                   .map(BibDatabaseContext::getEntries)
-                                  .orElse(Collections.emptyList());
+                                  .orElse(FXCollections.emptyObservableList());
         }
 
         List<Path> fileDirForDatabase = stateManager.getActiveDatabase()

src/main/java/org/jabref/gui/groups/GroupDialog.fxml

@@ -99,6 +99,12 @@
                             <Tooltip text="%Group containing entries cited in a given TeX file"/>
                         </tooltip>
                     </RadioButton>
+                    <RadioButton fx:id="selectionRadioButton" toggleGroup="$type" wrapText="true"
+                                 text="%Current selection">
+                        <tooltip>
+                            <Tooltip text="%Group all entries currently selected"/>
+                        </tooltip>
+                    </RadioButton>
                 </VBox>
                 <Separator orientation="VERTICAL"/>
                 <StackPane HBox.hgrow="ALWAYS">

src/main/java/org/jabref/gui/groups/GroupDialogView.java

@@ -41,6 +41,7 @@
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
 import org.jabref.model.groups.AbstractGroup;
 import org.jabref.model.groups.GroupHierarchyType;
 import org.jabref.model.groups.GroupTreeNode;
@@ -81,6 +82,7 @@ public class GroupDialogView extends BaseDialog<AbstractGroup> {
     @FXML private RadioButton searchRadioButton;
     @FXML private RadioButton autoRadioButton;
     @FXML private RadioButton texRadioButton;
+    @FXML private RadioButton selectionRadioButton;
 
     // Option Groups
     @FXML private TextField keywordGroupSearchTerm;
@@ -109,6 +111,8 @@ public class GroupDialogView extends BaseDialog<AbstractGroup> {
     private final BibDatabaseContext currentDatabase;
     private final @Nullable GroupTreeNode parentNode;
     private final @Nullable AbstractGroup editedGroup;
+    private final List<BibEntry> selectedEntries;
+    private final boolean preferUseSelection;
 
     private GroupDialogViewModel viewModel;
 
@@ -119,10 +123,22 @@ public class GroupDialogView extends BaseDialog<AbstractGroup> {
     public GroupDialogView(BibDatabaseContext currentDatabase,
                            @Nullable GroupTreeNode parentNode,
                            @Nullable AbstractGroup editedGroup,
-                           GroupDialogHeader groupDialogHeader) {
+                           GroupDialogHeader groupDialogHeader,
+                           List<BibEntry> selectedEntries) {
+        this(currentDatabase, parentNode, editedGroup, groupDialogHeader, selectedEntries, false);
+    }
+
+    public GroupDialogView(BibDatabaseContext currentDatabase,
+                           @Nullable GroupTreeNode parentNode,
+                           @Nullable AbstractGroup editedGroup,
+                           GroupDialogHeader groupDialogHeader,
+                           List<BibEntry> selectedEntries,
+                           boolean preferUseSelection) {
         this.currentDatabase = currentDatabase;
         this.parentNode = parentNode;
         this.editedGroup = editedGroup;
+        this.selectedEntries = selectedEntries;
+        this.preferUseSelection = preferUseSelection;
 
         ViewLoader.view(this)
                   .load()
@@ -172,7 +188,7 @@ public GroupDialogView(BibDatabaseContext currentDatabase,
 
     @FXML
     public void initialize() {
-        viewModel = new GroupDialogViewModel(dialogService, currentDatabase, preferencesService, editedGroup, parentNode, fileUpdateMonitor);
+        viewModel = new GroupDialogViewModel(dialogService, currentDatabase, preferencesService, editedGroup, parentNode, fileUpdateMonitor, selectedEntries, preferUseSelection);
 
         setResultConverter(viewModel::resultConverter);
 
@@ -200,6 +216,8 @@ public void initialize() {
         searchRadioButton.selectedProperty().bindBidirectional(viewModel.typeSearchProperty());
         autoRadioButton.selectedProperty().bindBidirectional(viewModel.typeAutoProperty());
         texRadioButton.selectedProperty().bindBidirectional(viewModel.typeTexProperty());
+        selectionRadioButton.selectedProperty().bindBidirectional(viewModel.typeSelectionProperty());
+        selectionRadioButton.disableProperty().bind(viewModel.entriesAreSelectedProperty().not());
 
         keywordGroupSearchTerm.textProperty().bindBidirectional(viewModel.keywordGroupSearchTermProperty());
         keywordGroupSearchField.textProperty().bindBidirectional(viewModel.keywordGroupSearchFieldProperty());
@@ -247,7 +265,7 @@ public void initialize() {
             validationVisualizer.initVisualization(viewModel.keywordRegexValidationStatus(), keywordGroupSearchTerm);
             validationVisualizer.initVisualization(viewModel.keywordSearchTermEmptyValidationStatus(), keywordGroupSearchTerm);
             validationVisualizer.initVisualization(viewModel.keywordFieldEmptyValidationStatus(), keywordGroupSearchField);
-            validationVisualizer.initVisualization(viewModel.texGroupFilePathValidatonStatus(), texGroupFilePath);
+            validationVisualizer.initVisualization(viewModel.texGroupFilePathValidationStatus(), texGroupFilePath);
             nameField.requestFocus();
         });
 
@@ -261,10 +279,14 @@ public void initialize() {
                 viewModel.colorFieldProperty().setValue(IconTheme.getDefaultGroupColor());
                 return;
             }
-            List<Color> colorsOfSiblings = parentNode.getChildren().stream().map(child -> child.getGroup().getColor())
-                                                     .flatMap(Optional::stream)
-                                                     .toList();
-            Optional<Color> parentColor = parentGroup().getColor();
+
+            List<Color> colorsOfSiblings = parentNode.getChildren()
+                    .stream()
+                    .map(GroupTreeNode::getGroup)
+                    .map(AbstractGroup::getColor)
+                    .flatMap(Optional::stream)
+                    .toList();
+            Optional<Color> parentColor = parentNode.getGroup().getColor();
             Color color;
             color = parentColor.map(value -> GroupColorPicker.generateColor(colorsOfSiblings, value)).orElseGet(() -> GroupColorPicker.generateColor(colorsOfSiblings));
             viewModel.colorFieldProperty().setValue(color);

src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java

@@ -33,6 +33,7 @@
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.Keyword;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.groups.AbstractGroup;
@@ -76,6 +77,7 @@ public class GroupDialogViewModel {
     private final BooleanProperty typeSearchProperty = new SimpleBooleanProperty();
     private final BooleanProperty typeAutoProperty = new SimpleBooleanProperty();
     private final BooleanProperty typeTexProperty = new SimpleBooleanProperty();
+    private final BooleanProperty typeSelectionProperty = new SimpleBooleanProperty();
 
     // Option Groups
     private final StringProperty keywordGroupSearchTermProperty = new SimpleStringProperty("");
@@ -94,6 +96,7 @@ public class GroupDialogViewModel {
     private final StringProperty autoGroupPersonsFieldProperty = new SimpleStringProperty("");
 
     private final StringProperty texGroupFilePathProperty = new SimpleStringProperty("");
+    private final BooleanProperty entriesAreSelected = new SimpleBooleanProperty(false);
 
     private Validator nameValidator;
     private Validator nameContainsDelimiterValidator;
@@ -112,24 +115,41 @@ public class GroupDialogViewModel {
     private final AbstractGroup editedGroup;
     private final GroupTreeNode parentNode;
     private final FileUpdateMonitor fileUpdateMonitor;
+    private final List<BibEntry> selectedEntries;
+    private final boolean useSelectedEntries;
 
     public GroupDialogViewModel(DialogService dialogService,
                                 BibDatabaseContext currentDatabase,
                                 PreferencesService preferencesService,
                                 @Nullable AbstractGroup editedGroup,
                                 @Nullable GroupTreeNode parentNode,
-                                FileUpdateMonitor fileUpdateMonitor) {
+                                FileUpdateMonitor fileUpdateMonitor,
+                                List<BibEntry> selectedEntries,
+                                boolean useSelectedEntries) {
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.currentDatabase = currentDatabase;
         this.editedGroup = editedGroup;
         this.parentNode = parentNode;
         this.fileUpdateMonitor = fileUpdateMonitor;
+        this.selectedEntries = selectedEntries;
+        this.useSelectedEntries = useSelectedEntries;
 
         setupValidation();
         setValues();
     }
 
+    public GroupDialogViewModel(
+            DialogService dialogService,
+            BibDatabaseContext currentDatabase,
+            PreferencesService preferencesService,
+            @Nullable AbstractGroup editedGroup,
+            @Nullable GroupTreeNode parentNode,
+            FileUpdateMonitor fileUpdateMonitor
+    ) {
+        this(dialogService, currentDatabase, preferencesService, editedGroup, parentNode, fileUpdateMonitor, new ArrayList<>(), false);
+    }
+
     private void setupValidation() {
         validator = new CompositeValidator();
 
@@ -246,7 +266,7 @@ private void setupValidation() {
                             return false;
                         }
                         return FileUtil.getFileExtension(input)
-                                .map(extension -> "aux".equalsIgnoreCase(extension))
+                                .map("aux"::equalsIgnoreCase)
                                 .orElse(false);
                     }
                 },
@@ -371,6 +391,14 @@ public AbstractGroup resultConverter(ButtonType button) {
                         new DefaultAuxParser(new BibDatabase()),
                         fileUpdateMonitor,
                         currentDatabase.getMetaData());
+            } else if (typeSelectionProperty.getValue()) {
+                ExplicitGroup tempResultingGroup = new ExplicitGroup(
+                        groupName,
+                        groupHierarchySelectedProperty.getValue(),
+                        preferencesService.getBibEntryPreferences().getKeywordSeparator()
+                );
+                tempResultingGroup.add(selectedEntries);
+                resultingGroup = tempResultingGroup;
             }
 
             if (resultingGroup != null) {
@@ -405,7 +433,16 @@ public void setValues() {
                           .ifPresent(iconProperty::setValue);
                 parentNode.getGroup().getColor().ifPresent(color -> colorUseProperty.setValue(true));
             }
-            typeExplicitProperty.setValue(true);
+            if (!selectedEntries.isEmpty()) {
+                entriesAreSelected.setValue(true);
+                if (selectedEntries.size() > 1 || useSelectedEntries) {
+                    typeSelectionProperty.setValue(true);
+                } else {
+                    typeExplicitProperty.setValue(true);
+                }
+            } else {
+                typeExplicitProperty.setValue(true);
+            }
             groupHierarchySelectedProperty.setValue(preferencesService.getGroupsPreferences().getDefaultHierarchicalContext());
             autoGroupKeywordsOptionProperty.setValue(Boolean.TRUE);
         } else {
@@ -535,7 +572,7 @@ public ValidationStatus keywordSearchTermEmptyValidationStatus() {
         return keywordSearchTermEmptyValidator.getValidationStatus();
     }
 
-    public ValidationStatus texGroupFilePathValidatonStatus() {
+    public ValidationStatus texGroupFilePathValidationStatus() {
         return texGroupFilePathValidator.getValidationStatus();
     }
 
@@ -587,6 +624,10 @@ public BooleanProperty typeTexProperty() {
         return typeTexProperty;
     }
 
+    public BooleanProperty typeSelectionProperty() {
+        return typeSelectionProperty;
+    }
+
     public StringProperty keywordGroupSearchTermProperty() {
         return keywordGroupSearchTermProperty;
     }
@@ -638,4 +679,8 @@ public StringProperty autoGroupPersonsFieldProperty() {
     public StringProperty texGroupFilePathProperty() {
         return texGroupFilePathProperty;
     }
+
+    public BooleanProperty entriesAreSelectedProperty() {
+        return entriesAreSelected;
+    }
 }