Fix: Sync bibliography for JStyle, refactoring, todo comments for alw…

…aysCitedOnPages
JabRef · Aug 31, 2024 · 5e270eb · 5e270eb
1 parent 70d7c9c
commit 5e270eb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/src/main/java/org/jabref/gui/openoffice/OOBibBase.java b/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
@@ -68,11 +68,8 @@ public class OOBibBase {
 
     private final DialogService dialogService;
 
-    // After inserting a citation, if ooPrefs.getSyncWhenCiting() returns true, shall we also update the bibliography?
-    private final boolean refreshBibliographyDuringSyncWhenCiting;
-
     // Shall we add "Cited on pages: ..." to resolved bibliography entries?
-    private final boolean alwaysAddCitedOnPages;
+    private final boolean alwaysAddCitedOnPages; // TODO (see comment above)
 
     private final OOBibBaseConnect connection;
 
@@ -86,7 +83,6 @@ public OOBibBase(Path loPath, DialogService dialogService)
         this.dialogService = dialogService;
         this.connection = new OOBibBaseConnect(loPath, dialogService);
 
-        this.refreshBibliographyDuringSyncWhenCiting = false;
         this.alwaysAddCitedOnPages = false;
     }
 
@@ -576,27 +572,23 @@ public void guiActionInsertEntry(List<BibEntry> entries,
         }
 
         /*
-         * For sync we need a FunctionalTextViewCursor.
+         * For sync we need a FunctionalTextViewCursor and an open database.
          */
         OOResult<FunctionalTextViewCursor, OOError> fcursor = null;
         if (syncOptions.isPresent()) {
             fcursor = getFunctionalTextViewCursor(doc, errorTitle);
             if (testDialog(errorTitle, fcursor.asVoidResult())) {
                 return;
             }
-        }
-
-        syncOptions
-                .map(e -> e.setUpdateBibliography(this.refreshBibliographyDuringSyncWhenCiting))
-                .map(e -> e.setAlwaysAddCitedOnPages(this.alwaysAddCitedOnPages));
-
-        if (syncOptions.isPresent()) {
             if (testDialog(databaseIsRequired(syncOptions.get().databases,
                     OOError::noDataBaseIsOpenForSyncingAfterCitation))) {
                 return;
             }
         }
 
+        syncOptions
+                .map(e -> e.setAlwaysAddCitedOnPages(this.alwaysAddCitedOnPages)); // TODO: Provide option to user: this is always false
+
         try {
 
             UnoUndo.enterUndoContext(doc, "Insert citation");
@@ -873,7 +865,7 @@ public void guiActionUpdateDocument(List<BibDatabase> databases, OOStyle style)
                     Update.SyncOptions syncOptions = new Update.SyncOptions(databases);
                     syncOptions
                             .setUpdateBibliography(true)
-                            .setAlwaysAddCitedOnPages(this.alwaysAddCitedOnPages);
+                            .setAlwaysAddCitedOnPages(this.alwaysAddCitedOnPages); // TODO: Provide option to user: this is always false
 
                     unresolvedKeys = Update.synchronizeDocument(doc, frontend, jStyle, fcursor.get(), syncOptions);
                 } finally {

diff --git a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
@@ -553,6 +553,10 @@ private void pushEntries(CitationType citationType, boolean addPageInfo) {
                         ? Optional.of(new Update.SyncOptions(getBaseList()))
                         : Optional.empty();
 
+        // Sync options are non-null only when "Automatically sync bibliography when inserting citations" is enabled
+        if (syncOptions.isPresent() && preferencesService.getOpenOfficePreferences().getSyncWhenCiting()) {
+            syncOptions.get().setUpdateBibliography(true);
+        }
         ooBase.guiActionInsertEntry(entries,
                 bibDatabaseContext,
                 entryTypesManager,