From d9d596eac7fa0e00aea872303492e5e2e5fa52e3 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Sat, 7 Sep 2024 01:11:09 +0200
Subject: [PATCH 01/24] initial

---
 .../collab/DatabaseChangesResolverDialog.java |  3 +-
 .../entrychange/EntryChangeDetailsView.java   |  3 +-
 .../jabref/gui/entryeditor/CommentsTab.java   | 17 +---
 .../gui/entryeditor/DeprecatedFieldsTab.java  | 23 +++--
 .../entryeditor/DetailOptionalFieldsTab.java  | 13 +--
 .../jabref/gui/entryeditor/EntryEditor.java   | 30 ++++--
 .../gui/entryeditor/FieldsEditorTab.java      | 39 ++------
 .../ImportantOptionalFieldsTab.java           | 13 +--
 .../entryeditor/OptionalFieldsTabBase.java    | 13 +--
 .../gui/entryeditor/OtherFieldsTab.java       | 17 ++--
 .../jabref/gui/entryeditor/PreviewTab.java    | 30 +-----
 .../gui/entryeditor/RequiredFieldsTab.java    | 24 +++--
 .../gui/entryeditor/UserDefinedFieldsTab.java | 22 +++--
 .../ExternalFilesEntryLinker.java             | 16 +--
 .../gui/externalfiles/ImportHandler.java      |  2 +-
 .../gui/maintable/MainTableColumnFactory.java |  2 +-
 .../gui/maintable/MainTableTooltip.java       |  7 +-
 .../gui/maintable/columns/FieldColumn.java    |  2 +-
 .../gui/openoffice/StyleSelectDialogView.java |  3 +-
 .../gui/preferences/preview/PreviewTab.java   |  3 +-
 .../org/jabref/gui/preview/PreviewPanel.java  | 97 +++++++++++--------
 .../org/jabref/gui/preview/PreviewViewer.java | 57 +++++------
 .../gui/search/GlobalSearchResultDialog.java  |  3 +-
 .../jabref/logic/cleanup/CleanupWorker.java   |  6 +-
 .../logic/cleanup/MoveFilesCleanup.java       |  7 +-
 .../logic/cleanup/RenamePdfCleanup.java       |  7 +-
 .../gui/entryeditor/CommentsTabTest.java      | 54 ++++++-----
 27 files changed, 245 insertions(+), 268 deletions(-)

diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangesResolverDialog.java b/src/main/java/org/jabref/gui/collab/DatabaseChangesResolverDialog.java
index 7da15d69823..175ee7682ce 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangesResolverDialog.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangesResolverDialog.java
@@ -99,7 +99,8 @@ public boolean areAllChangesDenied() {
 
     @FXML
     private void initialize() {
-        PreviewViewer previewViewer = new PreviewViewer(database, dialogService, preferencesService, themeManager, taskExecutor);
+        PreviewViewer previewViewer = new PreviewViewer(dialogService, preferencesService, themeManager, taskExecutor);
+        previewViewer.setDatabaseContext(database);
         DatabaseChangeDetailsViewFactory databaseChangeDetailsViewFactory = new DatabaseChangeDetailsViewFactory(database, dialogService, themeManager, preferencesService, entryTypesManager, previewViewer, taskExecutor);
 
         viewModel = new ExternalChangesResolverViewModel(changes, undoManager);
diff --git a/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeDetailsView.java b/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeDetailsView.java
index 80e7762c49d..2422181545b 100644
--- a/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeDetailsView.java
@@ -40,7 +40,8 @@ public EntryChangeDetailsView(BibEntry oldEntry,
         onDisk.getStyleClass().add("lib-change-header");
 
         // we need a copy here as we otherwise would set the same entry twice
-        PreviewViewer previewClone = new PreviewViewer(databaseContext, dialogService, preferencesService, themeManager, taskExecutor);
+        PreviewViewer previewClone = new PreviewViewer(dialogService, preferencesService, themeManager, taskExecutor);
+        previewClone.setDatabaseContext(databaseContext);
 
         // The scroll bar used is not part of ScrollPane, but the attached WebView.
         WebView previewCloneView = (WebView) previewClone.getContent();
diff --git a/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java b/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
index 574c6908366..ce1773e6926 100644
--- a/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
@@ -21,20 +21,17 @@
 import org.jabref.gui.fieldeditors.FieldEditorFX;
 import org.jabref.gui.fieldeditors.FieldNameLabel;
 import org.jabref.gui.icon.IconTheme;
-import org.jabref.gui.theme.ThemeManager;
+import org.jabref.gui.preview.PreviewPanel;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
-import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.search.LuceneManager;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UserSpecificCommentField;
-import org.jabref.model.search.SearchQuery;
 import org.jabref.preferences.PreferencesService;
 
 public class CommentsTab extends FieldsEditorTab {
@@ -52,13 +49,10 @@ public CommentsTab(PreferencesService preferences,
                        UndoAction undoAction,
                        RedoAction redoAction,
                        DialogService dialogService,
-                       ThemeManager themeManager,
                        TaskExecutor taskExecutor,
                        JournalAbbreviationRepository journalAbbreviationRepository,
-                       LuceneManager luceneManager,
-                       OptionalObjectProperty<SearchQuery> searchQueryProperty) {
-        super(
-                false,
+                       PreviewPanel previewPanel) {
+        super(false,
                 databaseContext,
                 suggestionProviders,
                 undoManager,
@@ -66,12 +60,9 @@ public CommentsTab(PreferencesService preferences,
                 redoAction,
                 dialogService,
                 preferences,
-                themeManager,
                 taskExecutor,
                 journalAbbreviationRepository,
-                luceneManager,
-                searchQueryProperty
-        );
+                previewPanel);
         this.defaultOwner = preferences.getOwnerPreferences().getDefaultOwner().toLowerCase(Locale.ROOT).replaceAll("[^a-z0-9]", "-");
         setText(Localization.lang("Comments"));
         setGraphic(IconTheme.JabRefIcons.COMMENT.getGraphicNode());
diff --git a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
index 4341e7e76cd..00b49276c2a 100644
--- a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
@@ -12,21 +12,18 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.icon.IconTheme;
-import org.jabref.gui.theme.ThemeManager;
+import org.jabref.gui.preview.PreviewPanel;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
-import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.search.LuceneManager;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.Field;
-import org.jabref.model.search.SearchQuery;
 import org.jabref.preferences.PreferencesService;
 
 import com.tobiasdiez.easybind.EasyBind;
@@ -43,13 +40,23 @@ public DeprecatedFieldsTab(BibDatabaseContext databaseContext,
                                RedoAction redoAction,
                                DialogService dialogService,
                                PreferencesService preferences,
-                               ThemeManager themeManager,
                                BibEntryTypesManager entryTypesManager,
                                TaskExecutor taskExecutor,
                                JournalAbbreviationRepository journalAbbreviationRepository,
-                               LuceneManager luceneManager,
-                               OptionalObjectProperty<SearchQuery> searchQueryProperty) {
-        super(false, databaseContext, suggestionProviders, undoManager, undoAction, redoAction, dialogService, preferences, themeManager, taskExecutor, journalAbbreviationRepository, luceneManager, searchQueryProperty);
+                               PreviewPanel previewPanel) {
+        super(
+                false,
+                databaseContext,
+                suggestionProviders,
+                undoManager,
+                undoAction,
+                redoAction,
+                dialogService,
+                preferences,
+                taskExecutor,
+                journalAbbreviationRepository,
+                previewPanel
+        );
         this.entryTypesManager = entryTypesManager;
 
         setText(Localization.lang("Deprecated fields"));
diff --git a/src/main/java/org/jabref/gui/entryeditor/DetailOptionalFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/DetailOptionalFieldsTab.java
index 43097483626..70226284e07 100644
--- a/src/main/java/org/jabref/gui/entryeditor/DetailOptionalFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/DetailOptionalFieldsTab.java
@@ -4,17 +4,14 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
-import org.jabref.gui.theme.ThemeManager;
+import org.jabref.gui.preview.PreviewPanel;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
-import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.search.LuceneManager;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntryTypesManager;
-import org.jabref.model.search.SearchQuery;
 import org.jabref.preferences.PreferencesService;
 
 public class DetailOptionalFieldsTab extends OptionalFieldsTabBase {
@@ -28,12 +25,10 @@ public DetailOptionalFieldsTab(BibDatabaseContext databaseContext,
                                    RedoAction redoAction,
                                    DialogService dialogService,
                                    PreferencesService preferences,
-                                   ThemeManager themeManager,
                                    BibEntryTypesManager entryTypesManager,
                                    TaskExecutor taskExecutor,
                                    JournalAbbreviationRepository journalAbbreviationRepository,
-                                   LuceneManager luceneManager,
-                                   OptionalObjectProperty<SearchQuery> searchQueryProperty) {
+                                   PreviewPanel previewPanel) {
         super(
                 Localization.lang("Optional fields 2"),
                 false,
@@ -44,12 +39,10 @@ public DetailOptionalFieldsTab(BibDatabaseContext databaseContext,
                 redoAction,
                 dialogService,
                 preferences,
-                themeManager,
                 entryTypesManager,
                 taskExecutor,
                 journalAbbreviationRepository,
-                luceneManager,
-                searchQueryProperty
+                previewPanel
         );
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 67be8a5f908..f7ea4368a6b 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -42,6 +42,7 @@
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.menus.ChangeEntryTypeMenu;
 import org.jabref.gui.mergeentries.FetchAndMergeEntry;
+import org.jabref.gui.preview.PreviewPanel;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.gui.undo.RedoAction;
@@ -91,6 +92,7 @@ public class EntryEditor extends BorderPane {
     private final BibDatabaseContext databaseContext;
     private final EntryEditorPreferences entryEditorPreferences;
     private final ExternalFilesEntryLinker fileLinker;
+    private final PreviewPanel previewPanel;
     private final DirectoryMonitorManager directoryMonitorManager;
     private final UndoAction undoAction;
     private final RedoAction redoAction;
@@ -136,7 +138,17 @@ public EntryEditor(LibraryTab libraryTab, UndoAction undoAction, RedoAction redo
                   .load();
 
         this.entryEditorPreferences = preferencesService.getEntryEditorPreferences();
-        this.fileLinker = new ExternalFilesEntryLinker(preferencesService.getFilePreferences(), databaseContext, dialogService);
+        this.fileLinker = new ExternalFilesEntryLinker(preferencesService.getFilePreferences(), dialogService, stateManager);
+        this.previewPanel = new PreviewPanel(
+                dialogService,
+                preferencesService.getKeyBindingRepository(),
+                preferencesService,
+                themeManager,
+                taskExecutor,
+                libraryTab.getLuceneManager(),
+                stateManager,
+                libraryTab.searchQueryProperty());
+        this.previewPanel.setDatabase(databaseContext);
 
         setupKeyBindings();
 
@@ -278,21 +290,21 @@ private void navigateToNextEntry() {
     private List<EntryEditorTab> createTabs() {
         List<EntryEditorTab> tabs = new LinkedList<>();
 
-        tabs.add(new PreviewTab(databaseContext, dialogService, preferencesService, themeManager, taskExecutor, libraryTab.getLuceneManager(), libraryTab.searchQueryProperty()));
+        tabs.add(new PreviewTab(databaseContext, preferencesService, previewPanel));
 
         // Required, optional (important+detail), deprecated, and "other" fields
-        tabs.add(new RequiredFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferencesService, themeManager, bibEntryTypesManager, taskExecutor, journalAbbreviationRepository, libraryTab.getLuceneManager(), libraryTab.searchQueryProperty()));
-        tabs.add(new ImportantOptionalFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferencesService, themeManager, bibEntryTypesManager, taskExecutor, journalAbbreviationRepository, libraryTab.getLuceneManager(), libraryTab.searchQueryProperty()));
-        tabs.add(new DetailOptionalFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferencesService, themeManager, bibEntryTypesManager, taskExecutor, journalAbbreviationRepository, libraryTab.getLuceneManager(), libraryTab.searchQueryProperty()));
-        tabs.add(new DeprecatedFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferencesService, themeManager, bibEntryTypesManager, taskExecutor, journalAbbreviationRepository, libraryTab.getLuceneManager(), libraryTab.searchQueryProperty()));
-        tabs.add(new OtherFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferencesService, themeManager, bibEntryTypesManager, taskExecutor, journalAbbreviationRepository, libraryTab.getLuceneManager(), libraryTab.searchQueryProperty()));
+        tabs.add(new RequiredFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferencesService, bibEntryTypesManager, taskExecutor, journalAbbreviationRepository, previewPanel));
+        tabs.add(new ImportantOptionalFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferencesService, bibEntryTypesManager, taskExecutor, journalAbbreviationRepository, previewPanel));
+        tabs.add(new DetailOptionalFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferencesService, bibEntryTypesManager, taskExecutor, journalAbbreviationRepository, previewPanel));
+        tabs.add(new DeprecatedFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferencesService, bibEntryTypesManager, taskExecutor, journalAbbreviationRepository, previewPanel));
+        tabs.add(new OtherFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferencesService, bibEntryTypesManager, taskExecutor, journalAbbreviationRepository, previewPanel));
 
         // Comment Tab: Tab for general and user-specific comments
-        tabs.add(new CommentsTab(preferencesService, databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, themeManager, taskExecutor, journalAbbreviationRepository, libraryTab.getLuceneManager(), libraryTab.searchQueryProperty()));
+        tabs.add(new CommentsTab(preferencesService, databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, taskExecutor, journalAbbreviationRepository, previewPanel));
 
         Map<String, Set<Field>> entryEditorTabList = getAdditionalUserConfiguredTabs();
         for (Map.Entry<String, Set<Field>> tab : entryEditorTabList.entrySet()) {
-            tabs.add(new UserDefinedFieldsTab(tab.getKey(), tab.getValue(), databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferencesService, themeManager, taskExecutor, journalAbbreviationRepository, libraryTab.getLuceneManager(), libraryTab.searchQueryProperty()));
+            tabs.add(new UserDefinedFieldsTab(tab.getKey(), tab.getValue(), databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferencesService, taskExecutor, journalAbbreviationRepository, previewPanel));
         }
 
         tabs.add(new MathSciNetTab());
diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
index 13032495e00..bc2c03d3851 100644
--- a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -30,17 +30,13 @@
 import org.jabref.gui.fieldeditors.FieldEditors;
 import org.jabref.gui.fieldeditors.FieldNameLabel;
 import org.jabref.gui.preview.PreviewPanel;
-import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
-import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
-import org.jabref.logic.search.LuceneManager;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
-import org.jabref.model.search.SearchQuery;
 import org.jabref.preferences.PreferencesService;
 
 import com.tobiasdiez.easybind.EasyBind;
@@ -59,13 +55,10 @@ abstract class FieldsEditorTab extends EntryEditorTab implements OffersPreview {
     private final RedoAction redoAction;
     private final DialogService dialogService;
     private final PreferencesService preferences;
-    private final ThemeManager themeManager;
     private final TaskExecutor taskExecutor;
     private final JournalAbbreviationRepository journalAbbreviationRepository;
-    private PreviewPanel previewPanel;
+    private final PreviewPanel previewPanel;
     private final UndoManager undoManager;
-    private final LuceneManager luceneManager;
-    private final OptionalObjectProperty<SearchQuery> searchQueryProperty;
     private Collection<Field> fields = new ArrayList<>();
     @SuppressWarnings("FieldCanBeLocal")
     private Subscription dividerPositionSubscription;
@@ -78,11 +71,9 @@ public FieldsEditorTab(boolean compressed,
                            RedoAction redoAction,
                            DialogService dialogService,
                            PreferencesService preferences,
-                           ThemeManager themeManager,
                            TaskExecutor taskExecutor,
                            JournalAbbreviationRepository journalAbbreviationRepository,
-                           LuceneManager luceneManager,
-                           OptionalObjectProperty<SearchQuery> searchQueryProperty) {
+                           PreviewPanel previewPanel) {
         this.isCompressed = compressed;
         this.databaseContext = Objects.requireNonNull(databaseContext);
         this.suggestionProviders = Objects.requireNonNull(suggestionProviders);
@@ -91,11 +82,9 @@ public FieldsEditorTab(boolean compressed,
         this.redoAction = redoAction;
         this.dialogService = Objects.requireNonNull(dialogService);
         this.preferences = Objects.requireNonNull(preferences);
-        this.themeManager = themeManager;
         this.taskExecutor = Objects.requireNonNull(taskExecutor);
         this.journalAbbreviationRepository = Objects.requireNonNull(journalAbbreviationRepository);
-        this.luceneManager = luceneManager;
-        this.searchQueryProperty = searchQueryProperty;
+        this.previewPanel = previewPanel;
     }
 
     private static void addColumn(GridPane gridPane, int columnIndex, List<Label> nodes) {
@@ -219,23 +208,18 @@ public boolean shouldShow(BibEntry entry) {
     protected void bindToEntry(BibEntry entry) {
         initPanel();
         setupPanel(entry, isCompressed);
-        if (previewPanel != null) {
-            previewPanel.setEntry(entry);
-        }
+        previewPanel.setDatabase(databaseContext);
+        previewPanel.setEntry(entry);
     }
 
     @Override
     public void nextPreviewStyle() {
-        if (previewPanel != null) {
-            previewPanel.nextPreviewStyle();
-        }
+        previewPanel.nextPreviewStyle();
     }
 
     @Override
     public void previousPreviewStyle() {
-        if (previewPanel != null) {
-            previewPanel.previousPreviewStyle();
-        }
+        previewPanel.previousPreviewStyle();
     }
 
     protected abstract SequencedSet<Field> determineFieldsToShow(BibEntry entry);
@@ -258,15 +242,6 @@ private void initPanel() {
             scrollPane.setFitToHeight(true);
 
             SplitPane container = new SplitPane(scrollPane);
-            previewPanel = new PreviewPanel(
-                    databaseContext,
-                    dialogService,
-                    preferences.getKeyBindingRepository(),
-                    preferences,
-                    themeManager,
-                    taskExecutor,
-                    luceneManager,
-                    searchQueryProperty);
             EasyBind.subscribe(preferences.getPreviewPreferences().showPreviewAsExtraTabProperty(), show -> {
                 if (show) {
                     container.getItems().remove(previewPanel);
diff --git a/src/main/java/org/jabref/gui/entryeditor/ImportantOptionalFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/ImportantOptionalFieldsTab.java
index 58c5f9eb3d9..d19152b2d42 100644
--- a/src/main/java/org/jabref/gui/entryeditor/ImportantOptionalFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/ImportantOptionalFieldsTab.java
@@ -4,17 +4,14 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
-import org.jabref.gui.theme.ThemeManager;
+import org.jabref.gui.preview.PreviewPanel;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
-import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.search.LuceneManager;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntryTypesManager;
-import org.jabref.model.search.SearchQuery;
 import org.jabref.preferences.PreferencesService;
 
 public class ImportantOptionalFieldsTab extends OptionalFieldsTabBase {
@@ -28,12 +25,10 @@ public ImportantOptionalFieldsTab(BibDatabaseContext databaseContext,
                                       RedoAction redoAction,
                                       DialogService dialogService,
                                       PreferencesService preferences,
-                                      ThemeManager themeManager,
                                       BibEntryTypesManager entryTypesManager,
                                       TaskExecutor taskExecutor,
                                       JournalAbbreviationRepository journalAbbreviationRepository,
-                                      LuceneManager luceneManager,
-                                      OptionalObjectProperty<SearchQuery> searchQueryProperty) {
+                                      PreviewPanel previewPanel) {
         super(
                 Localization.lang("Optional fields"),
                 true,
@@ -44,12 +39,10 @@ public ImportantOptionalFieldsTab(BibDatabaseContext databaseContext,
                 redoAction,
                 dialogService,
                 preferences,
-                themeManager,
                 entryTypesManager,
                 taskExecutor,
                 journalAbbreviationRepository,
-                luceneManager,
-                searchQueryProperty
+                previewPanel
         );
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
index 7de6cdf797e..f4020e86e31 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
@@ -11,21 +11,18 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.icon.IconTheme;
-import org.jabref.gui.theme.ThemeManager;
+import org.jabref.gui.preview.PreviewPanel;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
-import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.search.LuceneManager;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.Field;
-import org.jabref.model.search.SearchQuery;
 import org.jabref.preferences.PreferencesService;
 
 public class OptionalFieldsTabBase extends FieldsEditorTab {
@@ -41,12 +38,10 @@ public OptionalFieldsTabBase(String title,
                                  RedoAction redoAction,
                                  DialogService dialogService,
                                  PreferencesService preferences,
-                                 ThemeManager themeManager,
                                  BibEntryTypesManager entryTypesManager,
                                  TaskExecutor taskExecutor,
                                  JournalAbbreviationRepository journalAbbreviationRepository,
-                                 LuceneManager luceneManager,
-                                 OptionalObjectProperty<SearchQuery> searchQueryProperty) {
+                                 PreviewPanel previewPanel) {
         super(true,
                 databaseContext,
                 suggestionProviders,
@@ -55,11 +50,9 @@ public OptionalFieldsTabBase(String title,
                 redoAction,
                 dialogService,
                 preferences,
-                themeManager,
                 taskExecutor,
                 journalAbbreviationRepository,
-                luceneManager,
-                searchQueryProperty);
+                previewPanel);
         this.entryTypesManager = entryTypesManager;
         this.isImportantOptionalFields = isImportantOptionalFields;
         setText(title);
diff --git a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
index 1a57883b62e..09440b1dbaa 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
@@ -15,14 +15,12 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.icon.IconTheme;
-import org.jabref.gui.theme.ThemeManager;
+import org.jabref.gui.preview.PreviewPanel;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
-import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.search.LuceneManager;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
@@ -32,7 +30,6 @@
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UserSpecificCommentField;
-import org.jabref.model.search.SearchQuery;
 import org.jabref.preferences.PreferencesService;
 
 public class OtherFieldsTab extends FieldsEditorTab {
@@ -48,13 +45,12 @@ public OtherFieldsTab(BibDatabaseContext databaseContext,
                           RedoAction redoAction,
                           DialogService dialogService,
                           PreferencesService preferences,
-                          ThemeManager themeManager,
                           BibEntryTypesManager entryTypesManager,
                           TaskExecutor taskExecutor,
                           JournalAbbreviationRepository journalAbbreviationRepository,
-                          LuceneManager luceneManager,
-                          OptionalObjectProperty<SearchQuery> searchQueryProperty) {
-        super(false,
+                          PreviewPanel previewPanel) {
+        super(
+                false,
                 databaseContext,
                 suggestionProviders,
                 undoManager,
@@ -62,11 +58,10 @@ public OtherFieldsTab(BibDatabaseContext databaseContext,
                 redoAction,
                 dialogService,
                 preferences,
-                themeManager,
                 taskExecutor,
                 journalAbbreviationRepository,
-                luceneManager,
-                searchQueryProperty);
+                previewPanel
+        );
 
         this.entryTypesManager = entryTypesManager;
         this.customTabsFieldNames = new ArrayList<>();
diff --git a/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java b/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
index 27ee04e2892..94e00a8c873 100644
--- a/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
@@ -1,46 +1,28 @@
 package org.jabref.gui.entryeditor;
 
-import org.jabref.gui.DialogService;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.preview.PreviewPanel;
-import org.jabref.gui.theme.ThemeManager;
-import org.jabref.gui.util.OptionalObjectProperty;
-import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.search.LuceneManager;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.search.SearchQuery;
 import org.jabref.preferences.PreferencesService;
 
 public class PreviewTab extends EntryEditorTab implements OffersPreview {
     public static final String NAME = "Preview";
-    private final DialogService dialogService;
     private final BibDatabaseContext databaseContext;
     private final PreferencesService preferences;
-    private final ThemeManager themeManager;
-    private final TaskExecutor taskExecutor;
-    private final LuceneManager luceneManager;
-    private final OptionalObjectProperty<SearchQuery> searchQueryProperty;
     private PreviewPanel previewPanel;
 
     public PreviewTab(BibDatabaseContext databaseContext,
-                      DialogService dialogService,
                       PreferencesService preferences,
-                      ThemeManager themeManager,
-                      TaskExecutor taskExecutor,
-                      LuceneManager luceneManager,
-                      OptionalObjectProperty<SearchQuery> searchQueryProperty) {
+                      PreviewPanel previewPanel) {
         this.databaseContext = databaseContext;
-        this.dialogService = dialogService;
         this.preferences = preferences;
-        this.themeManager = themeManager;
-        this.taskExecutor = taskExecutor;
-        this.luceneManager = luceneManager;
-        this.searchQueryProperty = searchQueryProperty;
+        this.previewPanel = previewPanel;
 
         setGraphic(IconTheme.JabRefIcons.TOGGLE_ENTRY_PREVIEW.getGraphicNode());
         setText(Localization.lang("Preview"));
+        setContent(previewPanel);
     }
 
     @Override
@@ -64,11 +46,7 @@ public boolean shouldShow(BibEntry entry) {
 
     @Override
     protected void bindToEntry(BibEntry entry) {
-        if (previewPanel == null) {
-            previewPanel = new PreviewPanel(databaseContext, dialogService, preferences.getKeyBindingRepository(), preferences, themeManager, taskExecutor, luceneManager, searchQueryProperty);
-            setContent(previewPanel);
-        }
-
+        previewPanel.setDatabase(databaseContext);
         previewPanel.setEntry(entry);
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
index 51695dba71e..c7640f21c55 100644
--- a/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
@@ -11,14 +11,12 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.icon.IconTheme;
-import org.jabref.gui.theme.ThemeManager;
+import org.jabref.gui.preview.PreviewPanel;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
-import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.search.LuceneManager;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryType;
@@ -26,7 +24,6 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.OrFields;
-import org.jabref.model.search.SearchQuery;
 import org.jabref.preferences.PreferencesService;
 
 public class RequiredFieldsTab extends FieldsEditorTab {
@@ -41,14 +38,23 @@ public RequiredFieldsTab(BibDatabaseContext databaseContext,
                              RedoAction redoAction,
                              DialogService dialogService,
                              PreferencesService preferences,
-                             ThemeManager themeManager,
                              BibEntryTypesManager entryTypesManager,
                              TaskExecutor taskExecutor,
                              JournalAbbreviationRepository journalAbbreviationRepository,
-                             LuceneManager luceneManager,
-                             OptionalObjectProperty<SearchQuery> searchQueryProperty) {
-        super(false, databaseContext, suggestionProviders, undoManager, undoAction, redoAction, dialogService,
-                preferences, themeManager, taskExecutor, journalAbbreviationRepository, luceneManager, searchQueryProperty);
+                             PreviewPanel previewPanel) {
+        super(
+                false,
+                databaseContext,
+                suggestionProviders,
+                undoManager,
+                undoAction,
+                redoAction,
+                dialogService,
+                preferences,
+                taskExecutor,
+                journalAbbreviationRepository,
+                previewPanel
+        );
         this.entryTypesManager = entryTypesManager;
         setText(Localization.lang("Required fields"));
         setTooltip(new Tooltip(Localization.lang("Show required fields")));
diff --git a/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
index 26ae2b54ba5..797e06767ef 100644
--- a/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
@@ -9,17 +9,14 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.icon.IconTheme;
-import org.jabref.gui.theme.ThemeManager;
+import org.jabref.gui.preview.PreviewPanel;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
-import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
-import org.jabref.logic.search.LuceneManager;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
-import org.jabref.model.search.SearchQuery;
 import org.jabref.preferences.PreferencesService;
 
 public class UserDefinedFieldsTab extends FieldsEditorTab {
@@ -34,12 +31,21 @@ public UserDefinedFieldsTab(String name,
                                 RedoAction redoAction,
                                 DialogService dialogService,
                                 PreferencesService preferences,
-                                ThemeManager themeManager,
                                 TaskExecutor taskExecutor,
                                 JournalAbbreviationRepository journalAbbreviationRepository,
-                                LuceneManager luceneManager,
-                                OptionalObjectProperty<SearchQuery> searchQueryProperty) {
-        super(false, databaseContext, suggestionProviders, undoManager, undoAction, redoAction, dialogService, preferences, themeManager, taskExecutor, journalAbbreviationRepository, luceneManager, searchQueryProperty);
+                                PreviewPanel previewPanel) {
+        super(
+                false,
+                databaseContext,
+                suggestionProviders,
+                undoManager,
+                undoAction,
+                redoAction,
+                dialogService,
+                preferences,
+                taskExecutor,
+                journalAbbreviationRepository,
+                previewPanel);
 
         this.fields = new LinkedHashSet<>(fields);
 
diff --git a/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java b/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
index 305358ce9b6..327b53046c3 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
@@ -7,8 +7,10 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Supplier;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.StateManager;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.externalfiletype.UnknownExternalFileType;
@@ -31,21 +33,21 @@ public class ExternalFilesEntryLinker {
     private static final Logger LOGGER = LoggerFactory.getLogger(ExternalFilesEntryLinker.class);
 
     private final FilePreferences filePreferences;
-    private final BibDatabaseContext bibDatabaseContext;
+    private final Supplier<BibDatabaseContext> bibDatabaseContextSupplier;
     private final MoveFilesCleanup moveFilesCleanup;
     private final RenamePdfCleanup renameFilesCleanup;
     private final DialogService dialogService;
 
-    public ExternalFilesEntryLinker(FilePreferences filePreferences, BibDatabaseContext bibDatabaseContext, DialogService dialogService) {
+    public ExternalFilesEntryLinker(FilePreferences filePreferences, DialogService dialogService, StateManager stateManager) {
         this.filePreferences = filePreferences;
-        this.bibDatabaseContext = bibDatabaseContext;
-        this.moveFilesCleanup = new MoveFilesCleanup(bibDatabaseContext, filePreferences);
-        this.renameFilesCleanup = new RenamePdfCleanup(false, bibDatabaseContext, filePreferences);
+        this.bibDatabaseContextSupplier = () -> stateManager.getActiveDatabase().orElse(new BibDatabaseContext());
+        this.moveFilesCleanup = new MoveFilesCleanup(bibDatabaseContextSupplier, filePreferences);
+        this.renameFilesCleanup = new RenamePdfCleanup(false, bibDatabaseContextSupplier, filePreferences);
         this.dialogService = dialogService;
     }
 
     public Optional<Path> copyFileToFileDir(Path file) {
-        Optional<Path> firstExistingFileDir = bibDatabaseContext.getFirstExistingFileDir(filePreferences);
+        Optional<Path> firstExistingFileDir = bibDatabaseContextSupplier.get().getFirstExistingFileDir(filePreferences);
         if (firstExistingFileDir.isPresent()) {
             Path targetFile = firstExistingFileDir.get().resolve(file.getFileName());
             if (FileUtil.copyFile(file, targetFile, false)) {
@@ -69,7 +71,7 @@ public void addFilesToEntry(BibEntry entry, List<Path> files) {
             FileUtil.getFileExtension(file).ifPresent(ext -> {
                 ExternalFileType type = ExternalFileTypes.getExternalFileTypeByExt(ext, filePreferences)
                                                          .orElse(new UnknownExternalFileType(ext));
-                Path relativePath = FileUtil.relativize(file, bibDatabaseContext, filePreferences);
+                Path relativePath = FileUtil.relativize(file, bibDatabaseContextSupplier.get(), filePreferences);
                 LinkedFile linkedfile = new LinkedFile("", relativePath, type.getName());
                 entry.addFile(linkedfile);
             });
diff --git a/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java b/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
index 73e1f4f602c..7330f6cfd53 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
@@ -91,7 +91,7 @@ public ImportHandler(BibDatabaseContext database,
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
 
-        this.linker = new ExternalFilesEntryLinker(preferences.getFilePreferences(), database, dialogService);
+        this.linker = new ExternalFilesEntryLinker(preferences.getFilePreferences(), dialogService, stateManager);
         this.contentImporter = new ExternalFilesContentImporter(preferences.getImportFormatPreferences());
         this.undoManager = undoManager;
     }
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
index 2fe8228ad30..f5e81ae7d2a 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
@@ -81,7 +81,7 @@ public MainTableColumnFactory(BibDatabaseContext database,
         this.undoManager = undoManager;
         this.stateManager = stateManager;
         ThemeManager themeManager = Injector.instantiateModelOrService(ThemeManager.class);
-        this.tooltip = new MainTableTooltip(database, dialogService, preferencesService, themeManager, taskExecutor);
+        this.tooltip = new MainTableTooltip(dialogService, preferencesService, themeManager, taskExecutor);
     }
 
     public TableColumn<BibEntryTableViewModel, ?> createColumn(MainTableColumnModel column) {
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableTooltip.java b/src/main/java/org/jabref/gui/maintable/MainTableTooltip.java
index 5f50ca0ae4e..ea709f4aad4 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableTooltip.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableTooltip.java
@@ -20,17 +20,18 @@ public class MainTableTooltip extends Tooltip {
     private final VBox tooltipContent = new VBox();
     private final Label fieldValueLabel = new Label();
 
-    public MainTableTooltip(BibDatabaseContext databaseContext, DialogService dialogService, PreferencesService preferences, ThemeManager themeManager, TaskExecutor taskExecutor) {
+    public MainTableTooltip(DialogService dialogService, PreferencesService preferences, ThemeManager themeManager, TaskExecutor taskExecutor) {
         this.preferences = preferences;
-        this.preview = new PreviewViewer(databaseContext, dialogService, preferences, themeManager, taskExecutor);
+        this.preview = new PreviewViewer(dialogService, preferences, themeManager, taskExecutor);
         this.setShowDelay(Duration.seconds(1));
         this.tooltipContent.getChildren().addAll(fieldValueLabel, preview);
     }
 
-    public Tooltip createTooltip(BibEntry entry, String fieldValue) {
+    public Tooltip createTooltip(BibDatabaseContext databaseContext, BibEntry entry, String fieldValue) {
         fieldValueLabel.setText(fieldValue + "\n");
         if (preferences.getPreviewPreferences().shouldShowPreviewEntryTableTooltip()) {
             preview.setLayout(preferences.getPreviewPreferences().getSelectedPreviewLayout());
+            preview.setDatabaseContext(databaseContext);
             preview.setEntry(entry);
             this.setGraphic(tooltipContent);
         } else {
diff --git a/src/main/java/org/jabref/gui/maintable/columns/FieldColumn.java b/src/main/java/org/jabref/gui/maintable/columns/FieldColumn.java
index e272467f409..512b9906951 100644
--- a/src/main/java/org/jabref/gui/maintable/columns/FieldColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/columns/FieldColumn.java
@@ -67,6 +67,6 @@ private ObservableValue<String> getFieldValue(BibEntryTableViewModel entry) {
     }
 
     private Tooltip createTooltip(BibEntryTableViewModel entry, String fieldValue) {
-        return tooltip.createTooltip(entry.getEntry(), fieldValue);
+        return tooltip.createTooltip(entry.getBibDatabaseContext(), entry.getEntry(), fieldValue);
     }
 }
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
index 8591c121b0c..b561a68b7d3 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
@@ -215,7 +215,8 @@ private void addStyleFile() {
     }
 
     private PreviewViewer initializePreviewViewer(BibEntry entry) {
-        PreviewViewer viewer = new PreviewViewer(new BibDatabaseContext(), dialogService, preferencesService, themeManager, taskExecutor);
+        PreviewViewer viewer = new PreviewViewer(dialogService, preferencesService, themeManager, taskExecutor);
+        viewer.setDatabaseContext(new BibDatabaseContext());
         viewer.setEntry(entry);
         return viewer;
     }
diff --git a/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java b/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java
index 059b9db23ee..a02918c8c12 100644
--- a/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java
+++ b/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java
@@ -177,7 +177,8 @@ public void initialize() {
         sortUpButton.disableProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNull());
         sortDownButton.disableProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNull());
 
-        PreviewViewer previewViewer = new PreviewViewer(new BibDatabaseContext(), dialogService, preferencesService, themeManager, taskExecutor);
+        PreviewViewer previewViewer = new PreviewViewer(dialogService, preferencesService, themeManager, taskExecutor);
+        previewViewer.setDatabaseContext(new BibDatabaseContext());
         previewViewer.setEntry(TestEntry.getTestEntry());
         EasyBind.subscribe(viewModel.selectedLayoutProperty(), previewViewer::setLayout);
         previewViewer.visibleProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNotNull()
diff --git a/src/main/java/org/jabref/gui/preview/PreviewPanel.java b/src/main/java/org/jabref/gui/preview/PreviewPanel.java
index 6e1ed4ab7ef..46c659f0ff6 100644
--- a/src/main/java/org/jabref/gui/preview/PreviewPanel.java
+++ b/src/main/java/org/jabref/gui/preview/PreviewPanel.java
@@ -11,12 +11,15 @@
 import javafx.scene.control.SeparatorMenuItem;
 import javafx.scene.input.ClipboardContent;
 import javafx.scene.input.DataFormat;
+import javafx.scene.input.DragEvent;
 import javafx.scene.input.Dragboard;
 import javafx.scene.input.KeyEvent;
+import javafx.scene.input.MouseEvent;
 import javafx.scene.input.TransferMode;
 import javafx.scene.layout.VBox;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.StateManager;
 import org.jabref.gui.externalfiles.ExternalFilesEntryLinker;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.keyboard.KeyBinding;
@@ -45,70 +48,76 @@ public class PreviewPanel extends VBox {
     private final PreviewViewer previewView;
     private final PreviewPreferences previewPreferences;
     private final DialogService dialogService;
+
     private BibEntry entry;
 
-    public PreviewPanel(BibDatabaseContext database,
-                        DialogService dialogService,
+    public PreviewPanel(DialogService dialogService,
                         KeyBindingRepository keyBindingRepository,
                         PreferencesService preferencesService,
                         ThemeManager themeManager,
                         TaskExecutor taskExecutor,
                         LuceneManager luceneManager,
+                        StateManager stateManager,
                         OptionalObjectProperty<SearchQuery> searchQueryProperty) {
         this.keyBindingRepository = keyBindingRepository;
         this.dialogService = dialogService;
         this.previewPreferences = preferencesService.getPreviewPreferences();
-        this.fileLinker = new ExternalFilesEntryLinker(preferencesService.getFilePreferences(), database, dialogService);
+        this.fileLinker = new ExternalFilesEntryLinker(preferencesService.getFilePreferences(), dialogService, stateManager);
 
         PreviewPreferences previewPreferences = preferencesService.getPreviewPreferences();
-        previewView = new PreviewViewer(database, dialogService, preferencesService, themeManager, taskExecutor, searchQueryProperty);
+        previewView = new PreviewViewer(dialogService, preferencesService, themeManager, taskExecutor, searchQueryProperty);
         previewView.setLayout(previewPreferences.getSelectedPreviewLayout());
         previewView.setContextMenu(createPopupMenu());
-        previewView.setOnDragDetected(event -> {
-            previewView.startFullDrag();
+        previewView.setOnDragDetected(this::onDragDetected);
+        previewView.setOnDragOver(PreviewPanel::onDragOver);
+        previewView.setOnDragDropped(event -> onDragDropped(luceneManager, event));
 
-            Dragboard dragboard = previewView.startDragAndDrop(TransferMode.COPY);
-            ClipboardContent content = new ClipboardContent();
-            content.putHtml(previewView.getSelectionHtmlContent());
-            dragboard.setContent(content);
+        this.getChildren().add(previewView);
 
-            event.consume();
-        });
+        createKeyBindings();
+        previewView.setLayout(previewPreferences.getSelectedPreviewLayout());
+    }
 
-        previewView.setOnDragOver(event -> {
-            if (event.getDragboard().hasFiles()) {
-                event.acceptTransferModes(TransferMode.COPY, TransferMode.MOVE, TransferMode.LINK);
-            }
-            event.consume();
-        });
+    private void onDragDetected(MouseEvent event) {
+        previewView.startFullDrag();
 
-        previewView.setOnDragDropped(event -> {
-            boolean success = false;
-            if (event.getDragboard().hasContent(DataFormat.FILES)) {
-                List<Path> files = event.getDragboard().getFiles().stream().map(File::toPath).collect(Collectors.toList());
+        Dragboard dragboard = previewView.startDragAndDrop(TransferMode.COPY);
+        ClipboardContent content = new ClipboardContent();
+        content.putHtml(previewView.getSelectionHtmlContent());
+        dragboard.setContent(content);
 
-                if (event.getTransferMode() == TransferMode.MOVE) {
-                    LOGGER.debug("Mode MOVE"); // shift on win or no modifier
-                    fileLinker.moveFilesToFileDirRenameAndAddToEntry(entry, files, luceneManager);
-                }
-                if (event.getTransferMode() == TransferMode.LINK) {
-                    LOGGER.debug("Node LINK"); // alt on win
-                    fileLinker.addFilesToEntry(entry, files);
-                }
-                if (event.getTransferMode() == TransferMode.COPY) {
-                    LOGGER.debug("Mode Copy"); // ctrl on win, no modifier on Xubuntu
-                    fileLinker.copyFilesToFileDirAndAddToEntry(entry, files, luceneManager);
-                }
-                success = true;
-            }
+        event.consume();
+    }
 
-            event.setDropCompleted(success);
-            event.consume();
-        });
-        this.getChildren().add(previewView);
+    private static void onDragOver(DragEvent event) {
+        if (event.getDragboard().hasFiles()) {
+            event.acceptTransferModes(TransferMode.COPY, TransferMode.MOVE, TransferMode.LINK);
+        }
+        event.consume();
+    }
 
-        createKeyBindings();
-        previewView.setLayout(previewPreferences.getSelectedPreviewLayout());
+    private void onDragDropped(LuceneManager luceneManager, DragEvent event) {
+        boolean success = false;
+        if (event.getDragboard().hasContent(DataFormat.FILES)) {
+            List<Path> files = event.getDragboard().getFiles().stream().map(File::toPath).collect(Collectors.toList());
+
+            if (event.getTransferMode() == TransferMode.MOVE) {
+                LOGGER.debug("Mode MOVE"); // shift on win or no modifier
+                fileLinker.moveFilesToFileDirRenameAndAddToEntry(entry, files, luceneManager);
+            }
+            if (event.getTransferMode() == TransferMode.LINK) {
+                LOGGER.debug("Node LINK"); // alt on win
+                fileLinker.addFilesToEntry(entry, files);
+            }
+            if (event.getTransferMode() == TransferMode.COPY) {
+                LOGGER.debug("Mode Copy"); // ctrl on win, no modifier on Xubuntu
+                fileLinker.copyFilesToFileDirAndAddToEntry(entry, files, luceneManager);
+            }
+            success = true;
+        }
+
+        event.setDropCompleted(success);
+        event.consume();
     }
 
     private void createKeyBindings() {
@@ -154,6 +163,10 @@ public void setEntry(BibEntry entry) {
         previewView.setLayout(previewPreferences.getSelectedPreviewLayout());
     }
 
+    public void setDatabase(BibDatabaseContext databaseContext) {
+        previewView.setDatabaseContext(databaseContext);
+    }
+
     public void print() {
         previewView.print();
     }
diff --git a/src/main/java/org/jabref/gui/preview/PreviewViewer.java b/src/main/java/org/jabref/gui/preview/PreviewViewer.java
index 562170a302e..d9c01f199d1 100644
--- a/src/main/java/org/jabref/gui/preview/PreviewViewer.java
+++ b/src/main/java/org/jabref/gui/preview/PreviewViewer.java
@@ -4,7 +4,6 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.net.MalformedURLException;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.regex.Pattern;
 
@@ -124,30 +123,22 @@ function getSelectionHtml() {
     private final DialogService dialogService;
     private final TaskExecutor taskExecutor;
     private final WebView previewView;
-    private final BibDatabaseContext database;
     private final ChangeListener<Optional<SearchQuery>> listener = (queryObservable, queryOldValue, queryNewValue) -> {
         searchHighlightPattern = queryNewValue.flatMap(SearchQuery::getJavaScriptPatternForWords);
         highlightSearchPattern();
     };
 
-    /**
-     * The entry currently shown
-     */
-    private Optional<BibEntry> entry = Optional.empty();
+    private BibEntry entry;
+    private BibDatabaseContext databaseContext;
     private Optional<Pattern> searchHighlightPattern = Optional.empty();
     private PreviewLayout layout;
     private boolean registered;
 
-    /**
-     * @param database Used for resolving strings and pdf directories for links.
-     */
-    public PreviewViewer(BibDatabaseContext database,
-                         DialogService dialogService,
+    public PreviewViewer(DialogService dialogService,
                          PreferencesService preferencesService,
                          ThemeManager themeManager,
                          TaskExecutor taskExecutor,
                          OptionalObjectProperty<SearchQuery> searchQueryProperty) {
-        this.database = Objects.requireNonNull(database);
         this.dialogService = dialogService;
         this.clipBoardManager = Injector.instantiateModelOrService(ClipBoardManager.class);
         this.taskExecutor = taskExecutor;
@@ -196,12 +187,11 @@ public PreviewViewer(BibDatabaseContext database,
         themeManager.installCss(previewView.getEngine());
     }
 
-    public PreviewViewer(BibDatabaseContext database,
-                         DialogService dialogService,
+    public PreviewViewer(DialogService dialogService,
                          PreferencesService preferencesService,
                          ThemeManager themeManager,
                          TaskExecutor taskExecutor) {
-        this(database, dialogService, preferencesService, themeManager, taskExecutor, OptionalObjectProperty.empty());
+        this(dialogService, preferencesService, themeManager, taskExecutor, OptionalObjectProperty.empty());
     }
 
     private void highlightSearchPattern() {
@@ -238,28 +228,41 @@ public void setLayout(PreviewLayout newLayout) {
     }
 
     public void setEntry(BibEntry newEntry) {
-        if (newEntry.equals(entry.orElse(null))) {
+        if (newEntry != null && newEntry.equals(entry)) {
             return;
         }
 
         // Remove update listener for old entry
-        entry.ifPresent(oldEntry -> {
-            for (Observable observable : oldEntry.getObservables()) {
+        if (entry != null) {
+            for (Observable observable : entry.getObservables()) {
                 observable.removeListener(this);
             }
-        });
+        }
 
-        entry = Optional.of(newEntry);
+        entry = newEntry;
 
         // Register for changes
-        for (Observable observable : newEntry.getObservables()) {
-            observable.addListener(this);
+        if (entry != null) {
+            for (Observable observable : newEntry.getObservables()) {
+                observable.addListener(this);
+            }
         }
         update();
     }
 
+    public void setDatabaseContext(BibDatabaseContext newDatabaseContext) {
+        if (newDatabaseContext != null && newDatabaseContext.equals(databaseContext)) {
+            return;
+        }
+
+        setEntry(null);
+
+        databaseContext = newDatabaseContext;
+        update();
+    }
+
     private void update() {
-        if (entry.isEmpty() || (layout == null)) {
+        if (databaseContext == null || entry == null || layout == null) {
             // Make sure that the preview panel is not completely white, especially with dark theme on
             setPreviewText("");
             return;
@@ -267,9 +270,9 @@ private void update() {
 
         Number.serialExportNumber = 1; // Set entry number in case that is included in the preview layout.
 
-        final BibEntry theEntry = entry.get();
+        final BibEntry theEntry = entry;
         BackgroundTask
-                .wrap(() -> layout.generatePreview(theEntry, database))
+                .wrap(() -> layout.generatePreview(theEntry, databaseContext))
                 .onRunning(() -> setPreviewText("<i>" + Localization.lang("Processing Citation Style \"%0\"...", layout.getDisplayName()) + "</i>"))
                 .onSuccess(this::setPreviewText)
                 .onFailure(exception -> {
@@ -305,13 +308,13 @@ private void setPreviewText(String text) {
     public void print() {
         PrinterJob job = PrinterJob.createPrinterJob();
         boolean proceed = dialogService.showPrintDialog(job);
-        if (!proceed) {
+        if (!proceed && entry != null) {
             return;
         }
 
         BackgroundTask
                 .wrap(() -> {
-                    job.getJobSettings().setJobName(entry.flatMap(BibEntry::getCitationKey).orElse("NO ENTRY"));
+                    job.getJobSettings().setJobName(entry.getCitationKey().orElse("NO CITATION KEY"));
                     previewView.getEngine().print(job);
                     job.endJob();
                 })
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
index 7dd935ab2b5..ce50a4cc805 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
@@ -65,8 +65,9 @@ private void initialize() {
         searchBarContainer.getChildren().addFirst(searchBar);
         HBox.setHgrow(searchBar, Priority.ALWAYS);
 
-        PreviewViewer previewViewer = new PreviewViewer(viewModel.getSearchDatabaseContext(), dialogService, preferencesService, themeManager, taskExecutor, stateManager.activeSearchQuery(SearchType.GLOBAL_SEARCH));
+        PreviewViewer previewViewer = new PreviewViewer(dialogService, preferencesService, themeManager, taskExecutor, stateManager.activeSearchQuery(SearchType.GLOBAL_SEARCH));
         previewViewer.setLayout(preferencesService.getPreviewPreferences().getSelectedPreviewLayout());
+        previewViewer.setDatabaseContext(viewModel.getSearchDatabaseContext());
 
         SearchResultsTableDataModel model = new SearchResultsTableDataModel(viewModel.getSearchDatabaseContext(), preferencesService, stateManager, taskExecutor);
         SearchResultsTable resultsTable = new SearchResultsTable(model, viewModel.getSearchDatabaseContext(), preferencesService, undoManager, dialogService, stateManager, taskExecutor);
diff --git a/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java b/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
index d6e642f9b7b..2abfa579acf 100644
--- a/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
+++ b/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
@@ -62,9 +62,9 @@ private CleanupJob toJob(CleanupPreferences.CleanupStep action) {
             case MAKE_PATHS_RELATIVE ->
                     new RelativePathsCleanup(databaseContext, filePreferences);
             case RENAME_PDF ->
-                    new RenamePdfCleanup(false, databaseContext, filePreferences);
+                    new RenamePdfCleanup(false, () -> databaseContext, filePreferences);
             case RENAME_PDF_ONLY_RELATIVE_PATHS ->
-                    new RenamePdfCleanup(true, databaseContext, filePreferences);
+                    new RenamePdfCleanup(true, () -> databaseContext, filePreferences);
             case CLEAN_UP_UPGRADE_EXTERNAL_LINKS ->
                     new UpgradePdfPsToFileCleanup();
             case CLEAN_UP_DELETED_LINKED_FILES ->
@@ -78,7 +78,7 @@ private CleanupJob toJob(CleanupPreferences.CleanupStep action) {
             case CONVERT_TIMESTAMP_TO_MODIFICATIONDATE ->
                     new TimeStampToModificationDate(timestampPreferences);
             case MOVE_PDF ->
-                    new MoveFilesCleanup(databaseContext, filePreferences);
+                    new MoveFilesCleanup(() -> databaseContext, filePreferences);
             case FIX_FILE_LINKS ->
                     new FileLinksCleanup();
             case CLEAN_UP_ISSN ->
diff --git a/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java b/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
index 4fad8316175..dff416b8822 100644
--- a/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
@@ -5,6 +5,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.function.Supplier;
 
 import org.jabref.logic.externalfiles.LinkedFileHandler;
 import org.jabref.model.FieldChange;
@@ -21,10 +22,10 @@ public class MoveFilesCleanup implements CleanupJob {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MoveFilesCleanup.class);
 
-    private final BibDatabaseContext databaseContext;
+    private final Supplier<BibDatabaseContext> databaseContext;
     private final FilePreferences filePreferences;
 
-    public MoveFilesCleanup(BibDatabaseContext databaseContext, FilePreferences filePreferences) {
+    public MoveFilesCleanup(Supplier<BibDatabaseContext> databaseContext, FilePreferences filePreferences) {
         this.databaseContext = Objects.requireNonNull(databaseContext);
         this.filePreferences = Objects.requireNonNull(filePreferences);
     }
@@ -35,7 +36,7 @@ public List<FieldChange> cleanup(BibEntry entry) {
 
         boolean changed = false;
         for (LinkedFile file : files) {
-            LinkedFileHandler fileHandler = new LinkedFileHandler(file, entry, databaseContext, filePreferences);
+            LinkedFileHandler fileHandler = new LinkedFileHandler(file, entry, databaseContext.get(), filePreferences);
             try {
                 boolean fileChanged = fileHandler.moveToDefaultDirectory();
                 if (fileChanged) {
diff --git a/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java b/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
index c9d04e14596..acdeadfb810 100644
--- a/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
@@ -6,6 +6,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.function.Supplier;
 
 import org.jabref.logic.externalfiles.LinkedFileHandler;
 import org.jabref.model.FieldChange;
@@ -21,11 +22,11 @@
 public class RenamePdfCleanup implements CleanupJob {
     private static final Logger LOGGER = LoggerFactory.getLogger(RenamePdfCleanup.class);
 
-    private final BibDatabaseContext databaseContext;
+    private final Supplier<BibDatabaseContext> databaseContext;
     private final boolean onlyRelativePaths;
     private final FilePreferences filePreferences;
 
-    public RenamePdfCleanup(boolean onlyRelativePaths, BibDatabaseContext databaseContext, FilePreferences filePreferences) {
+    public RenamePdfCleanup(boolean onlyRelativePaths, Supplier<BibDatabaseContext> databaseContext, FilePreferences filePreferences) {
         this.databaseContext = Objects.requireNonNull(databaseContext);
         this.onlyRelativePaths = onlyRelativePaths;
         this.filePreferences = filePreferences;
@@ -41,7 +42,7 @@ public List<FieldChange> cleanup(BibEntry entry) {
                 continue;
             }
 
-            LinkedFileHandler fileHandler = new LinkedFileHandler(file, entry, databaseContext, filePreferences);
+            LinkedFileHandler fileHandler = new LinkedFileHandler(file, entry, databaseContext.get(), filePreferences);
             try {
                 boolean changedFile = fileHandler.renameToSuggestedName();
                 if (changedFile) {
diff --git a/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java b/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
index 536c2136810..e07550e6268 100644
--- a/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
@@ -9,14 +9,13 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
+import org.jabref.gui.preview.PreviewPanel;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
-import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.preferences.OwnerPreferences;
-import org.jabref.logic.search.LuceneManager;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
@@ -40,6 +39,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -74,36 +74,38 @@ class CommentsTabTest {
     private JournalAbbreviationRepository journalAbbreviationRepository;
     @Mock
     private OwnerPreferences ownerPreferences;
+    @Mock
+    private PreviewPanel previewPanel;
 
     @Mock
     private EntryEditorPreferences entryEditorPreferences;
 
     @BeforeEach
     void setUp() {
-        MockitoAnnotations.openMocks(this);
-
-        when(preferences.getOwnerPreferences()).thenReturn(ownerPreferences);
-        when(ownerPreferences.getDefaultOwner()).thenReturn(ownerName);
-        when(preferences.getEntryEditorPreferences()).thenReturn(entryEditorPreferences);
-        when(entryEditorPreferences.shouldShowUserCommentsFields()).thenReturn(true);
-        when(databaseContext.getMode()).thenReturn(BibDatabaseMode.BIBLATEX);
-        BibEntryType entryTypeMock = mock(BibEntryType.class);
-        when(entryTypesManager.enrich(any(), any())).thenReturn(Optional.of(entryTypeMock));
-
-        commentsTab = new CommentsTab(
-                preferences,
-                databaseContext,
-                suggestionProviders,
-                undoManager,
-                mock(UndoAction.class),
-                mock(RedoAction.class),
-                dialogService,
-                themeManager,
-                taskExecutor,
-                journalAbbreviationRepository,
-                mock(LuceneManager.class),
-                OptionalObjectProperty.empty()
-        );
+        try(AutoCloseable mocks = MockitoAnnotations.openMocks(CommentsTabTest.class)) {
+
+            when(preferences.getOwnerPreferences()).thenReturn(ownerPreferences);
+            when(ownerPreferences.getDefaultOwner()).thenReturn(ownerName);
+            when(preferences.getEntryEditorPreferences()).thenReturn(entryEditorPreferences);
+            when(entryEditorPreferences.shouldShowUserCommentsFields()).thenReturn(true);
+            when(databaseContext.getMode()).thenReturn(BibDatabaseMode.BIBLATEX);
+            BibEntryType entryTypeMock = mock(BibEntryType.class);
+            when(entryTypesManager.enrich(any(), any())).thenReturn(Optional.of(entryTypeMock));
+
+            commentsTab = new CommentsTab(
+                    preferences,
+                    databaseContext,
+                    suggestionProviders,
+                    undoManager,
+                    mock(UndoAction.class),
+                    mock(RedoAction.class),
+                    dialogService,
+                    taskExecutor,
+                    journalAbbreviationRepository,
+                    previewPanel);
+        } catch (Exception e) {
+            fail(e);
+        }
     }
 
     @Test

From 465d61c86c8f071628b2ec15ea107063cb310f94 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 8 Nov 2024 14:12:45 +0100
Subject: [PATCH 02/24] Add some code comments

---
 .../java/org/jabref/gui/entryeditor/EntryEditorTab.java  | 9 +++++++++
 .../fileannotationtab/FulltextSearchResultsTab.java      | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java
index 1ac5ec4149b..61a89bd055b 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java
@@ -5,8 +5,13 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.types.EntryType;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public abstract class EntryEditorTab extends Tab {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(EntryEditorTab.class);
+
     protected BibEntry currentEntry;
 
     /**
@@ -37,6 +42,10 @@ protected void handleFocus() {
      */
     public void notifyAboutFocus(BibEntry entry) {
         if (!entry.equals(currentEntry) || !entry.getType().equals(currentEntryType)) {
+            // TODO: Shouldn't "bindToEntry" called when changing the entry?
+            LOGGER.trace("Tab got focus with different entry (or entry type) {}", entry);
+            LOGGER.trace("Different entry: {}", entry.equals(currentEntry));
+            LOGGER.trace("Different entry type: {}", !entry.getType().equals(currentEntryType));
             currentEntry = entry;
             currentEntryType = entry.getType();
             bindToEntry(entry);
diff --git a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FulltextSearchResultsTab.java b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FulltextSearchResultsTab.java
index c6ef8dbadc9..e35635f91a8 100644
--- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FulltextSearchResultsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FulltextSearchResultsTab.java
@@ -77,6 +77,8 @@ public FulltextSearchResultsTab(StateManager stateManager,
         content.setPadding(new Insets(10));
         setContent(scrollPane);
         setText(Localization.lang("Search results"));
+
+        // Rebinding is necessary because of re-rendering of highlighting of matched text
         searchQueryProperty.addListener((observable, oldValue, newValue) -> bindToEntry(entry));
     }
 

From 60b5ca15202ae13aa6043ee5ef2b40c84ce46609 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 8 Nov 2024 17:23:09 +0100
Subject: [PATCH 03/24] Fix OpenRewrite

---
 src/main/java/org/jabref/gui/preview/PreviewViewer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/preview/PreviewViewer.java b/src/main/java/org/jabref/gui/preview/PreviewViewer.java
index 97ae4b74af9..306c543af77 100644
--- a/src/main/java/org/jabref/gui/preview/PreviewViewer.java
+++ b/src/main/java/org/jabref/gui/preview/PreviewViewer.java
@@ -74,7 +74,7 @@ function getSelectionHtml() {
     private final DialogService dialogService;
     private final TaskExecutor taskExecutor;
     private final WebView previewView;
-    private final OptionalObjectProperty<org.jabref.model.search.query.SearchQuery> searchQueryProperty;
+    private final OptionalObjectProperty<SearchQuery> searchQueryProperty;
 
     // Used for resolving strings and pdf directories for links.
     private @Nullable BibDatabaseContext databaseContext;

From 86638645ac868c4573ebfd2588ed8c4d8923b53b Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 8 Nov 2024 17:24:13 +0100
Subject: [PATCH 04/24] Fix checkstyle

---
 src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java b/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
index cab3892b58d..6e7bc867144 100644
--- a/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
@@ -79,7 +79,6 @@ class CommentsTabTest {
     @BeforeEach
     void setUp() throws Exception {
         try (AutoCloseable mocks = MockitoAnnotations.openMocks(CommentsTabTest.class)) {
-
             when(preferences.getOwnerPreferences()).thenReturn(ownerPreferences);
             when(ownerPreferences.getDefaultOwner()).thenReturn(ownerName);
             when(preferences.getEntryEditorPreferences()).thenReturn(entryEditorPreferences);

From 4a70fcefc504c1bf0c783f77d12577c965fabd8c Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 8 Nov 2024 17:28:34 +0100
Subject: [PATCH 05/24] Fix CommentsTabTest

---
 .../gui/entryeditor/CommentsTabTest.java      | 49 +++++++++----------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java b/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
index 6e7bc867144..26096e14d39 100644
--- a/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
@@ -10,7 +10,6 @@
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.gui.preview.PreviewPanel;
-import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
@@ -63,8 +62,6 @@ class CommentsTabTest {
     @Mock
     private GuiPreferences preferences;
     @Mock
-    private ThemeManager themeManager;
-    @Mock
     private TaskExecutor taskExecutor;
     @Mock
     private JournalAbbreviationRepository journalAbbreviationRepository;
@@ -77,29 +74,29 @@ class CommentsTabTest {
     private EntryEditorPreferences entryEditorPreferences;
 
     @BeforeEach
-    void setUp() throws Exception {
-        try (AutoCloseable mocks = MockitoAnnotations.openMocks(CommentsTabTest.class)) {
-            when(preferences.getOwnerPreferences()).thenReturn(ownerPreferences);
-            when(ownerPreferences.getDefaultOwner()).thenReturn(ownerName);
-            when(preferences.getEntryEditorPreferences()).thenReturn(entryEditorPreferences);
-            when(entryEditorPreferences.shouldShowUserCommentsFields()).thenReturn(true);
-            when(databaseContext.getMode()).thenReturn(BibDatabaseMode.BIBLATEX);
-            BibEntryType entryTypeMock = mock(BibEntryType.class);
-            when(entryTypesManager.enrich(any(), any())).thenReturn(Optional.of(entryTypeMock));
-
-            commentsTab = new CommentsTab(
-                    preferences,
-                    databaseContext,
-                    suggestionProviders,
-                    undoManager,
-                    mock(UndoAction.class),
-                    mock(RedoAction.class),
-                    dialogService,
-                    taskExecutor,
-                    journalAbbreviationRepository,
-                    previewPanel
-            );
-        }
+    void setUp() {
+        MockitoAnnotations.openMocks(this);
+
+        when(preferences.getOwnerPreferences()).thenReturn(ownerPreferences);
+        when(ownerPreferences.getDefaultOwner()).thenReturn(ownerName);
+        when(preferences.getEntryEditorPreferences()).thenReturn(entryEditorPreferences);
+        when(entryEditorPreferences.shouldShowUserCommentsFields()).thenReturn(true);
+        when(databaseContext.getMode()).thenReturn(BibDatabaseMode.BIBLATEX);
+        BibEntryType entryTypeMock = mock(BibEntryType.class);
+        when(entryTypesManager.enrich(any(), any())).thenReturn(Optional.of(entryTypeMock));
+
+        commentsTab = new CommentsTab(
+                preferences,
+                databaseContext,
+                suggestionProviders,
+                undoManager,
+                mock(UndoAction.class),
+                mock(RedoAction.class),
+                dialogService,
+                taskExecutor,
+                journalAbbreviationRepository,
+                previewPanel
+        );
     }
 
     @Test

From 3484d2a620bd6a18a4c1505beb16817bd042f7c9 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 8 Nov 2024 17:54:27 +0100
Subject: [PATCH 06/24] Try to move

---
 .../gui/entryeditor/FieldsEditorTab.java      | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
index 7e02d5c3458..c7730a42e75 100644
--- a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -41,11 +41,16 @@
 
 import com.tobiasdiez.easybind.EasyBind;
 import com.tobiasdiez.easybind.Subscription;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A single tab displayed in the EntryEditor holding several FieldEditors.
  */
 abstract class FieldsEditorTab extends EntryEditorTab implements OffersPreview {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(FieldsEditorTab.class);
+
     protected final BibDatabaseContext databaseContext;
     protected final Map<Field, FieldEditorFX> editors = new LinkedHashMap<>();
     protected GridPane gridPane;
@@ -261,6 +266,24 @@ private void initPanel() {
         }
     }
 
+    @Override
+    protected void handleFocus() {
+        if (!preferences.getPreviewPreferences().showPreviewAsExtraTabProperty().get()) {
+            LOGGER.error("Focus on preview panel");
+
+            SplitPane container;
+            Parent parent = previewPanel.getParent();
+            if (parent != null) {  // On first run, there is no parent container attached
+                container = (SplitPane) parent.getParent();
+                container.getItems().remove(previewPanel);
+            }
+
+            container = (SplitPane) this.getContent();
+            container.getItems().add(1, previewPanel);
+            container.setDividerPositions(preferences.getEntryEditorPreferences().getPreviewWidthDividerPosition());
+        }
+    }
+
     private void savePreviewWidthDividerPosition(Number position) {
         if (!preferences.getPreviewPreferences().shouldShowPreviewAsExtraTab()) {
             preferences.getEntryEditorPreferences().setPreviewWidthDividerPosition(position.doubleValue());

From 5c793ca12ace2101472de03c249db3b8a9ec9437 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 8 Nov 2024 21:18:09 +0100
Subject: [PATCH 07/24] Fix imports

---
 src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
index 1e3d425cec0..6c69b71c988 100644
--- a/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
@@ -15,7 +15,6 @@
 import org.jabref.gui.preview.PreviewPanel;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
-import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.TaskExecutor;
@@ -26,7 +25,6 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.OrFields;
-import org.jabref.model.search.query.SearchQuery;
 
 public class RequiredFieldsTab extends FieldsEditorTab {
 

From f5583181dd91a709183f6877a05a937411e49326 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 8 Nov 2024 21:21:18 +0100
Subject: [PATCH 08/24] WIP

---
 .../gui/entryeditor/FieldsEditorTab.java      | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
index c7730a42e75..d682130e867 100644
--- a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -249,20 +249,33 @@ private void initPanel() {
             scrollPane.setFitToHeight(true);
 
             SplitPane container = new SplitPane(scrollPane);
+            setContent(container);
             EasyBind.subscribe(preferences.getPreviewPreferences().showPreviewAsExtraTabProperty(), show -> {
-                if (show) {
-                    container.getItems().remove(previewPanel);
-                } else {
-                    container.getItems().add(1, previewPanel);
-                    container.setDividerPositions(preferences.getEntryEditorPreferences().getPreviewWidthDividerPosition());
+                removePreviewPanel();
+                if (!show) {
+                    addPreviewPanel();
                 }
             });
 
-            // save position
+            // save divider position
             dividerPositionSubscription = EasyBind.valueAt(container.getDividers(), 0)
                                                   .mapObservable(SplitPane.Divider::positionProperty)
                                                   .subscribeToValues(this::savePreviewWidthDividerPosition);
-            setContent(container);
+        }
+    }
+
+    private void addPreviewPanel() {
+        SplitPane container = (SplitPane) this.getContent();
+        container.getItems().add(1, previewPanel);
+        container.setDividerPositions(preferences.getEntryEditorPreferences().getPreviewWidthDividerPosition());
+    }
+
+    private void removePreviewPanel() {
+        SplitPane container;
+        Parent parent = previewPanel.getParent();
+        if (parent != null) {  // On first run, there is no parent container attached
+            container = (SplitPane) parent.getParent();
+            container.getItems().remove(previewPanel);
         }
     }
 
@@ -271,16 +284,8 @@ protected void handleFocus() {
         if (!preferences.getPreviewPreferences().showPreviewAsExtraTabProperty().get()) {
             LOGGER.error("Focus on preview panel");
 
-            SplitPane container;
-            Parent parent = previewPanel.getParent();
-            if (parent != null) {  // On first run, there is no parent container attached
-                container = (SplitPane) parent.getParent();
-                container.getItems().remove(previewPanel);
-            }
-
-            container = (SplitPane) this.getContent();
-            container.getItems().add(1, previewPanel);
-            container.setDividerPositions(preferences.getEntryEditorPreferences().getPreviewWidthDividerPosition());
+            removePreviewPanel();
+            addPreviewPanel();
         }
     }
 

From 24f63aa821db6b4684be247b2f71ab75dadcf45e Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 8 Nov 2024 21:38:45 +0100
Subject: [PATCH 09/24] Add JavaDoc

---
 src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
index d682130e867..01c12668997 100644
--- a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -270,6 +270,9 @@ private void addPreviewPanel() {
         container.setDividerPositions(preferences.getEntryEditorPreferences().getPreviewWidthDividerPosition());
     }
 
+    /**
+     * Removes the preview panel (also from other tabs!)
+     */
     private void removePreviewPanel() {
         SplitPane container;
         Parent parent = previewPanel.getParent();

From be10da9bcb6edb3c36b16bea8284cfb95df2e6ac Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Fri, 8 Nov 2024 21:39:32 +0100
Subject: [PATCH 10/24] Add checks for present PreviewPanel

---
 .../org/jabref/gui/entryeditor/FieldsEditorTab.java    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
index d682130e867..a9172b6a0a5 100644
--- a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -266,8 +266,10 @@ private void initPanel() {
 
     private void addPreviewPanel() {
         SplitPane container = (SplitPane) this.getContent();
-        container.getItems().add(1, previewPanel);
-        container.setDividerPositions(preferences.getEntryEditorPreferences().getPreviewWidthDividerPosition());
+        if (!container.getItems().contains(previewPanel)) {
+            container.getItems().add(1, previewPanel);
+            container.setDividerPositions(preferences.getEntryEditorPreferences().getPreviewWidthDividerPosition());
+        }
     }
 
     private void removePreviewPanel() {
@@ -275,7 +277,9 @@ private void removePreviewPanel() {
         Parent parent = previewPanel.getParent();
         if (parent != null) {  // On first run, there is no parent container attached
             container = (SplitPane) parent.getParent();
-            container.getItems().remove(previewPanel);
+            if (container instanceof SplitPane splitPane && splitPane.getItems().contains(previewPanel)) {
+                container.getItems().remove(previewPanel);
+            }
         }
     }
 

From d5bb5bdb564f8c01ffaaa97f4a794f1b6a179ad6 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 8 Nov 2024 21:54:04 +0100
Subject: [PATCH 11/24] Fi xsetCurrentlyEditedEntry

---
 .../org/jabref/gui/entryeditor/EntryEditor.java    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 325fc7426de..2c93afca7e7 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -70,6 +70,7 @@
 import com.tobiasdiez.easybind.EasyBind;
 import com.tobiasdiez.easybind.Subscription;
 import jakarta.inject.Inject;
+import org.jspecify.annotations.NonNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -385,8 +386,12 @@ public BibEntry getCurrentlyEditedEntry() {
         return currentlyEditedEntry;
     }
 
-    public void setCurrentlyEditedEntry(BibEntry currentlyEditedEntry) {
-        this.currentlyEditedEntry = Objects.requireNonNull(currentlyEditedEntry);
+    public void setCurrentlyEditedEntry(@NonNull BibEntry currentlyEditedEntry) {
+        if (Objects.equals(this.currentlyEditedEntry, currentlyEditedEntry)) {
+            return;
+        }
+
+        this.currentlyEditedEntry = currentlyEditedEntry;
 
         // Subscribe to type changes for rebuilding the currently visible tab
         if (typeSubscription != null) {
@@ -396,16 +401,13 @@ public void setCurrentlyEditedEntry(BibEntry currentlyEditedEntry) {
         typeSubscription = EasyBind.subscribe(this.currentlyEditedEntry.typeProperty(), type -> {
             typeLabel.setText(new TypedBibEntry(currentlyEditedEntry, databaseContext.getMode()).getTypeForDisplay());
             adaptVisibleTabs();
+            setupToolBar();
             getSelectedTab().notifyAboutFocus(currentlyEditedEntry);
         });
 
-        adaptVisibleTabs();
-        setupToolBar();
-
         if (entryEditorPreferences.showSourceTabByDefault()) {
             tabbed.getSelectionModel().select(sourceTab);
         }
-        getSelectedTab().notifyAboutFocus(currentlyEditedEntry);
     }
 
     private EntryEditorTab getSelectedTab() {

From efbfdf326302707b5e2535bb8aac1236e4743481 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 8 Nov 2024 22:19:09 +0100
Subject: [PATCH 12/24] Fix single tab preview

---
 .../org/jabref/gui/entryeditor/FieldsEditorTab.java | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
index 4b744d1e680..9be6af17fdb 100644
--- a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -265,10 +265,9 @@ private void initPanel() {
     }
 
     private void addPreviewPanel() {
-        SplitPane container = (SplitPane) this.getContent();
-        if (!container.getItems().contains(previewPanel)) {
-            container.getItems().add(1, previewPanel);
-            container.setDividerPositions(preferences.getEntryEditorPreferences().getPreviewWidthDividerPosition());
+        if ((this.getContent() instanceof SplitPane splitPane) && (!splitPane.getItems().contains(previewPanel))) {
+            splitPane.getItems().add(1, previewPanel);
+            splitPane.setDividerPositions(preferences.getEntryEditorPreferences().getPreviewWidthDividerPosition());
         }
     }
 
@@ -276,12 +275,10 @@ private void addPreviewPanel() {
      * Removes the preview panel (also from other tabs!)
      */
     private void removePreviewPanel() {
-        SplitPane container;
         Parent parent = previewPanel.getParent();
         if (parent != null) {  // On first run, there is no parent container attached
-            container = (SplitPane) parent.getParent();
-            if (container instanceof SplitPane splitPane && splitPane.getItems().contains(previewPanel)) {
-                container.getItems().remove(previewPanel);
+            if (parent.getParent() instanceof SplitPane splitPane && splitPane.getItems().contains(previewPanel)) {
+                splitPane.getItems().remove(previewPanel);
             }
         }
     }

From 66c1d1b2f2b342bfc405f25bea0a524a0696ed8b Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 8 Nov 2024 22:19:14 +0100
Subject: [PATCH 13/24] Remove comment

---
 src/main/java/org/jabref/gui/LibraryTab.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/java/org/jabref/gui/LibraryTab.java b/src/main/java/org/jabref/gui/LibraryTab.java
index f7579709894..208e91dacb2 100644
--- a/src/main/java/org/jabref/gui/LibraryTab.java
+++ b/src/main/java/org/jabref/gui/LibraryTab.java
@@ -589,9 +589,6 @@ public void showAndEdit(BibEntry entry) {
         entryEditor.requestFocus();
     }
 
-    /**
-     * Removes the bottom component.
-     */
     public void closeBottomPane() {
         mode = PanelMode.MAIN_TABLE;
         splitPane.getItems().remove(entryEditor);

From 11a84c929a585be4d29c64c35179c811afd57d92 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Fri, 8 Nov 2024 22:46:14 +0100
Subject: [PATCH 14/24] Remove OffersPreview interface

---
 .../jabref/gui/entryeditor/EntryEditor.java    |  7 ++-----
 .../gui/entryeditor/FieldsEditorTab.java       | 12 +-----------
 .../jabref/gui/entryeditor/OffersPreview.java  | 14 --------------
 .../org/jabref/gui/entryeditor/PreviewTab.java | 18 ++----------------
 4 files changed, 5 insertions(+), 46 deletions(-)
 delete mode 100644 src/main/java/org/jabref/gui/entryeditor/OffersPreview.java

diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 2c93afca7e7..f3a0cc1c7fc 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -2,7 +2,6 @@
 
 import java.io.File;
 import java.nio.file.Path;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -124,7 +123,6 @@ public class EntryEditor extends BorderPane {
     @Inject private AiService aiService;
 
     private final List<EntryEditorTab> allPossibleTabs;
-    private final Collection<OffersPreview> previewTabs;
 
     public EntryEditor(LibraryTab libraryTab, UndoAction undoAction, RedoAction redoAction) {
         this.libraryTab = libraryTab;
@@ -152,7 +150,6 @@ public EntryEditor(LibraryTab libraryTab, UndoAction undoAction, RedoAction redo
         setupKeyBindings();
 
         this.allPossibleTabs = createTabs();
-        this.previewTabs = this.allPossibleTabs.stream().filter(OffersPreview.class::isInstance).map(OffersPreview.class::cast).toList();
 
         setupDragAndDrop(libraryTab);
 
@@ -470,10 +467,10 @@ public void setFocusToField(Field field) {
     }
 
     public void nextPreviewStyle() {
-        this.previewTabs.forEach(OffersPreview::nextPreviewStyle);
+        this.previewPanel.nextPreviewStyle();
     }
 
     public void previousPreviewStyle() {
-        this.previewTabs.forEach(OffersPreview::previousPreviewStyle);
+        this.previewPanel.previousPreviewStyle();
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
index 9be6af17fdb..23784393522 100644
--- a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -47,7 +47,7 @@
 /**
  * A single tab displayed in the EntryEditor holding several FieldEditors.
  */
-abstract class FieldsEditorTab extends EntryEditorTab implements OffersPreview {
+abstract class FieldsEditorTab extends EntryEditorTab {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(FieldsEditorTab.class);
 
@@ -219,16 +219,6 @@ protected void bindToEntry(BibEntry entry) {
         previewPanel.setEntry(entry);
     }
 
-    @Override
-    public void nextPreviewStyle() {
-        previewPanel.nextPreviewStyle();
-    }
-
-    @Override
-    public void previousPreviewStyle() {
-        previewPanel.previousPreviewStyle();
-    }
-
     protected abstract SequencedSet<Field> determineFieldsToShow(BibEntry entry);
 
     public Collection<Field> getShownFields() {
diff --git a/src/main/java/org/jabref/gui/entryeditor/OffersPreview.java b/src/main/java/org/jabref/gui/entryeditor/OffersPreview.java
deleted file mode 100644
index 7aa79663c9f..00000000000
--- a/src/main/java/org/jabref/gui/entryeditor/OffersPreview.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.jabref.gui.entryeditor;
-
-public interface OffersPreview {
-
-    /**
-     * Switch to next Preview style - should be overriden if a EntryEditorTab is actually showing a preview
-     */
-    void nextPreviewStyle();
-
-    /**
-     * Switch to previous Preview style - should be overriden if a EntryEditorTab is actually showing a preview
-     */
-    void previousPreviewStyle();
-}
diff --git a/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java b/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
index 8140890552b..feea4204c9e 100644
--- a/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
@@ -7,11 +7,11 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
-public class PreviewTab extends EntryEditorTab implements OffersPreview {
+public class PreviewTab extends EntryEditorTab {
     public static final String NAME = "Preview";
     private final BibDatabaseContext databaseContext;
     private final GuiPreferences preferences;
-    private PreviewPanel previewPanel;
+    private final PreviewPanel previewPanel;
 
     public PreviewTab(BibDatabaseContext databaseContext,
                       GuiPreferences preferences,
@@ -25,20 +25,6 @@ public PreviewTab(BibDatabaseContext databaseContext,
         setContent(previewPanel);
     }
 
-    @Override
-    public void nextPreviewStyle() {
-        if (previewPanel != null) {
-            previewPanel.nextPreviewStyle();
-        }
-    }
-
-    @Override
-    public void previousPreviewStyle() {
-        if (previewPanel != null) {
-            previewPanel.previousPreviewStyle();
-        }
-    }
-
     @Override
     public boolean shouldShow(BibEntry entry) {
         return preferences.getPreviewPreferences().shouldShowPreviewAsExtraTab();

From c4ce7d24417decfaba5a63e00cf20f04e5f26ff0 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 8 Nov 2024 22:48:39 +0100
Subject: [PATCH 15/24] Disable setupMainPanel

---
 src/main/java/org/jabref/gui/frame/JabRefFrame.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/frame/JabRefFrame.java b/src/main/java/org/jabref/gui/frame/JabRefFrame.java
index 2b7ffb38497..a57d4026dbc 100644
--- a/src/main/java/org/jabref/gui/frame/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/frame/JabRefFrame.java
@@ -524,7 +524,8 @@ private OpenDatabaseAction getOpenDatabaseAction() {
      * Refreshes the ui after preferences changes
      */
     public void refresh() {
-        getLibraryTabs().forEach(LibraryTab::setupMainPanel);
+        // Disabled, because Bindings implement automatic update. Left here as commented out code to guide if something does not work after updating the preferences.
+        // getLibraryTabs().forEach(LibraryTab::setupMainPanel);
         getLibraryTabs().forEach(tab -> tab.getMainTable().getTableModel().resetFieldFormatter());
     }
 

From c97d979a28237280a68b74ad90ebfcdf0a90cbe2 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Fri, 8 Nov 2024 22:58:28 +0100
Subject: [PATCH 16/24] Remove orphaned constructor and method arguments

---
 .../jabref/gui/entryeditor/CommentsTab.java    |  6 ------
 .../gui/entryeditor/DeprecatedFieldsTab.java   |  6 ------
 .../entryeditor/DetailOptionalFieldsTab.java   |  6 ------
 .../jabref/gui/entryeditor/EntryEditor.java    | 18 +++++++++---------
 .../gui/entryeditor/FieldsEditorTab.java       | 10 ----------
 .../ImportantOptionalFieldsTab.java            |  6 ------
 .../gui/entryeditor/OptionalFieldsTabBase.java |  6 ------
 .../jabref/gui/entryeditor/OtherFieldsTab.java |  6 ------
 .../gui/entryeditor/RequiredFieldsTab.java     |  6 ------
 .../gui/entryeditor/UserDefinedFieldsTab.java  |  6 ------
 .../jabref/gui/fieldeditors/FieldEditors.java  |  4 ----
 11 files changed, 9 insertions(+), 71 deletions(-)

diff --git a/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java b/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
index 30b2fab17bc..c9053f0a4bf 100644
--- a/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
@@ -16,7 +16,6 @@
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.RowConstraints;
 
-import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.fieldeditors.FieldEditorFX;
 import org.jabref.gui.fieldeditors.FieldNameLabel;
@@ -28,7 +27,6 @@
 import org.jabref.gui.undo.UndoAction;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
@@ -49,8 +47,6 @@ public CommentsTab(GuiPreferences preferences,
                        UndoManager undoManager,
                        UndoAction undoAction,
                        RedoAction redoAction,
-                       DialogService dialogService,
-                       TaskExecutor taskExecutor,
                        JournalAbbreviationRepository journalAbbreviationRepository,
                        PreviewPanel previewPanel) {
         super(false,
@@ -59,9 +55,7 @@ public CommentsTab(GuiPreferences preferences,
                 undoManager,
                 undoAction,
                 redoAction,
-                dialogService,
                 preferences,
-                taskExecutor,
                 journalAbbreviationRepository,
                 previewPanel);
         this.defaultOwner = preferences.getOwnerPreferences().getDefaultOwner().toLowerCase(Locale.ROOT).replaceAll("[^a-z0-9]", "-");
diff --git a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
index 642d7ad37cb..6bef4bf0dd8 100644
--- a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
@@ -9,7 +9,6 @@
 
 import javafx.scene.control.Tooltip;
 
-import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.preferences.GuiPreferences;
@@ -18,7 +17,6 @@
 import org.jabref.gui.undo.UndoAction;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
@@ -38,10 +36,8 @@ public DeprecatedFieldsTab(BibDatabaseContext databaseContext,
                                UndoManager undoManager,
                                UndoAction undoAction,
                                RedoAction redoAction,
-                               DialogService dialogService,
                                GuiPreferences preferences,
                                BibEntryTypesManager entryTypesManager,
-                               TaskExecutor taskExecutor,
                                JournalAbbreviationRepository journalAbbreviationRepository,
                                PreviewPanel previewPanel) {
         super(
@@ -51,9 +47,7 @@ public DeprecatedFieldsTab(BibDatabaseContext databaseContext,
                 undoManager,
                 undoAction,
                 redoAction,
-                dialogService,
                 preferences,
-                taskExecutor,
                 journalAbbreviationRepository,
                 previewPanel
         );
diff --git a/src/main/java/org/jabref/gui/entryeditor/DetailOptionalFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/DetailOptionalFieldsTab.java
index 568ec16782c..48fb2ef017f 100644
--- a/src/main/java/org/jabref/gui/entryeditor/DetailOptionalFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/DetailOptionalFieldsTab.java
@@ -2,7 +2,6 @@
 
 import javax.swing.undo.UndoManager;
 
-import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.gui.preview.PreviewPanel;
@@ -10,7 +9,6 @@
 import org.jabref.gui.undo.UndoAction;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntryTypesManager;
 
@@ -23,10 +21,8 @@ public DetailOptionalFieldsTab(BibDatabaseContext databaseContext,
                                    UndoManager undoManager,
                                    UndoAction undoAction,
                                    RedoAction redoAction,
-                                   DialogService dialogService,
                                    GuiPreferences preferences,
                                    BibEntryTypesManager entryTypesManager,
-                                   TaskExecutor taskExecutor,
                                    JournalAbbreviationRepository journalAbbreviationRepository,
                                    PreviewPanel previewPanel) {
         super(
@@ -37,10 +33,8 @@ public DetailOptionalFieldsTab(BibDatabaseContext databaseContext,
                 undoManager,
                 undoAction,
                 redoAction,
-                dialogService,
                 preferences,
                 entryTypesManager,
-                taskExecutor,
                 journalAbbreviationRepository,
                 previewPanel
         );
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index f3a0cc1c7fc..381a50d2781 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -151,7 +151,7 @@ public EntryEditor(LibraryTab libraryTab, UndoAction undoAction, RedoAction redo
 
         this.allPossibleTabs = createTabs();
 
-        setupDragAndDrop(libraryTab);
+        setupDragAndDrop();
 
         EasyBind.subscribe(tabbed.getSelectionModel().selectedItemProperty(), tab -> {
             EntryEditorTab activeTab = (EntryEditorTab) tab;
@@ -168,7 +168,7 @@ public EntryEditor(LibraryTab libraryTab, UndoAction undoAction, RedoAction redo
                 });
     }
 
-    private void setupDragAndDrop(LibraryTab libraryTab) {
+    private void setupDragAndDrop() {
         this.setOnDragOver(event -> {
             if (event.getDragboard().hasFiles()) {
                 event.acceptTransferModes(TransferMode.COPY, TransferMode.MOVE, TransferMode.LINK);
@@ -279,18 +279,18 @@ private List<EntryEditorTab> createTabs() {
         tabs.add(new PreviewTab(databaseContext, preferences, previewPanel));
 
         // Required, optional (important+detail), deprecated, and "other" fields
-        tabs.add(new RequiredFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferences, bibEntryTypesManager, taskExecutor, journalAbbreviationRepository, previewPanel));
-        tabs.add(new ImportantOptionalFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferences, bibEntryTypesManager, taskExecutor, journalAbbreviationRepository, previewPanel));
-        tabs.add(new DetailOptionalFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferences, bibEntryTypesManager, taskExecutor, journalAbbreviationRepository, previewPanel));
-        tabs.add(new DeprecatedFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferences, bibEntryTypesManager, taskExecutor, journalAbbreviationRepository, previewPanel));
-        tabs.add(new OtherFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferences, bibEntryTypesManager, taskExecutor, journalAbbreviationRepository, previewPanel));
+        tabs.add(new RequiredFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, preferences, bibEntryTypesManager, journalAbbreviationRepository, previewPanel));
+        tabs.add(new ImportantOptionalFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, preferences, bibEntryTypesManager, journalAbbreviationRepository, previewPanel));
+        tabs.add(new DetailOptionalFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, preferences, bibEntryTypesManager, journalAbbreviationRepository, previewPanel));
+        tabs.add(new DeprecatedFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, preferences, bibEntryTypesManager, journalAbbreviationRepository, previewPanel));
+        tabs.add(new OtherFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, preferences, bibEntryTypesManager, journalAbbreviationRepository, previewPanel));
 
         // Comment Tab: Tab for general and user-specific comments
-        tabs.add(new CommentsTab(preferences, databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, taskExecutor, journalAbbreviationRepository, previewPanel));
+        tabs.add(new CommentsTab(preferences, databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, journalAbbreviationRepository, previewPanel));
 
         Map<String, Set<Field>> entryEditorTabList = getAdditionalUserConfiguredTabs();
         for (Map.Entry<String, Set<Field>> tab : entryEditorTabList.entrySet()) {
-            tabs.add(new UserDefinedFieldsTab(tab.getKey(), tab.getValue(), databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferences, taskExecutor, journalAbbreviationRepository, previewPanel));
+            tabs.add(new UserDefinedFieldsTab(tab.getKey(), tab.getValue(), databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, preferences, journalAbbreviationRepository, previewPanel));
         }
 
         tabs.add(new MathSciNetTab());
diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
index 23784393522..c425ed7bad9 100644
--- a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -24,7 +24,6 @@
 import javafx.scene.layout.Region;
 import javafx.scene.layout.RowConstraints;
 
-import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.fieldeditors.FieldEditorFX;
 import org.jabref.gui.fieldeditors.FieldEditors;
@@ -34,7 +33,6 @@
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
-import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
@@ -58,9 +56,7 @@ abstract class FieldsEditorTab extends EntryEditorTab {
     private final SuggestionProviders suggestionProviders;
     private final UndoAction undoAction;
     private final RedoAction redoAction;
-    private final DialogService dialogService;
     private final GuiPreferences preferences;
-    private final TaskExecutor taskExecutor;
     private final JournalAbbreviationRepository journalAbbreviationRepository;
     private final PreviewPanel previewPanel;
     private final UndoManager undoManager;
@@ -76,9 +72,7 @@ public FieldsEditorTab(boolean compressed,
                            UndoManager undoManager,
                            UndoAction undoAction,
                            RedoAction redoAction,
-                           DialogService dialogService,
                            GuiPreferences preferences,
-                           TaskExecutor taskExecutor,
                            JournalAbbreviationRepository journalAbbreviationRepository,
                            PreviewPanel previewPanel) {
         this.isCompressed = compressed;
@@ -87,9 +81,7 @@ public FieldsEditorTab(boolean compressed,
         this.undoManager = Objects.requireNonNull(undoManager);
         this.undoAction = undoAction;
         this.redoAction = redoAction;
-        this.dialogService = Objects.requireNonNull(dialogService);
         this.preferences = Objects.requireNonNull(preferences);
-        this.taskExecutor = Objects.requireNonNull(taskExecutor);
         this.journalAbbreviationRepository = Objects.requireNonNull(journalAbbreviationRepository);
         this.previewPanel = previewPanel;
     }
@@ -152,8 +144,6 @@ protected void setupPanel(BibEntry entry, boolean compressed) {
     protected Label createLabelAndEditor(BibEntry entry, Field field) {
         FieldEditorFX fieldEditor = FieldEditors.getForField(
                 field,
-                taskExecutor,
-                dialogService,
                 journalAbbreviationRepository,
                 preferences,
                 databaseContext,
diff --git a/src/main/java/org/jabref/gui/entryeditor/ImportantOptionalFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/ImportantOptionalFieldsTab.java
index 45d668932fd..ca3681aa114 100644
--- a/src/main/java/org/jabref/gui/entryeditor/ImportantOptionalFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/ImportantOptionalFieldsTab.java
@@ -2,7 +2,6 @@
 
 import javax.swing.undo.UndoManager;
 
-import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.gui.preview.PreviewPanel;
@@ -10,7 +9,6 @@
 import org.jabref.gui.undo.UndoAction;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntryTypesManager;
 
@@ -23,10 +21,8 @@ public ImportantOptionalFieldsTab(BibDatabaseContext databaseContext,
                                       UndoManager undoManager,
                                       UndoAction undoAction,
                                       RedoAction redoAction,
-                                      DialogService dialogService,
                                       GuiPreferences preferences,
                                       BibEntryTypesManager entryTypesManager,
-                                      TaskExecutor taskExecutor,
                                       JournalAbbreviationRepository journalAbbreviationRepository,
                                       PreviewPanel previewPanel) {
         super(
@@ -37,10 +33,8 @@ public ImportantOptionalFieldsTab(BibDatabaseContext databaseContext,
                 undoManager,
                 undoAction,
                 redoAction,
-                dialogService,
                 preferences,
                 entryTypesManager,
-                taskExecutor,
                 journalAbbreviationRepository,
                 previewPanel
         );
diff --git a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
index 8b47d668b40..74c0fcf1092 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
@@ -8,7 +8,6 @@
 
 import javafx.scene.control.Tooltip;
 
-import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.preferences.GuiPreferences;
@@ -17,7 +16,6 @@
 import org.jabref.gui.undo.UndoAction;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
@@ -36,10 +34,8 @@ public OptionalFieldsTabBase(String title,
                                  UndoManager undoManager,
                                  UndoAction undoAction,
                                  RedoAction redoAction,
-                                 DialogService dialogService,
                                  GuiPreferences preferences,
                                  BibEntryTypesManager entryTypesManager,
-                                 TaskExecutor taskExecutor,
                                  JournalAbbreviationRepository journalAbbreviationRepository,
                                  PreviewPanel previewPanel) {
         super(true,
@@ -48,9 +44,7 @@ public OptionalFieldsTabBase(String title,
                 undoManager,
                 undoAction,
                 redoAction,
-                dialogService,
                 preferences,
-                taskExecutor,
                 journalAbbreviationRepository,
                 previewPanel);
         this.entryTypesManager = entryTypesManager;
diff --git a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
index feb3f8de243..af324852a69 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
@@ -12,7 +12,6 @@
 
 import javafx.scene.control.Tooltip;
 
-import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.preferences.GuiPreferences;
@@ -21,7 +20,6 @@
 import org.jabref.gui.undo.UndoAction;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
@@ -43,10 +41,8 @@ public OtherFieldsTab(BibDatabaseContext databaseContext,
                           UndoManager undoManager,
                           UndoAction undoAction,
                           RedoAction redoAction,
-                          DialogService dialogService,
                           GuiPreferences preferences,
                           BibEntryTypesManager entryTypesManager,
-                          TaskExecutor taskExecutor,
                           JournalAbbreviationRepository journalAbbreviationRepository,
                           PreviewPanel previewPanel) {
         super(
@@ -56,9 +52,7 @@ public OtherFieldsTab(BibDatabaseContext databaseContext,
                 undoManager,
                 undoAction,
                 redoAction,
-                dialogService,
                 preferences,
-                taskExecutor,
                 journalAbbreviationRepository,
                 previewPanel
         );
diff --git a/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
index 6c69b71c988..1f861363b9c 100644
--- a/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
@@ -8,7 +8,6 @@
 
 import javafx.scene.control.Tooltip;
 
-import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.preferences.GuiPreferences;
@@ -17,7 +16,6 @@
 import org.jabref.gui.undo.UndoAction;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryType;
@@ -36,10 +34,8 @@ public RequiredFieldsTab(BibDatabaseContext databaseContext,
                              UndoManager undoManager,
                              UndoAction undoAction,
                              RedoAction redoAction,
-                             DialogService dialogService,
                              GuiPreferences preferences,
                              BibEntryTypesManager entryTypesManager,
-                             TaskExecutor taskExecutor,
                              JournalAbbreviationRepository journalAbbreviationRepository,
                              PreviewPanel previewPanel) {
         super(
@@ -49,9 +45,7 @@ public RequiredFieldsTab(BibDatabaseContext databaseContext,
                 undoManager,
                 undoAction,
                 redoAction,
-                dialogService,
                 preferences,
-                taskExecutor,
                 journalAbbreviationRepository,
                 previewPanel
         );
diff --git a/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
index 6dbca6f30a6..e42ed0458e3 100644
--- a/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
@@ -6,7 +6,6 @@
 
 import javax.swing.undo.UndoManager;
 
-import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.preferences.GuiPreferences;
@@ -14,7 +13,6 @@
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
-import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
@@ -29,9 +27,7 @@ public UserDefinedFieldsTab(String name,
                                 UndoManager undoManager,
                                 UndoAction undoAction,
                                 RedoAction redoAction,
-                                DialogService dialogService,
                                 GuiPreferences preferences,
-                                TaskExecutor taskExecutor,
                                 JournalAbbreviationRepository journalAbbreviationRepository,
                                 PreviewPanel previewPanel) {
         super(
@@ -41,9 +37,7 @@ public UserDefinedFieldsTab(String name,
                 undoManager,
                 undoAction,
                 redoAction,
-                dialogService,
                 preferences,
-                taskExecutor,
                 journalAbbreviationRepository,
                 previewPanel);
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java b/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
index 643ca3179e3..4cf0deb39be 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
@@ -6,7 +6,6 @@
 
 import javax.swing.undo.UndoManager;
 
-import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.ContentSelectorSuggestionProvider;
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.autocompleter.SuggestionProviders;
@@ -25,7 +24,6 @@
 import org.jabref.gui.undo.UndoAction;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
-import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
@@ -45,8 +43,6 @@ public class FieldEditors {
     private static final Logger LOGGER = LoggerFactory.getLogger(FieldEditors.class);
 
     public static FieldEditorFX getForField(final Field field,
-                                            final TaskExecutor taskExecutor,
-                                            final DialogService dialogService,
                                             final JournalAbbreviationRepository journalAbbreviationRepository,
                                             final GuiPreferences preferences,
                                             final BibDatabaseContext databaseContext,

From cb34bd926339aa4ecd145c6d80ab59686e3b52bf Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 8 Nov 2024 23:12:04 +0100
Subject: [PATCH 17/24] WIP

---
 .../gui/entryeditor/FieldsEditorTab.java      | 40 ++++++++++++++-----
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
index 9be6af17fdb..b20ced08f31 100644
--- a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -250,10 +250,19 @@ private void initPanel() {
 
             SplitPane container = new SplitPane(scrollPane);
             setContent(container);
-            EasyBind.subscribe(preferences.getPreviewPreferences().showPreviewAsExtraTabProperty(), show -> {
-                removePreviewPanel();
-                if (!show) {
-                    addPreviewPanel();
+            EasyBind.subscribe(preferences.getPreviewPreferences().showPreviewAsExtraTabProperty(), showInExtraTab -> {
+                if (showInExtraTab) {
+                    removePreviewPanelFromThisTab();
+                } else {
+                    // Add it to the split pane
+                    // No removal needed, because previously, it is contained in the preview tab itself
+
+                    // In case the entry preview tab is focused - and the preview is not to be shown any more, the next selected tab is the required fields tab
+                    // Addition only needed if it will be shown. Otherwise, {@link #handleFocus()} will take care of it
+                    if (this instanceof RequiredFieldsTab || this.getContent().isVisible()) {
+                        // previewPanel.getParent();
+                        addPreviewPanel();
+                    }
                 }
             });
 
@@ -265,16 +274,23 @@ private void initPanel() {
     }
 
     private void addPreviewPanel() {
-        if ((this.getContent() instanceof SplitPane splitPane) && (!splitPane.getItems().contains(previewPanel))) {
+        assert this.getContent() instanceof SplitPane;
+        if ((this.getContent() instanceof SplitPane splitPane) && !splitPane.getItems().contains(previewPanel) && splitPane.isVisible()) {
             splitPane.getItems().add(1, previewPanel);
             splitPane.setDividerPositions(preferences.getEntryEditorPreferences().getPreviewWidthDividerPosition());
         }
     }
 
-    /**
-     * Removes the preview panel (also from other tabs!)
-     */
-    private void removePreviewPanel() {
+    private void removePreviewPanelFromThisTab() {
+        assert this.getContent() instanceof SplitPane;
+        if (this.getContent() instanceof SplitPane splitPane && splitPane.getItems().contains(previewPanel)) {
+            splitPane.getItems().remove(previewPanel);
+            // Needed to "redraw" the split pane with one item (because JavaFX does not readjust if it is shown)
+            // splitPane.setDividerPositions(1.0);
+        }
+    }
+
+    private void removePreviewPanelFromOtherTabs() {
         Parent parent = previewPanel.getParent();
         if (parent != null) {  // On first run, there is no parent container attached
             if (parent.getParent() instanceof SplitPane splitPane && splitPane.getItems().contains(previewPanel)) {
@@ -288,12 +304,16 @@ protected void handleFocus() {
         if (!preferences.getPreviewPreferences().showPreviewAsExtraTabProperty().get()) {
             LOGGER.error("Focus on preview panel");
 
-            removePreviewPanel();
+            // We need to move the preview panel from the non-visible tab to the visible tab
+            removePreviewPanelFromOtherTabs();
             addPreviewPanel();
         }
     }
 
     private void savePreviewWidthDividerPosition(Number position) {
+        if (position.doubleValue() == 1.0) {
+            return;
+        }
         if (!preferences.getPreviewPreferences().shouldShowPreviewAsExtraTab()) {
             preferences.getEntryEditorPreferences().setPreviewWidthDividerPosition(position.doubleValue());
         }

From 78dd30f20923017fb6f7cd2e5677380165587ef6 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Fri, 8 Nov 2024 23:17:16 +0100
Subject: [PATCH 18/24] Set PreviewPanel into a SplitPane to be removable

---
 src/main/java/org/jabref/gui/entryeditor/PreviewTab.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java b/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
index feea4204c9e..e0711e54100 100644
--- a/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.entryeditor;
 
+import javafx.scene.control.SplitPane;
+
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.gui.preview.PreviewPanel;
@@ -22,7 +24,7 @@ public PreviewTab(BibDatabaseContext databaseContext,
 
         setGraphic(IconTheme.JabRefIcons.TOGGLE_ENTRY_PREVIEW.getGraphicNode());
         setText(Localization.lang("Preview"));
-        setContent(previewPanel);
+        setContent(new SplitPane(previewPanel));
     }
 
     @Override

From defb822806dfd0047109d8e1472ac64faadaf8bf Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 8 Nov 2024 23:24:01 +0100
Subject: [PATCH 19/24] Add workaround

---
 .../java/org/jabref/gui/entryeditor/FieldsEditorTab.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
index 17c627a3fad..831d2643978 100644
--- a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -255,7 +255,11 @@ private void initPanel() {
 
     private void addPreviewPanel() {
         assert this.getContent() instanceof SplitPane;
-        if ((this.getContent() instanceof SplitPane splitPane) && !splitPane.getItems().contains(previewPanel) && splitPane.isVisible()) {
+
+        // Really ensure it is not already there
+        removePreviewPanelFromThisTab();
+
+        if ((this.getContent() instanceof SplitPane splitPane) && !splitPane.getItems().contains(previewPanel)) { // we do not check for "visible", because the split pane will (!) become visible, but it is not visible yet.
             splitPane.getItems().add(1, previewPanel);
             splitPane.setDividerPositions(preferences.getEntryEditorPreferences().getPreviewWidthDividerPosition());
         }

From 681ba8bb6b59e0fb925c0fcd8cf339d3c97f2f74 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 8 Nov 2024 23:31:55 +0100
Subject: [PATCH 20/24] Nearly working

---
 src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
index 831d2643978..ee251f650b7 100644
--- a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -259,7 +259,7 @@ private void addPreviewPanel() {
         // Really ensure it is not already there
         removePreviewPanelFromThisTab();
 
-        if ((this.getContent() instanceof SplitPane splitPane) && !splitPane.getItems().contains(previewPanel)) { // we do not check for "visible", because the split pane will (!) become visible, but it is not visible yet.
+        if ((this.getContent() instanceof SplitPane splitPane) && !splitPane.getItems().contains(previewPanel) && this.getContent().isVisible()) {
             splitPane.getItems().add(1, previewPanel);
             splitPane.setDividerPositions(preferences.getEntryEditorPreferences().getPreviewWidthDividerPosition());
         }
@@ -285,6 +285,8 @@ private void removePreviewPanelFromOtherTabs() {
 
     @Override
     protected void handleFocus() {
+        LOGGER.error("This is {}", preferences.getPreviewPreferences().showPreviewAsExtraTabProperty().get());
+        LOGGER.error("This is then {}", !preferences.getPreviewPreferences().showPreviewAsExtraTabProperty().get());
         if (!preferences.getPreviewPreferences().showPreviewAsExtraTabProperty().get()) {
             LOGGER.error("Focus on preview panel");
 

From dd8e077cef13d5341a21d210332760a6d53788be Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Sat, 9 Nov 2024 01:01:21 +0100
Subject: [PATCH 21/24] Introduce TabWithPreviewPanel (and final fixes)

---
 .../jabref/gui/entryeditor/EntryEditor.java   |  7 ++++
 .../gui/entryeditor/FieldsEditorTab.java      | 39 ++++---------------
 .../jabref/gui/entryeditor/PreviewTab.java    | 21 +++++-----
 .../gui/entryeditor/TabWithPreviewPanel.java  | 34 ++++++++++++++++
 4 files changed, 59 insertions(+), 42 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/entryeditor/TabWithPreviewPanel.java

diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 381a50d2781..3a2bd6f2258 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -164,6 +164,13 @@ public EntryEditor(LibraryTab libraryTab, UndoAction undoAction, RedoAction redo
                 (obs, oldValue, newValue) -> {
                     if (currentlyEditedEntry != null) {
                         adaptVisibleTabs();
+                        Tab tab = tabbed.getSelectionModel().selectedItemProperty().get();
+                        if (newValue && tab instanceof FieldsEditorTab fieldsEditorTab) {
+                            fieldsEditorTab.removePreviewPanelFromThisTab();
+                        }
+                        if (tab instanceof TabWithPreviewPanel previewTab) {
+                            previewTab.handleFocus();
+                        }
                     }
                 });
     }
diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
index ee251f650b7..eec4567e718 100644
--- a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -45,11 +45,10 @@
 /**
  * A single tab displayed in the EntryEditor holding several FieldEditors.
  */
-abstract class FieldsEditorTab extends EntryEditorTab {
+abstract class FieldsEditorTab extends TabWithPreviewPanel {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(FieldsEditorTab.class);
 
-    protected final BibDatabaseContext databaseContext;
     protected final Map<Field, FieldEditorFX> editors = new LinkedHashMap<>();
     protected GridPane gridPane;
     private final boolean isCompressed;
@@ -58,7 +57,6 @@ abstract class FieldsEditorTab extends EntryEditorTab {
     private final RedoAction redoAction;
     private final GuiPreferences preferences;
     private final JournalAbbreviationRepository journalAbbreviationRepository;
-    private final PreviewPanel previewPanel;
     private final UndoManager undoManager;
 
     private Collection<Field> fields = new ArrayList<>();
@@ -75,15 +73,14 @@ public FieldsEditorTab(boolean compressed,
                            GuiPreferences preferences,
                            JournalAbbreviationRepository journalAbbreviationRepository,
                            PreviewPanel previewPanel) {
+        super(databaseContext, previewPanel);
         this.isCompressed = compressed;
-        this.databaseContext = Objects.requireNonNull(databaseContext);
         this.suggestionProviders = Objects.requireNonNull(suggestionProviders);
         this.undoManager = Objects.requireNonNull(undoManager);
         this.undoAction = undoAction;
         this.redoAction = redoAction;
         this.preferences = Objects.requireNonNull(preferences);
         this.journalAbbreviationRepository = Objects.requireNonNull(journalAbbreviationRepository);
-        this.previewPanel = previewPanel;
     }
 
     private static void addColumn(GridPane gridPane, int columnIndex, List<Label> nodes) {
@@ -205,8 +202,7 @@ public boolean shouldShow(BibEntry entry) {
     protected void bindToEntry(BibEntry entry) {
         initPanel();
         setupPanel(entry, isCompressed);
-        previewPanel.setDatabase(databaseContext);
-        previewPanel.setEntry(entry);
+        super.bindToEntry(entry);
     }
 
     protected abstract SequencedSet<Field> determineFieldsToShow(BibEntry entry);
@@ -230,21 +226,9 @@ private void initPanel() {
 
             SplitPane container = new SplitPane(scrollPane);
             setContent(container);
-            EasyBind.subscribe(preferences.getPreviewPreferences().showPreviewAsExtraTabProperty(), showInExtraTab -> {
-                if (showInExtraTab) {
-                    removePreviewPanelFromThisTab();
-                } else {
-                    // Add it to the split pane
-                    // No removal needed, because previously, it is contained in the preview tab itself
-
-                    // In case the entry preview tab is focused - and the preview is not to be shown any more, the next selected tab is the required fields tab
-                    // Addition only needed if it will be shown. Otherwise, {@link #handleFocus()} will take care of it
-                    if (this instanceof RequiredFieldsTab || this.getContent().isVisible()) {
-                        // previewPanel.getParent();
-                        addPreviewPanel();
-                    }
-                }
-            });
+
+            // Adaption of visible tabs done in {@link org.jabref.gui.entryeditor.EntryEditor.EntryEditor}, where the subscription to
+            // preferences.getPreviewPreferences().showPreviewAsExtraTabProperty() is established
 
             // save divider position
             dividerPositionSubscription = EasyBind.valueAt(container.getDividers(), 0)
@@ -265,7 +249,7 @@ private void addPreviewPanel() {
         }
     }
 
-    private void removePreviewPanelFromThisTab() {
+    public void removePreviewPanelFromThisTab() {
         assert this.getContent() instanceof SplitPane;
         if (this.getContent() instanceof SplitPane splitPane && splitPane.getItems().contains(previewPanel)) {
             splitPane.getItems().remove(previewPanel);
@@ -274,15 +258,6 @@ private void removePreviewPanelFromThisTab() {
         }
     }
 
-    private void removePreviewPanelFromOtherTabs() {
-        Parent parent = previewPanel.getParent();
-        if (parent != null) {  // On first run, there is no parent container attached
-            if (parent.getParent() instanceof SplitPane splitPane && splitPane.getItems().contains(previewPanel)) {
-                splitPane.getItems().remove(previewPanel);
-            }
-        }
-    }
-
     @Override
     protected void handleFocus() {
         LOGGER.error("This is {}", preferences.getPreviewPreferences().showPreviewAsExtraTabProperty().get());
diff --git a/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java b/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
index e0711e54100..30658f95c9b 100644
--- a/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
@@ -9,22 +9,23 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
-public class PreviewTab extends EntryEditorTab {
+public class PreviewTab extends TabWithPreviewPanel {
     public static final String NAME = "Preview";
-    private final BibDatabaseContext databaseContext;
+
     private final GuiPreferences preferences;
-    private final PreviewPanel previewPanel;
+    private final SplitPane splitPane;
 
     public PreviewTab(BibDatabaseContext databaseContext,
                       GuiPreferences preferences,
                       PreviewPanel previewPanel) {
-        this.databaseContext = databaseContext;
+        super(databaseContext, previewPanel);
         this.preferences = preferences;
-        this.previewPanel = previewPanel;
 
         setGraphic(IconTheme.JabRefIcons.TOGGLE_ENTRY_PREVIEW.getGraphicNode());
         setText(Localization.lang("Preview"));
-        setContent(new SplitPane(previewPanel));
+
+        splitPane = new SplitPane();
+        setContent(splitPane);
     }
 
     @Override
@@ -32,9 +33,9 @@ public boolean shouldShow(BibEntry entry) {
         return preferences.getPreviewPreferences().shouldShowPreviewAsExtraTab();
     }
 
-    @Override
-    protected void bindToEntry(BibEntry entry) {
-        previewPanel.setDatabase(databaseContext);
-        previewPanel.setEntry(entry);
+    protected void handleFocus() {
+        removePreviewPanelFromOtherTabs();
+        this.splitPane.getItems().clear();
+        this.splitPane.getItems().add(previewPanel);
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/TabWithPreviewPanel.java b/src/main/java/org/jabref/gui/entryeditor/TabWithPreviewPanel.java
new file mode 100644
index 00000000000..065b8487f40
--- /dev/null
+++ b/src/main/java/org/jabref/gui/entryeditor/TabWithPreviewPanel.java
@@ -0,0 +1,34 @@
+package org.jabref.gui.entryeditor;
+
+import javafx.scene.Parent;
+import javafx.scene.control.SplitPane;
+
+import org.jabref.gui.preview.PreviewPanel;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+
+public abstract class TabWithPreviewPanel extends EntryEditorTab {
+    protected final BibDatabaseContext databaseContext;
+    protected final PreviewPanel previewPanel;
+
+    public TabWithPreviewPanel(BibDatabaseContext databaseContext, PreviewPanel previewPanel) {
+        this.databaseContext = databaseContext;
+        this.previewPanel = previewPanel;
+    }
+
+    @Override
+    protected void bindToEntry(BibEntry entry) {
+        previewPanel.setDatabase(databaseContext);
+        previewPanel.setEntry(entry);
+    }
+
+    protected void removePreviewPanelFromOtherTabs() {
+        Parent parent = previewPanel.getParent();
+        if (parent != null) {  // On first run, there is no parent container attached
+            assert parent.getParent() instanceof SplitPane;
+            if (parent.getParent() instanceof SplitPane splitPane && splitPane.getItems().contains(previewPanel)) {
+                splitPane.getItems().remove(previewPanel);
+            }
+        }
+    }
+}

From 24b612ce8f287c1464d955567e7fe4eec53a9d79 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Sat, 9 Nov 2024 01:02:29 +0100
Subject: [PATCH 22/24] Add CHANGELOG.md entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38e1c8b26c9..f1126b31a18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -113,6 +113,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We fixed an issue where web search preferences "Custom API key" table modifications not discarded. [#11925](https://github.com/JabRef/jabref/issues/11925)
 - We fixed an issue when opening attached files in [extra file columns](https://docs.jabref.org/finding-sorting-and-cleaning-entries/filelinks#adding-additional-columns-to-entry-table-for-file-types). [#12005](https://github.com/JabRef/jabref/issues/12005)
 - We fixed an issue where trying to open a library from a failed mounted directory on Mac would cause an error. [#10548](https://github.com/JabRef/jabref/issues/10548)
+- We fixed an issue when the preview was out of sync. [#9172](https://github.com/JabRef/jabref/issues/9172)
 - We fixed an issue where identifier paste couldn't work with Unicode REPLACEMENT CHARACTER. [#11986](https://github.com/JabRef/jabref/issues/11986)
 
 ### Removed

From c55c6441bf69479e8f59724149ee0b26d3451e1f Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Sat, 9 Nov 2024 01:04:53 +0100
Subject: [PATCH 23/24] Remove parameters

---
 src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java b/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
index 26096e14d39..14f10f08cfe 100644
--- a/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
@@ -92,8 +92,6 @@ void setUp() {
                 undoManager,
                 mock(UndoAction.class),
                 mock(RedoAction.class),
-                dialogService,
-                taskExecutor,
                 journalAbbreviationRepository,
                 previewPanel
         );

From eb073aa5e70d5f30b1f15c46ddadf0f27a998157 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Sun, 10 Nov 2024 19:09:54 +0100
Subject: [PATCH 24/24] Add JavaDoc comment

---
 src/main/java/org/jabref/gui/preview/PreviewPanel.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/org/jabref/gui/preview/PreviewPanel.java b/src/main/java/org/jabref/gui/preview/PreviewPanel.java
index 9b2872a1ceb..a1e27d45820 100644
--- a/src/main/java/org/jabref/gui/preview/PreviewPanel.java
+++ b/src/main/java/org/jabref/gui/preview/PreviewPanel.java
@@ -35,6 +35,9 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.search.query.SearchQuery;
 
+/// Displays the entry preview
+///
+/// The instance is re-used at each tab. The code ensures that the panel is moved across tabs when the user switches the tab.
 public class PreviewPanel extends VBox {
 
     private final ExternalFilesEntryLinker fileLinker;