[WIP][GSOC22] - C - Improve the external changes resolver dialog

CHANGELOG.md

@@ -19,6 +19,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We improved the Citavi Importer to also import so called Knowledge-items into the field `comment` of the corresponding entry [#9025](https://github.com/JabRef/jabref/issues/9025)
 - We removed wrapping of string constants when writing to a `.bib` file.
 - We changed the button label from "Return to JabRef" to "Return to library" to better indicate the purpose of the action.
+- We reworked the External Changes Resolver dialog. [#9021](https://github.com/JabRef/jabref/pull/9021)
 
 ### Fixed
 

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

@@ -829,7 +829,7 @@ private MenuBar createMenu() {
 
         quality.getItems().addAll(
                 factory.createMenuItem(StandardActions.FIND_DUPLICATES, new DuplicateSearch(this, dialogService, stateManager)),
-                factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(this, dialogService, stateManager)),
+                factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(dialogService, stateManager)),
                 factory.createMenuItem(StandardActions.CHECK_INTEGRITY, new IntegrityCheckAction(this, stateManager, Globals.TASK_EXECUTOR)),
                 factory.createMenuItem(StandardActions.CLEANUP_ENTRIES, new CleanupAction(this, this.prefs, dialogService, stateManager)),
 

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

@@ -7,6 +7,16 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
+import org.jabref.gui.collab.entryadd.EntryAdd;
+import org.jabref.gui.collab.entrychange.EntryChange;
+import org.jabref.gui.collab.entrydelete.EntryDelete;
+import org.jabref.gui.collab.groupchange.GroupChange;
+import org.jabref.gui.collab.metedatachange.MetadataChange;
+import org.jabref.gui.collab.preamblechange.PreambleChange;
+import org.jabref.gui.collab.stringadd.BibTexStringAdd;
+import org.jabref.gui.collab.stringchange.BibTexStringChange;
+import org.jabref.gui.collab.stringdelete.BibTexStringDelete;
+import org.jabref.gui.collab.stringrename.BibTexStringRename;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.logic.bibtex.comparator.BibDatabaseDiff;
 import org.jabref.logic.bibtex.comparator.BibEntryDiff;
@@ -31,6 +41,8 @@ public class ChangeScanner {
     private final StateManager stateManager;
     private final ThemeManager themeManager;
 
+    private final ExternalChangeResolverFactory externalChangeResolverFactory;
+
     public ChangeScanner(BibDatabaseContext database,
                          DialogService dialogService,
                          PreferencesService preferencesService,
@@ -41,15 +53,16 @@ public ChangeScanner(BibDatabaseContext database,
         this.preferencesService = preferencesService;
         this.stateManager = stateManager;
         this.themeManager = themeManager;
+        this.externalChangeResolverFactory = new ExternalChangeResolverFactory(dialogService, database);
     }
 
-    public List<DatabaseChangeViewModel> scanForChanges() {
+    public List<ExternalChange> scanForChanges() {
         if (database.getDatabasePath().isEmpty()) {
             return Collections.emptyList();
         }
 
         try {
-            List<DatabaseChangeViewModel> changes = new ArrayList<>();
+            List<ExternalChange> changes = new ArrayList<>();
 
             // Parse the modified file
             // Important: apply all post-load actions
@@ -61,10 +74,12 @@ public List<DatabaseChangeViewModel> scanForChanges() {
             // Start looking at changes.
             BibDatabaseDiff differences = BibDatabaseDiff.compare(database, databaseOnDisk);
             differences.getMetaDataDifferences().ifPresent(diff -> {
-                changes.add(new MetaDataChangeViewModel(diff, preferencesService));
-                diff.getGroupDifferences().ifPresent(groupDiff -> changes.add(new GroupChangeViewModel(groupDiff)));
+                changes.add(new MetadataChange(diff, database, externalChangeResolverFactory));
+                diff.getGroupDifferences().ifPresent(groupDiff -> changes.add(new GroupChange(
+                        groupDiff, database, externalChangeResolverFactory
+                )));
             });
-            differences.getPreambleDifferences().ifPresent(diff -> changes.add(new PreambleChangeViewModel(diff)));
+            differences.getPreambleDifferences().ifPresent(diff -> changes.add(new PreambleChange(diff, database, externalChangeResolverFactory)));
             differences.getBibStringDifferences().forEach(diff -> changes.add(createBibStringDiff(diff)));
             differences.getEntryDifferences().forEach(diff -> changes.add(createBibEntryDiff(diff)));
             return changes;
@@ -74,31 +89,31 @@ public List<DatabaseChangeViewModel> scanForChanges() {
         }
     }
 
-    private DatabaseChangeViewModel createBibStringDiff(BibStringDiff diff) {
-        if (diff.getOriginalString() == null) {
-            return new StringAddChangeViewModel(diff.getNewString());
+    private ExternalChange createBibStringDiff(BibStringDiff diff) {
+         if (diff.getOriginalString() == null) {
+            return new BibTexStringAdd(diff.getNewString(), database, externalChangeResolverFactory);
         }
 
         if (diff.getNewString() == null) {
-            return new StringRemoveChangeViewModel(diff.getOriginalString());
+            return new BibTexStringDelete(diff.getOriginalString(), database, externalChangeResolverFactory);
         }
 
         if (diff.getOriginalString().getName().equals(diff.getNewString().getName())) {
-            return new StringChangeViewModel(diff.getOriginalString(), diff.getNewString());
+            return new BibTexStringChange(diff.getOriginalString(), diff.getNewString(), database, externalChangeResolverFactory);
         }
 
-        return new StringNameChangeViewModel(diff.getOriginalString(), diff.getNewString());
+        return new BibTexStringRename(diff.getOriginalString(), diff.getNewString(), database, externalChangeResolverFactory);
     }
 
-    private DatabaseChangeViewModel createBibEntryDiff(BibEntryDiff diff) {
+    private ExternalChange createBibEntryDiff(BibEntryDiff diff) {
         if (diff.getOriginalEntry() == null) {
-            return new EntryAddChangeViewModel(diff.getNewEntry(), preferencesService, dialogService, stateManager, themeManager);
+            return new EntryAdd(diff.getNewEntry(), database, externalChangeResolverFactory);
         }
 
         if (diff.getNewEntry() == null) {
-            return new EntryDeleteChangeViewModel(diff.getOriginalEntry());
+            return new EntryDelete(diff.getOriginalEntry(), database, externalChangeResolverFactory);
         }
 
-        return new EntryChangeViewModel(diff.getOriginalEntry(), diff.getNewEntry());
+        return new EntryChange(diff.getOriginalEntry(), diff.getNewEntry(), database, externalChangeResolverFactory);
     }
 }

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

@@ -3,5 +3,5 @@
 import java.util.List;
 
 public interface DatabaseChangeListener {
-    void databaseChanged(List<DatabaseChangeViewModel> changes);
+    void databaseChanged(List<ExternalChange> changes);
 }

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

@@ -67,7 +67,7 @@ public DatabaseChangeMonitor(BibDatabaseContext database,
                 Localization.lang("The library has been modified by another program."),
                 List.of(new Action(Localization.lang("Dismiss changes"), event -> notificationPane.hide()),
                         new Action(Localization.lang("Review changes"), event -> {
-                            dialogService.showCustomDialogAndWait(new ChangeDisplayDialog(database, changes));
+                            dialogService.showCustomDialogAndWait(new ExternalChangesResolverDialog(changes, database, dialogService, stateManager, themeManager, preferencesService));
                             notificationPane.hide();
                         })),
                 Duration.ZERO));