Merge branch 'fix-for-issue-JabRef#12272' of https://github.com/oops-shlok/jabref into fix-for-issue-JabRef#12272

Author: oops-shlok

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

@@ -123,21 +123,6 @@ public JabRefFrame(Stage mainStage,
         this.clipBoardManager = clipBoardManager;
         this.taskExecutor = taskExecutor;
 
-        this.fileHistory = new FileHistoryMenu(
-                this.preferences.getLastFilesOpenedPreferences().getFileHistory(),
-                dialogService,
-                getOpenDatabaseAction());
-
-        this.setOnKeyTyped(key -> {
-            if (this.fileHistory.isShowing()) {
-                if (this.fileHistory.openFileByKey(key)) {
-                    this.fileHistory.getParentMenu().hide();
-                }
-            }
-        });
-
-        fileHistory.disableProperty().bind(Bindings.isEmpty(fileHistory.getItems()));
-
         setId("frame");
 
         // Create components
@@ -187,6 +172,21 @@ public JabRefFrame(Stage mainStage,
                 this.preferences,
                 taskExecutor);
 
+        this.fileHistory = new FileHistoryMenu(
+                this.preferences.getLastFilesOpenedPreferences().getFileHistory(),
+                dialogService,
+                getOpenDatabaseAction());
+
+        fileHistory.disableProperty().bind(Bindings.isEmpty(fileHistory.getItems()));
+
+        this.setOnKeyTyped(key -> {
+            if (this.fileHistory.isShowing()) {
+                if (this.fileHistory.openFileByKey(key)) {
+                    this.fileHistory.getParentMenu().hide();
+                }
+            }
+        });
+
         initLayout();
         initKeyBindings();
         frameDndHandler.initDragAndDrop();
@@ -450,8 +450,11 @@ private void updateTabBarVisible() {
      * Returns the currently viewed LibraryTab.
      */
     public LibraryTab getCurrentLibraryTab() {
-        return (LibraryTab) Optional.ofNullable(tabbedPane.getSelectionModel().getSelectedItem())
-                                    .filter(tab -> tab instanceof LibraryTab).orElse(null);
+        if (tabbedPane.getSelectionModel().getSelectedItem() == null
+                || !(tabbedPane.getSelectionModel().getSelectedItem() instanceof LibraryTab)) {
+            return null;
+        }
+        return (LibraryTab) tabbedPane.getSelectionModel().getSelectedItem();
     }
 
     public void showLibraryTab(@NonNull LibraryTab libraryTab) {
@@ -465,24 +468,24 @@ public void showWelcomeTab() {
                 tabbedPane.getSelectionModel().select(tab);
                 return;
             }
-
-            // If the WelcomeTab is not found, a new instance is created and added
-            WelcomeTab welcomeTab = new WelcomeTab(
-                    this,
-                    preferences,
-                    aiService,
-                    dialogService,
-                    stateManager,
-                    fileUpdateMonitor,
-                    entryTypesManager,
-                    undoManager,
-                    clipBoardManager,
-                    taskExecutor,
-                    fileHistory
-            );
-            tabbedPane.getTabs().add(welcomeTab);
-            tabbedPane.getSelectionModel().select(welcomeTab);
         }
+
+        // If the WelcomeTab is not found, a new instance is created and added
+        WelcomeTab welcomeTab = new WelcomeTab(
+                this,
+                preferences,
+                aiService,
+                dialogService,
+                stateManager,
+                fileUpdateMonitor,
+                entryTypesManager,
+                undoManager,
+                clipBoardManager,
+                taskExecutor,
+                fileHistory
+        );
+        tabbedPane.getTabs().add(welcomeTab);
+        tabbedPane.getSelectionModel().select(welcomeTab);
     }
 
     /**

src/main/java/org/jabref/gui/frame/MainMenu.java

@@ -167,6 +167,7 @@ private void createMenu() {
                         factory.createMenuItem(StandardActions.EXPORT_ALL, new ExportCommand(ExportCommand.ExportMethod.EXPORT_ALL, frame::getCurrentLibraryTab, stateManager, dialogService, preferences, entryTypesManager, abbreviationRepository, taskExecutor)),
                         factory.createMenuItem(StandardActions.EXPORT_SELECTED, new ExportCommand(ExportCommand.ExportMethod.EXPORT_SELECTED, frame::getCurrentLibraryTab, stateManager, dialogService, preferences, entryTypesManager, abbreviationRepository, taskExecutor)),
                         factory.createMenuItem(StandardActions.SAVE_SELECTED_AS_PLAIN_BIBTEX, new SaveAction(SaveAction.SaveMethod.SAVE_SELECTED, frame::getCurrentLibraryTab, dialogService, preferences, stateManager))),
+
                 new SeparatorMenuItem(),
 
                 factory.createSubMenu(StandardActions.REMOTE_DB,
@@ -332,6 +333,7 @@ private void createMenu() {
 
                 factory.createMenuItem(StandardActions.NEXT_PREVIEW_STYLE, new PreviewSwitchAction(PreviewSwitchAction.Direction.NEXT, frame::getCurrentLibraryTab, stateManager)),
                 factory.createMenuItem(StandardActions.PREVIOUS_PREVIEW_STYLE, new PreviewSwitchAction(PreviewSwitchAction.Direction.PREVIOUS, frame::getCurrentLibraryTab, stateManager)),
+
                 new SeparatorMenuItem(),
 
                 factory.createMenuItem(StandardActions.SHOW_PDF_VIEWER, new ShowDocumentViewerAction(stateManager, preferences)),

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

@@ -145,18 +145,13 @@ public FileDialogConfiguration getFileDialogConfiguration(Path initialDirectory)
      */
     @VisibleForTesting
     Path getInitialDirectory() {
-        if (tabContainer.getLibraryTabs().isEmpty()) {
+        if (tabContainer.getLibraryTabs().isEmpty() || tabContainer.getCurrentLibraryTab() == null) {
+            // currentTab might not be a LibraryTab but the WelcomeTab
             return preferences.getFilePreferences().getWorkingDirectory();
+        } else {
+            Optional<Path> databasePath = tabContainer.getCurrentLibraryTab().getBibDatabaseContext().getDatabasePath();
+            return databasePath.map(Path::getParent).orElse(preferences.getFilePreferences().getWorkingDirectory());
         }
-
-        // This is because of the WelcomeTab class.
-        LibraryTab currentTab = tabContainer.getCurrentLibraryTab();
-        if (currentTab == null) {
-            return preferences.getFilePreferences().getWorkingDirectory();
-        }
-
-        Optional<Path> databasePath = currentTab.getBibDatabaseContext().getDatabasePath();
-        return databasePath.map(Path::getParent).orElse(preferences.getFilePreferences().getWorkingDirectory());
     }
 
     /**