fix for Library is marked as unsaved (*) after accepting changes from the file JabRef#11027

Author: Amrithadas P Anil

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

@@ -910,7 +910,8 @@ public void resetChangeMonitor() {
                 taskExecutor,
                 dialogService,
                 preferencesService,
-                databaseNotificationPane));
+                databaseNotificationPane,
+                this));
     }
 
     public void copy() {

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

@@ -31,18 +31,21 @@ public class DatabaseChangeMonitor implements FileUpdateListener {
     private final TaskExecutor taskExecutor;
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
+    private final LibraryTab libraryTab;
 
     public DatabaseChangeMonitor(BibDatabaseContext database,
                                  FileUpdateMonitor fileMonitor,
                                  TaskExecutor taskExecutor,
                                  DialogService dialogService,
                                  PreferencesService preferencesService,
-                                 LibraryTab.DatabaseNotification notificationPane) {
+                                 LibraryTab.DatabaseNotification notificationPane,
+                                 LibraryTab libraryTab) {
         this.database = database;
         this.fileMonitor = fileMonitor;
         this.taskExecutor = taskExecutor;
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
+        this.libraryTab = libraryTab;
 
         this.listeners = new ArrayList<>();
 
@@ -59,7 +62,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 DatabaseChangesResolverDialog(changes, database, Localization.lang("External Changes Resolver")));
+                            dialogService.showCustomDialogAndWait(new DatabaseChangesResolverDialog(changes, database, Localization.lang("External Changes Resolver"),libraryTab));
                             notificationPane.hide();
                         })),
                 Duration.ZERO));

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

@@ -15,7 +15,9 @@
 import javafx.scene.layout.BorderPane;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
+import org.jabref.gui.exporter.SaveDatabaseAction;
 import org.jabref.gui.preview.PreviewViewer;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.BaseDialog;
@@ -52,6 +54,7 @@ public class DatabaseChangesResolverDialog extends BaseDialog<Boolean> {
     private final BibDatabaseContext database;
 
     private ExternalChangesResolverViewModel viewModel;
+    private final LibraryTab libraryTab;
 
     @Inject private UndoManager undoManager;
     @Inject private StateManager stateManager;
@@ -68,9 +71,10 @@ public class DatabaseChangesResolverDialog extends BaseDialog<Boolean> {
      * @param changes The list of changes
      * @param database The database to apply the changes to
      */
-    public DatabaseChangesResolverDialog(List<DatabaseChange> changes, BibDatabaseContext database, String dialogTitle) {
+    public DatabaseChangesResolverDialog(List<DatabaseChange> changes, BibDatabaseContext database, String dialogTitle,  LibraryTab libraryTab) {
         this.changes = changes;
         this.database = database;
+        this.libraryTab = libraryTab;
 
         this.setTitle(dialogTitle);
         ViewLoader.view(this)
@@ -114,6 +118,8 @@ private void initialize() {
         EasyBind.subscribe(viewModel.areAllChangesResolvedProperty(), isResolved -> {
             if (isResolved) {
                 viewModel.applyChanges();
+                SaveDatabaseAction saveAction = new SaveDatabaseAction(libraryTab,dialogService,preferencesService,entryTypesManager);
+                saveAction.save();
                 close();
             }
         });

src/main/java/org/jabref/gui/dialogs/BackupUIManager.java

@@ -8,6 +8,7 @@
 import javafx.scene.control.ButtonType;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.LibraryTab;
 import org.jabref.gui.autosaveandbackup.BackupManager;
 import org.jabref.gui.backup.BackupResolverDialog;
 import org.jabref.gui.collab.DatabaseChange;
@@ -41,7 +42,8 @@ private BackupUIManager() {
     public static Optional<ParserResult> showRestoreBackupDialog(DialogService dialogService,
                                                                  Path originalPath,
                                                                  PreferencesService preferencesService,
-                                                                 FileUpdateMonitor fileUpdateMonitor) {
+                                                                 FileUpdateMonitor fileUpdateMonitor,
+                                                                 LibraryTab libraryTab) {
         var actionOpt = showBackupResolverDialog(
                 dialogService,
                 preferencesService.getExternalApplicationsPreferences(),
@@ -52,7 +54,7 @@ public static Optional<ParserResult> showRestoreBackupDialog(DialogService dialo
                 BackupManager.restoreBackup(originalPath, preferencesService.getFilePreferences().getBackupDirectory());
                 return Optional.empty();
             } else if (action == BackupResolverDialog.REVIEW_BACKUP) {
-                return showReviewBackupDialog(dialogService, originalPath, preferencesService, fileUpdateMonitor);
+                return showReviewBackupDialog(dialogService, originalPath, preferencesService, fileUpdateMonitor, libraryTab);
             }
             return Optional.empty();
         });
@@ -70,7 +72,8 @@ private static Optional<ParserResult> showReviewBackupDialog(
             DialogService dialogService,
             Path originalPath,
             PreferencesService preferencesService,
-            FileUpdateMonitor fileUpdateMonitor) {
+            FileUpdateMonitor fileUpdateMonitor,
+            LibraryTab libraryTab) {
         try {
             ImportFormatPreferences importFormatPreferences = preferencesService.getImportFormatPreferences();
 
@@ -88,12 +91,13 @@ private static Optional<ParserResult> showReviewBackupDialog(
                 List<DatabaseChange> changes = DatabaseChangeList.compareAndGetChanges(originalDatabase, backupDatabase, changeResolverFactory);
                 DatabaseChangesResolverDialog reviewBackupDialog = new DatabaseChangesResolverDialog(
                         changes,
-                        originalDatabase, "Review Backup"
+                        originalDatabase, "Review Backup",
+                        libraryTab
                 );
                 var allChangesResolved = dialogService.showCustomDialogAndWait(reviewBackupDialog);
                 if (allChangesResolved.isEmpty() || !allChangesResolved.get()) {
                     // In case not all changes are resolved, start from scratch
-                    return showRestoreBackupDialog(dialogService, originalPath, preferencesService, fileUpdateMonitor);
+                    return showRestoreBackupDialog(dialogService, originalPath, preferencesService, fileUpdateMonitor, libraryTab);
                 }
 
                 // This does NOT return the original ParserResult, but a modified version with all changes accepted or rejected

src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java

@@ -219,7 +219,7 @@ private ParserResult loadDatabase(Path file) throws Exception {
         if (BackupManager.backupFileDiffers(fileToLoad, backupDir)) {
             // In case the backup differs, ask the user what to do.
             // In case the user opted for restoring a backup, the content of the backup is contained in parserResult.
-            parserResult = BackupUIManager.showRestoreBackupDialog(dialogService, fileToLoad, preferencesService, fileUpdateMonitor)
+            parserResult = BackupUIManager.showRestoreBackupDialog(dialogService, fileToLoad, preferencesService, fileUpdateMonitor, tabContainer.getCurrentLibraryTab())
                                           .orElse(null);
         }