Merge pull request #4278 from JabRef/bibdatabasecontex

Fix NPE with bibdatabasecontext in preview style dialog

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

@@ -228,7 +228,6 @@ public BasePanel(JabRefFrame frame, BasePanelPreferences preferences, BibDatabas
         this.preview = new PreviewPanel(this, getBibDatabaseContext(), preferences.getKeyBindings(), preferences.getPreviewPreferences(), dialogService, externalFileTypes);
         frame().getGlobalSearchBar().getSearchQueryHighlightObservable().addSearchListener(preview);
 
-
     }
 
     @Subscribe

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

@@ -5,6 +5,7 @@
 import java.io.StringReader;
 import java.nio.file.Path;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.Future;
 import java.util.regex.Pattern;
@@ -70,18 +71,18 @@ public class PreviewPanel extends ScrollPane implements SearchQueryHighlightList
     /**
      * If a database is set, the preview will attempt to resolve strings in the previewed entry using that database.
      */
-    private Optional<BibDatabaseContext> databaseContext = Optional.empty();
+    private BibDatabaseContext databaseContext;
     private final WebView previewView;
     private Optional<Future<?>> citationStyleFuture = Optional.empty();
 
     private final NewDroppedFileHandler fileHandler;
 
     /**
      * @param panel           (may be null) Only set this if the preview is associated to the main window.
-     * @param databaseContext (may be null) Used for resolving pdf directories for links.
+     * @param databaseContext Used for resolving pdf directories for links. Must not be null.
      */
     public PreviewPanel(BasePanel panel, BibDatabaseContext databaseContext, KeyBindingRepository keyBindingRepository, PreviewPreferences preferences, DialogService dialogService, ExternalFileTypes externalFileTypes) {
-        this.databaseContext = Optional.ofNullable(databaseContext);
+        this.databaseContext = Objects.requireNonNull(databaseContext);
         this.basePanel = Optional.ofNullable(panel);
         this.dialogService = dialogService;
         this.clipBoardManager = Globals.clipboardManager;
@@ -198,7 +199,7 @@ private ContextMenu createPopupMenu() {
     }
 
     public void setDatabaseContext(BibDatabaseContext databaseContext) {
-        this.databaseContext = Optional.ofNullable(databaseContext);
+        this.databaseContext = databaseContext;
     }
 
     public Optional<BasePanel> getBasePanel() {
@@ -281,7 +282,7 @@ public void update() {
         if (layout.isPresent()) {
             StringBuilder sb = new StringBuilder();
             bibEntry.ifPresent(entry -> sb.append(layout.get()
-                                                        .doLayout(entry, databaseContext.map(BibDatabaseContext::getDatabase).orElse(null))));
+                                                        .doLayout(entry, databaseContext.getDatabase())));
             setPreviewLabel(sb.toString());
         } else if (basePanel.isPresent() && bibEntry.isPresent()) {
             Future<?> citationStyleWorker = BackgroundTask

src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java

@@ -53,6 +53,7 @@
 import org.jabref.logic.openoffice.StyleLoader;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.logic.util.TestEntry;
+import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.JabRefPreferences;
 
@@ -134,7 +135,7 @@ private void init() {
         // Create a preview panel for previewing styles
         // Must be done before creating the table to avoid NPEs
         DefaultTaskExecutor.runInJavaFXThread(() -> {
-            preview = new PreviewPanel(null, null, Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), dialogService, ExternalFileTypes.getInstance());
+            preview = new PreviewPanel(null, new BibDatabaseContext(), Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), dialogService, ExternalFileTypes.getInstance());
             // Use the test entry from the Preview settings tab in Preferences:
             preview.setEntry(prevEntry);
         });

src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java

@@ -128,7 +128,7 @@ private void setupLogic() {
         btnTest.setOnAction(event -> {
             try {
                 DefaultTaskExecutor.runInJavaFXThread(() -> {
-                    PreviewPanel testPane = new PreviewPanel(null, null, Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), dialogService, externalFileTypes);
+                    PreviewPanel testPane = new PreviewPanel(null, new BibDatabaseContext(), Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), dialogService, externalFileTypes);
                     if (chosen.getSelectionModel().getSelectedItems().isEmpty()) {
                         testPane.setFixedLayout(layout.getText());
                         testPane.setEntry(TestEntry.getTestEntry());