Show merge entries for modified entries

src/main/java/org/jabref/gui/collab/ChangeDisplayDialog.java

@@ -24,8 +24,10 @@ class ChangeDisplayDialog extends BaseDialog<Boolean> {
     private final ListView<DatabaseChangeViewModel> tree;
     private final BorderPane infoPanel = new BorderPane();
     private final CheckBox cb = new CheckBox(Localization.lang("Accept change"));
+    private final BibDatabaseContext database;
 
     public ChangeDisplayDialog(BibDatabaseContext database, List<DatabaseChangeViewModel> changes) {
+        this.database = database;
         this.setTitle(Localization.lang("External changes"));
         this.getDialogPane().setPrefSize(800, 600);
 
@@ -43,9 +45,8 @@ public ChangeDisplayDialog(BibDatabaseContext database, List<DatabaseChangeViewM
         infoPanel.setCenter(rootInfo);
 
         getDialogPane().getButtonTypes().setAll(
-                new ButtonType(Localization.lang("Accept changes"), ButtonBar.ButtonData.APPLY),
-                ButtonType.CANCEL
-        );
+                                                new ButtonType(Localization.lang("Accept changes"), ButtonBar.ButtonData.APPLY),
+                                                ButtonType.CANCEL);
 
         setResultConverter(button -> {
             if (button == ButtonType.CANCEL) {
@@ -66,7 +67,7 @@ public ChangeDisplayDialog(BibDatabaseContext database, List<DatabaseChangeViewM
         });
 
         EasyBind.subscribe(cb.selectedProperty(), selected -> {
-            if (selected != null && tree.getSelectionModel().getSelectedItem() != null) {
+            if ((selected != null) && (tree.getSelectionModel().getSelectedItem() != null)) {
                 tree.getSelectionModel().getSelectedItem().setAccepted(selected);
             }
         });

src/main/java/org/jabref/gui/collab/ChangeScanner.java

@@ -82,6 +82,6 @@ private DatabaseChangeViewModel createBibEntryDiff(BibEntryDiff diff) {
             return new EntryDeleteChangeViewModel(diff.getOriginalEntry());
         }
 
-        return new EntryChangeViewModel(diff.getOriginalEntry(), diff.getNewEntry());
+        return new EntryChangeViewModel(diff.getOriginalEntry(), diff.getNewEntry(), database);
     }
 }

src/main/java/org/jabref/gui/collab/EntryAddChangeViewModel.java

@@ -11,7 +11,7 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
-class EntryAddChangeViewModel extends DatabaseChangeViewModel {
+class EntryAddChangeViewModel extends DatabaseChangeViewModel  {
 
     private final BibEntry diskEntry;
 

src/main/java/org/jabref/gui/collab/EntryChangeViewModel.java

@@ -1,24 +1,15 @@
 package org.jabref.gui.collab;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.TreeSet;
-
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.layout.VBox;
 
+import org.jabref.gui.mergeentries.MergeEntries;
 import org.jabref.gui.undo.NamedCompound;
-import org.jabref.gui.undo.UndoableFieldChange;
+import org.jabref.gui.undo.UndoableInsertEntry;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.strings.StringUtil;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,41 +18,37 @@ class EntryChangeViewModel extends DatabaseChangeViewModel {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(EntryChangeViewModel.class);
 
-    private final List<FieldChangeViewModel> fieldChanges = new ArrayList<>();
+    private final BibEntry firstEntry;
+
+    private final BibEntry secondEntry;
 
-    public EntryChangeViewModel(BibEntry entry, BibEntry newEntry) {
+    private final MergeEntries mergePanel;
+
+    public EntryChangeViewModel(BibEntry entry, BibEntry newEntry, BibDatabaseContext database) {
         super();
+
+        this.firstEntry = entry;
+        this.secondEntry = newEntry;
+
         name = entry.getCiteKeyOptional()
                     .map(key -> Localization.lang("Modified entry") + ": '" + key + '\'')
                     .orElse(Localization.lang("Modified entry"));
 
-        Set<Field> allFields = new TreeSet<>(Comparator.comparing(Field::getName));
-        allFields.addAll(entry.getFields());
-        allFields.addAll(newEntry.getFields());
-
-        for (Field field : allFields) {
-            Optional<String> value = entry.getField(field);
-            Optional<String> newValue = newEntry.getField(field);
-
-            if (value.isPresent() && newValue.isPresent()) {
-                if (!value.equals(newValue)) {
-                    // Modified externally.
-                    fieldChanges.add(new FieldChangeViewModel(entry, field, value.get(), newValue.get()));
-                }
-            } else {
-                // Added/removed externally.
-                fieldChanges.add(new FieldChangeViewModel(entry, field, value.orElse(null), newValue.orElse(null)));
-            }
-        }
+        mergePanel = new MergeEntries(firstEntry, secondEntry, database.getMode());
     }
 
     @Override
     public void makeChange(BibDatabaseContext database, NamedCompound undoEdit) {
-        for (DatabaseChangeViewModel c : fieldChanges) {
-            if (c.isAccepted()) {
-                c.makeChange(database, undoEdit);
-            }
-        }
+        database.getDatabase().insertEntry(mergePanel.getMergeEntry());
+        undoEdit.addEdit(new UndoableInsertEntry(database.getDatabase(), mergePanel.getMergeEntry()));
+    }
+
+    public BibEntry getFirst() {
+        return this.firstEntry;
+    }
+
+    public BibEntry getSecond() {
+        return this.secondEntry;
     }
 
     @Override
@@ -70,56 +57,7 @@ public Node description() {
         Label header = new Label(name);
         header.getStyleClass().add("sectionHeader");
         container.getChildren().add(header);
-
-        for (FieldChangeViewModel change : fieldChanges) {
-            container.getChildren().add(change.description());
-        }
-
+        container.getChildren().add(mergePanel);
         return container;
     }
-
-    static class FieldChangeViewModel extends DatabaseChangeViewModel {
-
-        private final BibEntry entry;
-        private final Field field;
-        private final String value;
-        private final String newValue;
-
-        public FieldChangeViewModel(BibEntry entry, Field field, String value, String newValue) {
-            super(field.getName());
-            this.entry = entry;
-            this.field = field;
-            this.value = value;
-            this.newValue = newValue;
-        }
-
-        @Override
-        public void makeChange(BibDatabaseContext database, NamedCompound undoEdit) {
-            Optional<FieldChange> change;
-            if (StringUtil.isBlank(newValue)) {
-                change = entry.clearField(field);
-            } else {
-                change = entry.setField(field, newValue);
-            }
-
-            change.map(UndoableFieldChange::new).ifPresent(undoEdit::addEdit);
-        }
-
-        @Override
-        public Node description() {
-            VBox container = new VBox();
-            container.getChildren().add(new Label(Localization.lang("Modification of field") + " " + field.getDisplayName()));
-
-            if (StringUtil.isNotBlank(newValue)) {
-                container.getChildren().add(new Label(Localization.lang("Value set externally") + ": " + newValue));
-            } else {
-                container.getChildren().add(new Label(Localization.lang("Value cleared externally")));
-            }
-
-            container.getChildren().add(new Label(Localization.lang("Current value") + ": " + value));
-
-            return container;
-        }
-
-    }
 }

src/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java

@@ -14,7 +14,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-class EntryDeleteChangeViewModel extends DatabaseChangeViewModel {
+class EntryDeleteChangeViewModel extends DatabaseChangeViewModel   {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(EntryDeleteChangeViewModel.class);
     private final BibEntry entry;

src/main/resources/l10n/JabRef_en.properties

@@ -524,8 +524,6 @@ Memory\ stick\ mode=Memory stick mode
 Merged\ external\ changes=Merged external changes
 Merge\ fields=Merge fields
 
-Modification\ of\ field=Modification of field
-
 Modified\ group\ "%0".=Modified group "%0".
 
 Modified\ groups=Modified groups