pass GlobalSaveManager as parameter

Author: Siedlerchr

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

@@ -119,6 +119,7 @@
 import org.jabref.logic.autosaveandbackup.AutosaveManager;
 import org.jabref.logic.autosaveandbackup.BackupManager;
 import org.jabref.logic.citationstyle.CitationStyleOutputFormat;
+import org.jabref.logic.exporter.GlobalSaveManager;
 import org.jabref.logic.importer.IdFetcher;
 import org.jabref.logic.importer.ImportCleanup;
 import org.jabref.logic.importer.ParserResult;
@@ -1105,7 +1106,7 @@ private boolean confirmClose(LibraryTab libraryTab) {
         if (response.isPresent() && response.get().equals(saveChanges)) {
             // The user wants to save.
             try {
-                SaveDatabaseAction saveAction = new SaveDatabaseAction(libraryTab, prefs, Globals.entryTypesManager);
+                SaveDatabaseAction saveAction = new SaveDatabaseAction(libraryTab, prefs, Globals.entryTypesManager, GlobalSaveManager.INSTANCE);
                 if (saveAction.save()) {
                     return true;
                 }

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

@@ -3,6 +3,7 @@
 import org.jabref.gui.Globals;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.exporter.SaveDatabaseAction;
+import org.jabref.logic.exporter.GlobalSaveManager;
 import org.jabref.model.database.event.AutosaveEvent;
 
 import com.google.common.eventbus.Subscribe;
@@ -25,7 +26,7 @@ public AutosaveUiManager(LibraryTab libraryTab) {
     @Subscribe
     public void listen(AutosaveEvent event) {
         try {
-            new SaveDatabaseAction(libraryTab, Globals.prefs, Globals.entryTypesManager).save(SaveDatabaseAction.SaveDatabaseMode.SILENT);
+            new SaveDatabaseAction(libraryTab, Globals.prefs, Globals.entryTypesManager, GlobalSaveManager.INSTANCE).save(SaveDatabaseAction.SaveDatabaseMode.SILENT);
         } catch (Throwable e) {
             LOGGER.error("Problem occurred while saving.", e);
         }

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

@@ -5,6 +5,7 @@
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.logic.exporter.GlobalSaveManager;
 
 /**
  * This class is just a simple wrapper for the soon to be refactored SaveDatabaseAction.
@@ -32,7 +33,8 @@ public void execute() {
         SaveDatabaseAction saveDatabaseAction = new SaveDatabaseAction(
                 frame.getCurrentLibraryTab(),
                 Globals.prefs,
-                Globals.entryTypesManager);
+                Globals.entryTypesManager,
+                GlobalSaveManager.INSTANCE);
 
         switch (saveMethod) {
             case SAVE -> saveDatabaseAction.save();

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

@@ -5,6 +5,7 @@
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.logic.exporter.GlobalSaveManager;
 import org.jabref.logic.l10n.Localization;
 
 public class SaveAllAction extends SimpleCommand {
@@ -22,7 +23,7 @@ public void execute() {
         dialogService.notify(Localization.lang("Saving all libraries..."));
 
         for (LibraryTab libraryTab : frame.getLibraryTabs()) {
-            SaveDatabaseAction saveDatabaseAction = new SaveDatabaseAction(libraryTab, Globals.prefs, Globals.entryTypesManager);
+            SaveDatabaseAction saveDatabaseAction = new SaveDatabaseAction(libraryTab, Globals.prefs, Globals.entryTypesManager, GlobalSaveManager.INSTANCE);
             boolean saveResult = saveDatabaseAction.save();
             if (!saveResult) {
                 dialogService.notify(Localization.lang("Could not save file."));

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

@@ -62,13 +62,13 @@ public enum SaveDatabaseMode {
         SILENT, NORMAL
     }
 
-    public SaveDatabaseAction(LibraryTab libraryTab, PreferencesService preferences, BibEntryTypesManager entryTypesManager) {
+    public SaveDatabaseAction(LibraryTab libraryTab, PreferencesService preferences, BibEntryTypesManager entryTypesManager, GlobalSaveManager saveManager) {
         this.libraryTab = libraryTab;
         this.frame = libraryTab.frame();
         this.dialogService = frame.getDialogService();
         this.preferences = preferences;
         this.entryTypesManager = entryTypesManager;
-        this.saveManager = GlobalSaveManager.INSTANCE;
+        this.saveManager = saveManager;
     }
 
     public boolean save() {

src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java

@@ -28,6 +28,7 @@
 import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.gui.util.FileFilterConverter;
+import org.jabref.logic.exporter.GlobalSaveManager;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.shared.DBMSConnectionProperties;
@@ -162,7 +163,7 @@ private boolean openSharedDatabase(DBMSConnectionProperties connectionProperties
 
             if (!folder.getValue().isEmpty()) {
                 try {
-                    new SaveDatabaseAction(libraryTab, Globals.prefs, Globals.entryTypesManager).saveAs(Path.of(folder.getValue()));
+                    new SaveDatabaseAction(libraryTab, Globals.prefs, Globals.entryTypesManager, GlobalSaveManager.INSTANCE).saveAs(Path.of(folder.getValue()));
                 } catch (Throwable e) {
                     LOGGER.error("Error while saving the database", e);
                 }

src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java

@@ -19,6 +19,7 @@
 import org.jabref.logic.bibtex.FieldWriterPreferences;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPattern;
+import org.jabref.logic.exporter.GlobalSaveManager;
 import org.jabref.logic.exporter.SavePreferences;
 import org.jabref.logic.shared.DatabaseLocation;
 import org.jabref.model.database.BibDatabase;
@@ -46,10 +47,10 @@ class SaveDatabaseActionTest {
 
     private static final String TEST_BIBTEX_LIBRARY_LOCATION = "C:\\Users\\John_Doe\\Jabref\\literature.bib";
     private Path file = Path.of(TEST_BIBTEX_LIBRARY_LOCATION);
-    private DialogService dialogService = mock(DialogService.class);
-    private JabRefPreferences preferences = mock(JabRefPreferences.class);
+    private final DialogService dialogService = mock(DialogService.class);
+    private final JabRefPreferences preferences = mock(JabRefPreferences.class);
     private LibraryTab libraryTab = mock(LibraryTab.class);
-    private JabRefFrame jabRefFrame = mock(JabRefFrame.class);
+    private final JabRefFrame jabRefFrame = mock(JabRefFrame.class);
     private BibDatabaseContext dbContext = spy(BibDatabaseContext.class);
     private SaveDatabaseAction saveDatabaseAction;
 
@@ -59,7 +60,7 @@ public void setUp() {
         when(libraryTab.getBibDatabaseContext()).thenReturn(dbContext);
         when(jabRefFrame.getDialogService()).thenReturn(dialogService);
 
-        saveDatabaseAction = spy(new SaveDatabaseAction(libraryTab, preferences, mock(BibEntryTypesManager.class)));
+        saveDatabaseAction = spy(new SaveDatabaseAction(libraryTab, preferences, mock(BibEntryTypesManager.class), GlobalSaveManager.INSTANCE));
     }
 
     @Test
@@ -129,7 +130,7 @@ private SaveDatabaseAction createSaveDatabaseActionForBibDatabase(BibDatabase da
         when(libraryTab.getBibDatabaseContext()).thenReturn(dbContext);
         when(libraryTab.getUndoManager()).thenReturn(mock(CountingUndoManager.class));
         when(libraryTab.getBibDatabaseContext()).thenReturn(dbContext);
-        saveDatabaseAction = new SaveDatabaseAction(libraryTab, preferences, mock(BibEntryTypesManager.class));
+        saveDatabaseAction = new SaveDatabaseAction(libraryTab, preferences, mock(BibEntryTypesManager.class), GlobalSaveManager.INSTANCE);
         return saveDatabaseAction;
     }