Prevent bulk imports from adding entries to navigation history

.github/workflows/rerun-merge-conflict-check.yml

@@ -7,6 +7,7 @@ on:
 
 jobs:
   rerun:
+    if: github.repository == 'JabRef/jabref'
     runs-on: ubuntu-latest
     permissions:
       actions: write

.github/workflows/run-openrewrite.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v5
         with:
-          java-version: 24
+          java-version: 25
           distribution: 'corretto'
           check-latest: true
       - name: Setup Gradle

.github/workflows/tests-code.yml

@@ -89,6 +89,12 @@ jobs:
         with:
           submodules: 'true'
           show-progress: 'false'
+      - name: Set up JDK
+        uses: actions/setup-java@v5
+        with:
+          java-version: 24
+          distribution: 'corretto'
+          check-latest: true
       - name: Set up JDK
         uses: actions/setup-java@v5
         with:
@@ -532,7 +538,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v5
         with:
-          java-version: 24
+          java-version: 25
           distribution: 'corretto'
           check-latest: true
       - name: Generate JBang cache key

.jbang/JabKitLauncher.java

@@ -2,7 +2,7 @@
 
 //DESCRIPTION jabkit - mange BibTeX files using JabRef
 
-//JAVA 24
+//JAVA 24+
 //RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED
 
 // raw is for https://github.com/unicode-org/icu/pull/2127

.jbang/JabLsLauncher.java

@@ -2,7 +2,7 @@
 
 //DESCRIPTION jabls - start a bibtex languageserver
 
-//JAVA 24
+//JAVA 24+
 //RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED
 
 // raw is for https://github.com/unicode-org/icu/pull/2127

.jbang/JabSrvLauncher.java

@@ -2,7 +2,7 @@
 
 //DESCRIPTION jabsrv - serve BibTeX files using JabRef
 
-//JAVA 24
+//JAVA 24+
 //RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED
 
 // raw is for https://github.com/unicode-org/icu/pull/2127

CHANGELOG.md

@@ -12,6 +12,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 ### Added
 
 - Improved merge dialog decisions for fields containing person names (e.g., `author`, `editor`) by using a new plausibility comparator. JabRef now prefers the side with more detailed/complete author information. [#14454](https://github.com/JabRef/jabref/issues/14454)
+- We added 15 non-standard BibLaTeX entry types (Audio, Image, Legal, ...) to the group "Non-standard types" group in the New Entry dialog and in the context menu. [#12963](https://github.com/JabRef/jabref/issues/12963)
 - We added a drop-down menu to those custom fields in the main table for which content selector values exists. [#14087](https://github.com/JabRef/jabref/issues/14087)
 - We added a "Jump to Field" dialog (`Ctrl+J`) to quickly search for and navigate to any field across all tabs. [#12276](https://github.com/JabRef/jabref/issues/12276).
 - We added "IEEE" as another option for parsing plain text citations. [#14233](github.com/JabRef/jabref/pull/14233)
@@ -42,10 +43,13 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - After importing, now all imported entries are marked. [#13535](https://github.com/JabRef/jabref/pull/13535)
 - The URL integrity check now checks the complete URL syntax. [#14370](https://github.com/JabRef/jabref/pull/14370)
 - <kbd>Tab</kbd> in the last text field of a tab moves the focus to the next tab in the entry editor. [#11937](https://github.com/JabRef/jabref/issues/11937)
+- When pasting invalid BibTeX data, the content is now pasted as `@Misc` with the raw data in the `comment` field. [#14520](https://github.com/JabRef/jabref/pull/14520)
 - We changed fixed-value ComboBoxes to SearchableComboBox for better usability. [#14083](https://github.com/JabRef/jabref/issues/14083)
+- We renamed "Search pre-configured" to "Search pre-selected" and "Web search fetchers" to "Pre-selected fetchers". [#14557](https://github.com/JabRef/jabref/issues/14557)
 
 ### Fixed
 
+- We fixed an issue where bulk import operations polluted the navigation history, making the Back/Forward buttons navigate through imported entries instead of only user-selected entries. [#13878](https://github.com/JabRef/jabref/issues/13878)
 - We fixed an issue where pressing <kbd>ESC</kbd> in the preferences dialog would not always close the dialog. [#8888](https://github.com/JabRef/jabref/issues/8888)
 - We fixed the checkbox in merge dialog "Treat duplicates the same way" to make it functional. [#14224](https://github.com/JabRef/jabref/pull/14224)
 - We fixed the fallback window height (786 → 768) in JabRefGUI. [#14295](https://github.com/JabRef/jabref/pull/14295)

build-support/src/main/java/CitationStyleCatalogGenerator.java

@@ -1,4 +1,4 @@
-//JAVA 24
+//JAVA 24+
 //RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED
 
 //DEPS org.jspecify:jspecify:1.0.0

build-support/src/main/java/JournalListMvGenerator.java

@@ -1,15 +1,15 @@
-//JAVA 24
+//JAVA 24+
 //RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED
 
 //DEPS com.h2database:h2:2.4.240
+//DEPS info.debatty:java-string-similarity:2.0.0
 //DEPS org.antlr:antlr4-runtime:4.13.2
 //DEPS org.apache.commons:commons-csv:1.14.1
-//DEPS info.debatty:java-string-similarity:2.0.0
 //DEPS org.jooq:jool:0.9.15
+//DEPS org.jspecify:jspecify:1.0.0
 //DEPS org.openjfx:javafx-base:24.0.2
 //DEPS org.slf4j:slf4j-api:2.0.17
 //DEPS org.slf4j:slf4j-simple:2.0.17
-//DEPS org.jspecify:jspecify:1.0.0
 
 //SOURCES ../../../../jablib/src/main/java/org/jabref/logic/journals/Abbreviation.java
 //SOURCES ../../../../jablib/src/main/java/org/jabref/logic/journals/AbbreviationFormat.java

build-support/src/main/java/LtwaListMvGenerator.java

@@ -1,13 +1,13 @@
-//JAVA 24
+//JAVA 24+
 //RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED
 
 //DEPS com.h2database:h2:2.4.240
 //DEPS org.antlr:antlr4-runtime:4.13.2
 //DEPS org.apache.commons:commons-csv:1.14.1
 //DEPS info.debatty:java-string-similarity:2.0.0
 //DEPS org.jooq:jool:0.9.15
-//DEPS org.openjfx:javafx-base:24.0.2
 //DEPS org.jspecify:jspecify:1.0.0
+//DEPS org.openjfx:javafx-base:24.0.2
 //DEPS org.slf4j:slf4j-api:2.0.17
 //DEPS org.slf4j:slf4j-simple:2.0.17
 

docs/code-howtos/fetchers.md

@@ -12,8 +12,8 @@ Fetchers are the implementation of the [search using online services](https://do
 | [Medline/Pubmed](https://pubmed.ncbi.nlm.nih.gov/)                                                                                                | [NCBI User account](https://account.ncbi.nlm.nih.gov/settings/)                                                | `medlineApiKey`                | 10 requests/seconds                                                 |
 | [MathSciNet](http://www.ams.org/mathscinet)                                                                                                       | (none)                                                                                                         | (none)                         | Depending on the current network                                    |
 | [SAO/NASA Astrophysics Data System](https://docs.jabref.org/collect/import-using-online-bibliographic-database#sao-nasa-astrophysics-data-system) | [ADS UI](https://ui.adsabs.harvard.edu/user/settings/token)                                                    | `AstrophysicsDataSystemAPIKey` | 5000 calls/day                                                      |
-| [ScienceDirect](https://www.sciencedirect.com)                                                                                                    | [Elsevier Dev Portal](https://dev.elsevier.com/)                                                               | `ScienceDirectApiKey`          |                                                                     |
-| [SemanticScholar](https://www.semanticscholar.org/)                                                                                               | <https://www.semanticscholar.org/product/api#api-key-form>                                                     | `SemanticScholarApiKey`        | [20.000 calls/week](https://dev.elsevier.com/api_key_settings.html) |
+| [ScienceDirect](https://www.sciencedirect.com)                                                                                                    | [Elsevier Dev Portal](https://dev.elsevier.com/)                                                               | `ScienceDirectApiKey`          | [20.000 calls/week](https://dev.elsevier.com/api_key_settings.html) |
+| [SemanticScholar](https://www.semanticscholar.org/)                                                                                               | <https://www.semanticscholar.org/product/api#api-key-form>                                                     | `SemanticScholarApiKey`        |                                                                     |
 | [Springer Nature](https://docs.jabref.org/collect/import-using-online-bibliographic-database#springer)                                            | [Springer Nature API portal](https://dev.springernature.com). Use the "Meta API" API key.                      | `SpringerNatureAPIKey`         | 5000 calls/day                                                      |
 | [Zentralblatt Math](https://www.zbmath.org)                                                                                                       | (none)                                                                                                         | (none)                         | Depending on the current network                                    |
 

jabgui/src/main/java/org/jabref/gui/LibraryTab.java

@@ -92,6 +92,8 @@
 import org.jabref.model.entry.event.EntriesEventSource;
 import org.jabref.model.entry.event.FieldChangedEvent;
 import org.jabref.model.entry.field.FieldFactory;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.groups.GroupTreeNode;
 import org.jabref.model.search.query.SearchQuery;
 import org.jabref.model.util.FileUpdateMonitor;
@@ -103,6 +105,7 @@
 import org.controlsfx.control.NotificationPane;
 import org.controlsfx.control.action.Action;
 import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -126,6 +129,7 @@ public class LibraryTab extends Tab implements CommandSelectionTab {
     private final BooleanProperty canGoBackProperty = new SimpleBooleanProperty(false);
     private final BooleanProperty canGoForwardProperty = new SimpleBooleanProperty(false);
     private boolean backOrForwardNavigationActionTriggered = false;
+    private NavigationHistory.@Nullable Suppression currentBulkImportSuppression;
 
     private BibDatabaseContext bibDatabaseContext;
 
@@ -239,7 +243,9 @@ private void initializeComponentsAndListeners(boolean isDummyContext) {
                 undoManager,
                 stateManager,
                 dialogService,
-                taskExecutor);
+                taskExecutor,
+                this::startBulkImport,
+                this::endBulkImport);
 
         setupMainPanel();
         setupAutoCompletion();
@@ -821,18 +827,30 @@ public void insertEntry(final BibEntry bibEntry) {
     }
 
     public void insertEntries(final List<BibEntry> entries) {
+        insertEntries(entries, false);
+    }
+
+    /**
+     * Inserts entries into the library.
+     *
+     * @param entries the entries to insert
+     * @param suppressNavigation if true, navigation history will not be updated for these entries
+     */
+    public void insertEntries(final List<BibEntry> entries, boolean suppressNavigation) {
         if (entries.isEmpty()) {
             return;
         }
 
-        importHandler.importCleanedEntries(null, entries);
-        getUndoManager().addEdit(new UndoableInsertEntries(bibDatabaseContext.getDatabase(), entries));
-        markBaseChanged();
-        stateManager.setSelectedEntries(entries);
-        if (preferences.getEntryEditorPreferences().shouldOpenOnNewEntry()) {
-            showAndEdit(entries.getFirst());
-        } else {
-            clearAndSelect(entries.getFirst());
+        try (NavigationHistory.Suppression ignored = suppressNavigation ? navigationHistory.suppressUpdates() : NavigationHistory.Suppression.noOp()) {
+            importHandler.importCleanedEntries(null, entries);
+            getUndoManager().addEdit(new UndoableInsertEntries(bibDatabaseContext.getDatabase(), entries));
+            markBaseChanged();
+            stateManager.setSelectedEntries(entries);
+            if (preferences.getEntryEditorPreferences().shouldOpenOnNewEntry()) {
+                showAndEdit(entries.getFirst());
+            } else {
+                clearAndSelect(entries.getFirst());
+            }
         }
     }
 
@@ -894,7 +912,10 @@ private List<BibEntry> handleNonBibTeXStringData(String data) {
             } else {
                 dialogService.showErrorDialogAndWait(exception);
             }
-            return List.of();
+            BibEntry fallBack = new BibEntry(StandardEntryType.Misc)
+                    .withField(StandardField.COMMENT, data)
+                    .withChanged(true);
+            return List.of(fallBack);
         }
     }
 
@@ -1038,6 +1059,27 @@ public void updateNavigationState() {
         canGoForwardProperty.set(canGoForward());
     }
 
+    /**
+     * Called by ImportHandler when starting a bulk import operation.
+     * Suppresses navigation history updates during the import.
+     */
+    private void startBulkImport() {
+        if (currentBulkImportSuppression == null) {
+            currentBulkImportSuppression = navigationHistory.suppressUpdates();
+        }
+    }
+
+    /**
+     * Called by ImportHandler when ending a bulk import operation.
+     * Resumes normal navigation history tracking.
+     */
+    private void endBulkImport() {
+        if (currentBulkImportSuppression != null) {
+            currentBulkImportSuppression.close();
+            currentBulkImportSuppression = null;
+        }
+    }
+
     /**
      * Creates a new library tab. Contents are loaded by the {@code dataLoadingTask}. Most of the other parameters are required by {@code resetChangeMonitor()}.
      *

jabgui/src/main/java/org/jabref/gui/NavigationHistory.java

@@ -16,6 +16,7 @@ public class NavigationHistory {
     private final List<BibEntry> previousEntries = new ArrayList<>();
     private final List<BibEntry> nextEntries = new ArrayList<>();
     private BibEntry currentEntry;
+    private int suppressionDepth;
 
     /**
      * Sets a new entry as the current one, clearing the forward history.
@@ -24,6 +25,10 @@ public class NavigationHistory {
      * @param entry The BibEntry to add to the history.
      */
     public void add(BibEntry entry) {
+        if (isSuppressed()) {
+            return;
+        }
+
         if (Objects.equals(currentEntry, entry)) {
             return;
         }
@@ -74,4 +79,65 @@ public boolean canGoBack() {
     public boolean canGoForward() {
         return !nextEntries.isEmpty();
     }
+
+    /**
+     * Suppresses navigation history updates while the returned guard is open.
+     * Intended for bulk operations that perform multiple selection changes.
+     */
+    public Suppression suppressUpdates() {
+        return new Suppression(this);
+    }
+
+    /**
+     * Convenience helper to suppress updates conditionally.
+     */
+    public Suppression suppressUpdatesIf(boolean active) {
+        return active ? suppressUpdates() : Suppression.noOp();
+    }
+
+    private boolean isSuppressed() {
+        return suppressionDepth > 0;
+    }
+
+    private void beginSuppression() {
+        suppressionDepth++;
+    }
+
+    private void endSuppression() {
+        if (suppressionDepth > 0) {
+            suppressionDepth--;
+        }
+    }
+
+    public static final class Suppression implements AutoCloseable {
+        private static final Suppression NO_OP = new Suppression();
+
+        private final NavigationHistory owner;
+        private boolean closed;
+        private final boolean active;
+
+        private Suppression() {
+            this.owner = null;
+            this.active = false;
+        }
+
+        private Suppression(NavigationHistory owner) {
+            this.owner = owner;
+            this.active = true;
+            owner.beginSuppression();
+        }
+
+        @Override
+        public void close() {
+            if (closed || !active) {
+                return;
+            }
+            closed = true;
+            owner.endSuppression();
+        }
+
+        public static Suppression noOp() {
+            return NO_OP;
+        }
+    }
 }