3189 fix group renaming

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

@@ -384,8 +384,8 @@ public GroupDialog(JabRefFrame jabrefFrame, AbstractGroup editedGroup) {
                             }
                         }
 
-                        resultingGroup = new ExplicitGroup(groupName, getContext(),
-                                keywordDelimiter);
+                        editedGroup.nameProperty().setValue(groupName);
+                        resultingGroup = editedGroup;
                     } else if (keywordsRadioButton.isSelected()) {
                         // regex is correct, otherwise OK would have been disabled
                         // therefore I don't catch anything here

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

@@ -10,6 +10,8 @@
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
@@ -42,7 +44,7 @@
 
 public class GroupNodeViewModel {
 
-    private final String displayName;
+    private StringProperty displayNameProperty;
     private final boolean isRoot;
     private final ObservableList<GroupNodeViewModel> children;
     private final BibDatabaseContext databaseContext;
@@ -64,7 +66,9 @@ public GroupNodeViewModel(BibDatabaseContext databaseContext, StateManager state
         this.localDragBoard = Objects.requireNonNull(localDragBoard);
 
         LatexToUnicodeFormatter formatter = new LatexToUnicodeFormatter();
-        displayName = formatter.format(groupNode.getName());
+        displayNameProperty = new SimpleStringProperty(formatter.format(groupNode.getGroup().getName()));
+        groupNode.getGroup().nameProperty().bindBidirectional(displayNameProperty);
+
         isRoot = groupNode.isRoot();
         if (groupNode.getGroup() instanceof AutomaticGroup) {
             AutomaticGroup automaticGroup = (AutomaticGroup) groupNode.getGroup();
@@ -134,7 +138,11 @@ public SimpleBooleanProperty hasChildrenProperty() {
     }
 
     public String getDisplayName() {
-        return displayName;
+        return displayNameProperty.getValue();
+    }
+
+    public StringProperty displayNameProperty() {
+        return displayNameProperty;
     }
 
     public boolean isRoot() {
@@ -166,7 +174,7 @@ public boolean equals(Object o) {
     @Override
     public String toString() {
         return "GroupNodeViewModel{" +
-                "displayName='" + displayName + '\'' +
+                "displayNameProperty='" + displayNameProperty + '\'' +
                 ", isRoot=" + isRoot +
                 ", icon='" + getIcon() + '\'' +
                 ", children=" + children +

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

@@ -115,7 +115,7 @@ public void initialize() {
         // Icon and group name
         mainColumn.setCellValueFactory(cellData -> cellData.getValue().valueProperty());
         mainColumn.setCellFactory(new ViewModelTreeTableCellFactory<GroupNodeViewModel, GroupNodeViewModel>()
-                .withText(GroupNodeViewModel::getDisplayName)
+                .withText(GroupNodeViewModel::displayNameProperty)
                 .withIcon(GroupNodeViewModel::getIcon)
                 .withTooltip(GroupNodeViewModel::getDescription));
 

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

@@ -145,7 +145,7 @@ public void addNewSubgroup(GroupNodeViewModel parent) {
             // TODO: Expand parent to make new group visible
             //parent.expand();
 
-            dialogService.notify(Localization.lang("Added group \"%0\".", group.getName()));
+            dialogService.notify(Localization.lang("Added group \"%0\".", parent.getDisplayName()));
             writeGroupChangesToMetaData();
         });
     }
@@ -161,20 +161,6 @@ public void editGroup(GroupNodeViewModel oldGroup) {
         Optional<AbstractGroup> newGroup = dialogService
                 .showCustomDialogAndWait(new GroupDialog(oldGroup.getGroupNode().getGroup()));
         newGroup.ifPresent(group -> {
-            // TODO: Keep assignments
-            boolean keepPreviousAssignments = dialogService.showConfirmationDialogAndWait(
-                    Localization.lang("Change of Grouping Method"),
-                    Localization.lang("Assign the original group's entries to this group?"));
-            //        WarnAssignmentSideEffects.warnAssignmentSideEffects(newGroup, panel.frame());
-            boolean removePreviousAssignents = (oldGroup.getGroupNode().getGroup() instanceof ExplicitGroup)
-                    && (group instanceof ExplicitGroup);
-
-            oldGroup.getGroupNode().setGroup(
-                    group,
-                    keepPreviousAssignments,
-                    removePreviousAssignents,
-                    stateManager.getEntriesInCurrentDatabase());
-
             // TODO: Add undo
             // Store undo information.
             // AbstractUndoableEdit undoAddPreviousEntries = null;

src/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java

@@ -1,5 +1,6 @@
 package org.jabref.gui.util;
 
+import javafx.beans.property.StringProperty;
 import javafx.event.EventHandler;
 import javafx.scene.Node;
 import javafx.scene.control.Tooltip;
@@ -19,12 +20,12 @@
  */
 public class ViewModelTreeTableCellFactory<S, T> implements Callback<TreeTableColumn<S, T>, TreeTableCell<S, T>> {
 
-    private Callback<S, String> toText;
+    private Callback<S, StringProperty> toText;
     private Callback<S, Node> toGraphic;
     private Callback<S, EventHandler<? super MouseEvent>> toOnMouseClickedEvent;
     private Callback<S, String> toTooltip;
 
-    public ViewModelTreeTableCellFactory<S, T> withText(Callback<S, String> toText) {
+    public ViewModelTreeTableCellFactory<S, T> withText(Callback<S, StringProperty> toText) {
         this.toText = toText;
         return this;
     }
@@ -66,7 +67,7 @@ protected void updateItem(T item, boolean empty) {
                 } else {
                     S viewModel = getTreeTableRow().getItem();
                     if (toText != null) {
-                        setText(toText.call(viewModel));
+                        textProperty().bindBidirectional(toText.call(viewModel));
                     }
                     if (toGraphic != null) {
                         setGraphic(toGraphic.call(viewModel));

src/main/java/org/jabref/model/groups/AbstractGroup.java

@@ -4,6 +4,8 @@
 import java.util.Objects;
 import java.util.Optional;
 
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
 import javafx.scene.paint.Color;
 
 import org.jabref.model.entry.BibEntry;
@@ -18,7 +20,7 @@ public abstract class AbstractGroup implements SearchMatcher {
     /**
      * The group's name.
      */
-    protected final String name;
+    protected final StringProperty name = new SimpleStringProperty();
     /**
      * The hierarchical context of the group.
      */
@@ -29,14 +31,14 @@ public abstract class AbstractGroup implements SearchMatcher {
     protected Optional<String> iconName = Optional.empty();
 
     protected AbstractGroup(String name, GroupHierarchyType context) {
-        this.name = name;
+        this.name.setValue(name);
         this.context = Objects.requireNonNull(context);
     }
 
     @Override
     public String toString() {
         return "AbstractGroup{" +
-                "name='" + name + '\'' +
+                "name='" + name.getValue() + '\'' +
                 ", context=" + context +
                 ", color=" + color +
                 ", isExpanded=" + isExpanded +
@@ -54,13 +56,13 @@ public boolean equals(Object other) {
             return false;
         }
         AbstractGroup that = (AbstractGroup) other;
-        return Objects.equals(this.name, that.name) && Objects.equals(this.description, that.description)
+        return Objects.equals(this.name.getValue(), that.name) && Objects.equals(this.description, that.description)
                 && Objects.equals(this.context, that.context);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(name, description, context);
+        return Objects.hash(name.getValue(), description, context);
     }
 
     public Optional<Color> getColor() {
@@ -122,6 +124,10 @@ public GroupHierarchyType getHierarchicalContext() {
      * Returns this group's name, e.g. for display in a list/tree.
      */
     public final String getName() {
+        return name.getValue();
+    }
+
+    public StringProperty nameProperty() {
         return name;
     }
 

src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java

@@ -37,7 +37,7 @@ public String getField() {
 
     @Override
     public AbstractGroup deepCopy() {
-        return new AutomaticKeywordGroup(this.name, this.context, field, this.keywordDelimiter, keywordHierarchicalDelimiter);
+        return new AutomaticKeywordGroup(this.name.getValue(), this.context, field, this.keywordDelimiter, keywordHierarchicalDelimiter);
     }
 
     @Override

src/main/java/org/jabref/model/groups/AutomaticPersonsGroup.java

@@ -38,7 +38,7 @@ public int hashCode() {
 
     @Override
     public AbstractGroup deepCopy() {
-        return new AutomaticPersonsGroup(this.name, this.context, this.field);
+        return new AutomaticPersonsGroup(this.name.getValue(), this.context, this.field);
     }
 
     @Override

src/main/java/org/jabref/model/groups/ExplicitGroup.java

@@ -64,7 +64,7 @@ public List<String> getLegacyEntryKeys() {
 
     @Override
     public int hashCode() {
-        return Objects.hash(name, context, legacyEntryKeys, iconName, color, description, isExpanded);
+        return Objects.hash(name.getValue(), context, legacyEntryKeys, iconName, color, description, isExpanded);
     }
 
     @Override

src/main/java/org/jabref/model/groups/TexGroup.java

@@ -49,7 +49,7 @@ public boolean isDynamic() {
     @Override
     public AbstractGroup deepCopy() {
         try {
-            return new TexGroup(name, context, filePath, auxParser, fileMonitor);
+            return new TexGroup(name.getValue(), context, filePath, auxParser, fileMonitor);
         } catch (IOException ex) {
             // This should never happen because we were able to monitor the file just fine until now
             LOGGER.error("Problem creating copy of group", ex);