From aab2f2161f4bcb8cc1c9f1546123fd0cfbf09ad4 Mon Sep 17 00:00:00 2001
From: Wanling Fu <wanlingfu3@gmail.com>
Date: Mon, 31 Mar 2025 20:22:52 +0100
Subject: [PATCH 01/17] Add .blg warning support in IntegrityCheckDialog with
 Browse/Reset and path resolution

---
 src/main/java/org/jabref/gui/LibraryTab.java  |  4 +
 .../gui/integrity/BibLogSettingsPane.fxml     | 19 ++++
 .../gui/integrity/BibLogSettingsPane.java     | 58 +++++++++++
 .../integrity/BibLogSettingsViewModel.java    | 96 +++++++++++++++++++
 .../gui/integrity/IntegrityCheckAction.java   | 10 +-
 .../gui/integrity/IntegrityCheckDialog.fxml   |  4 +-
 .../gui/integrity/IntegrityCheckDialog.java   | 73 +++++++++++++-
 .../logic/biblog/BibLogPathResolver.java      | 36 +++++++
 ...BibWarningToIntegrityMessageConverter.java | 48 ++++++++++
 .../jabref/logic/biblog/BibtexLogParser.java  | 61 ++++++++++++
 .../logic/exporter/MetaDataSerializer.java    |  2 +
 .../logic/importer/util/MetaDataParser.java   |  2 +
 .../org/jabref/model/biblog/BibWarning.java   | 57 +++++++++++
 .../org/jabref/model/biblog/SeverityType.java |  7 ++
 .../org/jabref/model/metadata/MetaData.java   | 16 +++-
 .../logic/biblog/BibLogPathResolverTest.java  | 53 ++++++++++
 ...arningToIntegrityMessageConverterTest.java | 75 +++++++++++++++
 .../logic/biblog/BibtexLogParserTest.java     | 35 +++++++
 .../org/jabref/logic/blg/Chocolate.blg        | 51 ++++++++++
 19 files changed, 701 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.fxml
 create mode 100644 src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
 create mode 100644 src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
 create mode 100644 src/main/java/org/jabref/logic/biblog/BibLogPathResolver.java
 create mode 100644 src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
 create mode 100644 src/main/java/org/jabref/logic/biblog/BibtexLogParser.java
 create mode 100644 src/main/java/org/jabref/model/biblog/BibWarning.java
 create mode 100644 src/main/java/org/jabref/model/biblog/SeverityType.java
 create mode 100644 src/test/java/org/jabref/logic/biblog/BibLogPathResolverTest.java
 create mode 100644 src/test/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverterTest.java
 create mode 100644 src/test/java/org/jabref/logic/biblog/BibtexLogParserTest.java
 create mode 100644 src/test/resources/org/jabref/logic/blg/Chocolate.blg

diff --git a/src/main/java/org/jabref/gui/LibraryTab.java b/src/main/java/org/jabref/gui/LibraryTab.java
index f55ca97c751..723cf851222 100644
--- a/src/main/java/org/jabref/gui/LibraryTab.java
+++ b/src/main/java/org/jabref/gui/LibraryTab.java
@@ -1193,4 +1193,8 @@ public String toString() {
     public LibraryTabContainer getLibraryTabContainer() {
         return tabContainer;
     }
+
+    public DialogService getDialogService() {
+        return dialogService;
+    }
 }
diff --git a/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.fxml b/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.fxml
new file mode 100644
index 00000000000..4f15d903e51
--- /dev/null
+++ b/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.fxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<HBox xmlns="http://javafx.com/javafx"
+      xmlns:fx="http://javafx.com/fxml"
+      spacing="10"
+      alignment="CENTER_LEFT"
+      fx:controller="org.jabref.gui.integrity.BibLogSettingsPane"
+      fx:id="bibLogSettingsPane">
+    <Label text="BibTeX log (.blg) file:"/>
+    <TextField fx:id="pathField" prefWidth="300"/>
+    <Button onAction="#onBrowse" text="Browse..."/>
+    <Button onAction="#onReset" text="Reset"/>
+</HBox>
diff --git a/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java b/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
new file mode 100644
index 00000000000..546826486f0
--- /dev/null
+++ b/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
@@ -0,0 +1,58 @@
+package org.jabref.gui.integrity;
+
+import java.io.File;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.TextField;
+import javafx.stage.FileChooser;
+
+import org.jabref.gui.DialogService;
+import org.jabref.model.database.BibDatabaseContext;
+
+/**
+ * Controller for the .blg file settings panel.
+ *
+ * Binds the path text field to the ViewModel,
+ * and handles browse/reset button actions.
+ */
+public class BibLogSettingsPane {
+    @FXML
+    private TextField pathField;
+    private BibLogSettingsViewModel viewModel;
+    private DialogService dialogService;
+    private Runnable onBlgPathChanged;
+
+    public void initialize(BibDatabaseContext context, DialogService dialogService, Runnable onBlgPathChanged) {
+        this.dialogService = dialogService;
+        this.onBlgPathChanged = onBlgPathChanged;
+        this.viewModel = new BibLogSettingsViewModel(context.getMetaData(), context.getDatabasePath());
+        pathField.textProperty().bindBidirectional(viewModel.pathProperty());
+    }
+
+    @FXML
+    private void onBrowse() {
+        FileChooser fileChooser = new FileChooser();
+        fileChooser.setTitle("Select .blg file");
+        fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("BibTeX log files", "*.blg"));
+        File selectedFile = fileChooser.showOpenDialog(null);
+        if (selectedFile != null) {
+            viewModel.setBlgFilePath(selectedFile.toPath());
+            if (onBlgPathChanged != null) {
+                // Notify Dialog to refresh
+                onBlgPathChanged.run();
+            }
+        }
+    }
+
+    @FXML
+    private void onReset() {
+        viewModel.resetBlgFilePath();
+        if (onBlgPathChanged != null) {
+            onBlgPathChanged.run();
+        }
+    }
+
+    public BibLogSettingsViewModel getViewModel() {
+        return viewModel;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java b/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
new file mode 100644
index 00000000000..361b657cce5
--- /dev/null
+++ b/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
@@ -0,0 +1,96 @@
+package org.jabref.gui.integrity;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+import org.jabref.logic.biblog.BibLogPathResolver;
+import org.jabref.logic.biblog.BibWarningToIntegrityMessageConverter;
+import org.jabref.logic.biblog.BibtexLogParser;
+import org.jabref.logic.integrity.IntegrityMessage;
+import org.jabref.model.biblog.BibWarning;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.metadata.MetaData;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 1. Connects MetaData with the view.
+ * 2. Wraps .blg warnings as IntegrityMessages.
+ * 3. Supports file browsing and reset actions.
+ */
+public class BibLogSettingsViewModel {
+    private static final Logger LOGGER = LoggerFactory.getLogger(BibLogSettingsViewModel.class);
+    private final MetaData metaData;
+    private final Optional<Path> bibPath;
+    private final StringProperty path = new SimpleStringProperty("");
+    private Optional<Path> lastResolvedBlgPath = Optional.empty();
+
+    public BibLogSettingsViewModel(MetaData metaData, Optional<Path> bibPath) {
+        this.metaData = metaData;
+        this.bibPath = bibPath;
+
+        Optional<Path> resolved = BibLogPathResolver.resolve(metaData, bibPath);
+        LOGGER.info("Resolved .blg path = {}", resolved);
+
+        resolved.ifPresent(resolvedPath -> {
+            this.path.set(resolvedPath.toString());
+            // If user hasn't set a path, use resolved path as default for display
+            if (metaData.getBlgFilePath().isEmpty()) {
+                metaData.setBlgFilePath(resolvedPath);
+            }
+        });
+    }
+
+    public StringProperty pathProperty() {
+        return path;
+    }
+
+    public void setBlgFilePath(Path path) {
+        metaData.setBlgFilePath(path);
+        this.path.set(path.toString());
+    }
+
+    public void resetBlgFilePath() {
+        metaData.clearBlgFilePath();
+        BibLogPathResolver.resolve(metaData, bibPath)
+                          .map(Path::toString)
+                          .ifPresentOrElse(
+                                  this.path::set,
+                                  () -> this.path.set(""));
+    }
+
+    public Optional<Path> getResolvedBlgPath() {
+        return BibLogPathResolver.resolve(metaData, bibPath)
+                                 .filter(Files::exists);
+    }
+
+    public Optional<Path> getLastResolvedBlgPath() {
+        return lastResolvedBlgPath;
+    }
+
+    /**
+     * Parses .blg file into IntegrityMessages (if path exists).
+     */
+    public List<IntegrityMessage> getBlgWarnings(BibDatabaseContext databaseContext) {
+        Optional<Path> resolved = BibLogPathResolver.resolve(metaData, bibPath)
+                                                    .filter(Files::exists);
+        if (resolved.isPresent()) {
+            this.lastResolvedBlgPath = resolved;
+            try {
+                BibtexLogParser parser = new BibtexLogParser();
+                List<BibWarning> warnings = parser.parseBiblog(resolved.get());
+                return BibWarningToIntegrityMessageConverter.convert(warnings, databaseContext);
+            } catch (IOException e) {
+                LOGGER.warn("Failed to parse .blg file", e);
+            }
+        }
+        return List.of();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
index f89b37b7029..ce75cfb20b2 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
@@ -69,12 +69,20 @@ protected List<IntegrityMessage> call() {
                     result.addAll(check.checkEntry(entry));
                     updateProgress(i, entries.size());
                 }
-
                 return result;
             }
         };
         task.setOnSucceeded(value -> {
             List<IntegrityMessage> messages = task.getValue();
+            // After the main check:
+            // 1. Load .blg warnings using BibLogSettingsViewModel
+            BibLogSettingsViewModel viewModel = new BibLogSettingsViewModel(
+                    database.getMetaData(),
+                    database.getDatabasePath()
+            );
+            // 2. Merge them with the existing messages
+            messages.addAll(viewModel.getBlgWarnings(database));
+
             if (messages.isEmpty()) {
                 dialogService.notify(Localization.lang("No problems found."));
             } else {
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml
index 7666785b6ad..eec9f3946c9 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml
@@ -3,15 +3,17 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonType?>
 <?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.control.MenuButton?>
 <?import javafx.scene.control.TableColumn?>
 <?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <DialogPane xmlns:fx="http://javafx.com/fxml/1" prefHeight="600.0" prefWidth="700.0"
             xmlns="http://javafx.com/javafx/8.0.121" fx:controller="org.jabref.gui.integrity.IntegrityCheckDialog">
     <content>
-        <VBox spacing="4.0">
+        <VBox fx:id="dialogVBox" spacing="4.0">
             <TableView fx:id="messagesTable" prefHeight="550" prefWidth="700.0" VBox.vgrow="ALWAYS" HBox.hgrow="ALWAYS">
                 <columns>
                     <TableColumn fx:id="keyColumn" prefWidth="150.0" maxWidth="200"  text="%Citation key"/>
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
index d24fb908d0f..c3589f9eb7b 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -1,16 +1,23 @@
 package org.jabref.gui.integrity;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Function;
 
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuButton;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.VBox;
 import javafx.stage.Modality;
 
 import org.jabref.gui.LibraryTab;
@@ -24,8 +31,11 @@
 import com.airhacks.afterburner.views.ViewLoader;
 import jakarta.inject.Inject;
 import org.controlsfx.control.table.TableFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class IntegrityCheckDialog extends BaseDialog<Void> {
+    private static final Logger LOGGER = LoggerFactory.getLogger(IntegrityCheckDialog.class);
 
     @FXML private TableView<IntegrityMessage> messagesTable;
     @FXML private TableColumn<IntegrityMessage, String> keyColumn;
@@ -34,14 +44,15 @@ public class IntegrityCheckDialog extends BaseDialog<Void> {
     @FXML private MenuButton keyFilterButton;
     @FXML private MenuButton fieldFilterButton;
     @FXML private MenuButton messageFilterButton;
+    @FXML private VBox dialogVBox;
 
     @Inject private ThemeManager themeManager;
-
     private final List<IntegrityMessage> messages;
     private final LibraryTab libraryTab;
     private IntegrityCheckDialogViewModel viewModel;
     private TableFilter<IntegrityMessage> tableFilter;
-
+    private BibLogSettingsPane bibLogSettingsPane;
+    private final List<IntegrityMessage> blgWarnings = new ArrayList<>();
     public IntegrityCheckDialog(List<IntegrityMessage> messages, LibraryTab libraryTab) {
         this.messages = messages;
         this.libraryTab = libraryTab;
@@ -91,6 +102,8 @@ private void initialize() {
         addMessageColumnFilter(keyColumn, keyFilterButton);
         addMessageColumnFilter(fieldColumn, fieldFilterButton);
         addMessageColumnFilter(messageColumn, messageFilterButton);
+
+        loadBibLogSettingsPane();
     }
 
     private void addMessageColumnFilter(TableColumn<IntegrityMessage, String> messageColumn, MenuButton messageFilterButton) {
@@ -121,4 +134,60 @@ public void clearFilters() {
             });
         }
     }
+
+    /**
+     * Loads the BibLogSettingsPane.fxml view
+     * and initializes its controller.
+     */
+    private void loadBibLogSettingsPane() {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource("BibLogSettingsPane.fxml"));
+            Node settingsNode = loader.load();
+            bibLogSettingsPane = loader.getController();
+            bibLogSettingsPane.initialize(
+                    libraryTab.getBibDatabaseContext(),
+                    libraryTab.getDialogService(),
+                    this::reloadBlgWarnings
+            );
+            dialogVBox.getChildren().add(1, settingsNode);
+            reloadBlgWarnings();
+        } catch (IOException e) {
+            LOGGER.error("Failed to load BibLogSettingsPane", e);
+        }
+    }
+
+    /**
+     * Called on:
+     * (1) Dialog initialization (default load)
+     * (2) User triggers Browse or Reset in BibLogSettingsPane
+     *
+     * Steps:
+     * 1. Get the resolved .blg path and check if it has changed.
+     * 2. Fetch new .blg warnings from ViewModel.
+     * 3. Replace old warnings and update the table.
+     */
+    private void reloadBlgWarnings() {
+        Optional<Path> maybeNewPath = bibLogSettingsPane.getViewModel().getResolvedBlgPath();
+        if (maybeNewPath.isEmpty()) {
+            return;
+        }
+
+        Path newBlgPath = maybeNewPath.get();
+        Optional<Path> lastPath = bibLogSettingsPane.getViewModel().getLastResolvedBlgPath();
+
+        if (lastPath.isPresent() && newBlgPath.equals(lastPath.get())) {
+            return;
+        }
+
+        List<IntegrityMessage> newWarnings =
+                bibLogSettingsPane.getViewModel().getBlgWarnings(libraryTab.getBibDatabaseContext());
+
+        messages.removeAll(blgWarnings);
+        blgWarnings.clear();
+        blgWarnings.addAll(newWarnings);
+        messages.addAll(blgWarnings);
+
+        viewModel = new IntegrityCheckDialogViewModel(messages);
+        messagesTable.setItems(viewModel.getMessages());
+    }
 }
diff --git a/src/main/java/org/jabref/logic/biblog/BibLogPathResolver.java b/src/main/java/org/jabref/logic/biblog/BibLogPathResolver.java
new file mode 100644
index 00000000000..44dfea24c5c
--- /dev/null
+++ b/src/main/java/org/jabref/logic/biblog/BibLogPathResolver.java
@@ -0,0 +1,36 @@
+package org.jabref.logic.biblog;
+
+import java.nio.file.Path;
+import java.util.Optional;
+
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.metadata.MetaData;
+
+public class BibLogPathResolver {
+    /**
+     * Resolves custom or default .blg path for this library.
+     *
+     * Priority:
+     * 1. User-defined path from MetaData
+     * 2. Default: same name as .bib file with .blg extension
+     */
+    public static Optional<Path> resolve(BibDatabaseContext context) {
+        return resolve(context.getMetaData(), context.getDatabasePath());
+    }
+
+    /**
+     * Test-friendly API (allows direct input of MetaData and Path)
+     */
+    public static Optional<Path> resolve(MetaData metaData, Optional<Path> databasePath) {
+        Optional<Path> userDefined = metaData.getBlgFilePath();
+        if (userDefined.isPresent()) {
+            return userDefined;
+        }
+
+        return databasePath.map(path ->
+                path.resolveSibling(
+                        path.getFileName().toString().replaceFirst("\\.bib$", ".blg")
+                )
+        );
+    }
+}
diff --git a/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java b/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
new file mode 100644
index 00000000000..1e12b344f92
--- /dev/null
+++ b/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
@@ -0,0 +1,48 @@
+package org.jabref.logic.biblog;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import org.jabref.logic.integrity.IntegrityMessage;
+import org.jabref.model.biblog.BibWarning;
+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.FieldFactory;
+import org.jabref.model.entry.field.InternalField;
+
+/**
+ * Converts {@link BibWarning}s into {@link IntegrityMessage}s for integration with the existing integrity check UI.
+ *
+ * Notes:
+ * - The current IntegrityMessage interface expects a {@link BibEntry} and a {@link Field},
+ *   but .blg warnings come from a different source and may not include a field.
+ * - For now, we map missing fields to a placeholder (InternalField.KEY_FIELD) to make it compatible with the UI.
+ * - This is a minimal MVP solution to reuse the Integrity tab without changing the UI structure.
+ *
+ * Future direction:
+ * - Consider defining a proper interface (e.g., IntegrityMessageWithField / WithoutField)
+ *   to support warnings without fields cleanly.
+ */
+public class BibWarningToIntegrityMessageConverter {
+    public static List<IntegrityMessage> convert(List<BibWarning> bibWarnings, BibDatabaseContext context) {
+        List<IntegrityMessage> messages = new ArrayList<>();
+        for (BibWarning bibWarning : bibWarnings) {
+            Optional<BibEntry> maybeEntry = context.getDatabase().getEntryByCitationKey(bibWarning.getEntryKey());
+            if (maybeEntry.isEmpty()) {
+                continue;
+            }
+            BibEntry entry = maybeEntry.get();
+            Field field = bibWarning.getFieldName()
+                    .map(FieldFactory::parseField)
+                    .orElse(InternalField.KEY_FIELD);
+            IntegrityMessage message = new IntegrityMessage(
+                    bibWarning.getMessage(),
+                    entry,
+                    field);
+            messages.add(message);
+        }
+        return messages;
+    }
+}
diff --git a/src/main/java/org/jabref/logic/biblog/BibtexLogParser.java b/src/main/java/org/jabref/logic/biblog/BibtexLogParser.java
new file mode 100644
index 00000000000..50539eb3781
--- /dev/null
+++ b/src/main/java/org/jabref/logic/biblog/BibtexLogParser.java
@@ -0,0 +1,61 @@
+package org.jabref.logic.biblog;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.jabref.model.biblog.BibWarning;
+import org.jabref.model.biblog.SeverityType;
+
+/**
+ * Parses the contents of a .blg (BibTeX log) file to extract warning messages.
+ */
+public class BibtexLogParser {
+    public List<BibWarning> parseBiblog(Path blgFilePath) throws IOException {
+        List<BibWarning> warnings = new ArrayList<>();
+        List<String> lines = Files.readAllLines(blgFilePath);
+        for (String line : lines) {
+            Optional<BibWarning> potentialWarning = parseWarningLine(line);
+            potentialWarning.ifPresent(warnings::add);
+        }
+        return warnings;
+    }
+
+    /**
+     * Parses a single line from the .blg file to identify a warning.
+     * <p>
+     * Currently supports parsing warnings of the format:
+     * <pre>
+     * Warning--[message] in [entryKey]
+     * </pre>
+     * For example: {@code Warning--empty journal in Scholey_2013}
+     *
+     * @param line a single line from the .blg file
+     * @return an Optional containing a {@link BibWarning} if a match is found, or empty otherwise
+     */
+    private Optional<BibWarning> parseWarningLine(String line) {
+        // TODO: Support additional warning formats
+        Pattern compile = Pattern.compile("^Warning--([a-zA-Z ]+) in ([^\\s]+)$");
+        Matcher matcher = compile.matcher(line);
+        if (matcher.find()) {
+            String message = matcher.group(1).trim();
+            String entryKey = matcher.group(2);
+            String fieldName = null;
+            if (message.startsWith("empty")) {
+                fieldName = message.substring("empty".length()).trim();
+            }
+            return Optional.of(new BibWarning(
+                    SeverityType.WARNING,
+                    message,
+                    fieldName,
+                    entryKey
+            ));
+        }
+        return Optional.empty();
+    }
+}
diff --git a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java b/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
index f9755996beb..e365be6a366 100644
--- a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
+++ b/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
@@ -60,6 +60,8 @@ public static Map<String, String> getSerializedStringMap(MetaData metaData,
                 .put(MetaData.FILE_DIRECTORY_LATEX + '-' + user, Collections.singletonList(path.toString().trim())));
         metaData.getVersionDBStructure().ifPresent(
                 versionDBStructure -> stringyMetaData.put(MetaData.VERSION_DB_STRUCT, Collections.singletonList(versionDBStructure.trim())));
+        metaData.getBlgFilePath().ifPresent(
+                path -> stringyMetaData.put(MetaData.BLG_FILE_PATH, Collections.singletonList(path.toString().trim())));
 
         for (ContentSelector selector : metaData.getContentSelectorsSorted()) {
             stringyMetaData.put(MetaData.SELECTOR_META_PREFIX + selector.getField().getName(), selector.getValues());
diff --git a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
index d6bd258d283..846c9d6d0ee 100644
--- a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
@@ -121,6 +121,8 @@ public MetaData parse(MetaData metaData, Map<String, String> data, Character key
                 metaData.addContentSelector(ContentSelectors.parse(FieldFactory.parseField(entry.getKey().substring(MetaData.SELECTOR_META_PREFIX.length())), StringUtil.unquote(entry.getValue(), MetaData.ESCAPE_CHARACTER)));
             } else if (MetaData.FILE_DIRECTORY.equals(entry.getKey())) {
                 metaData.setLibrarySpecificFileDirectory(parseDirectory(entry.getValue()));
+            } else if (MetaData.BLG_FILE_PATH.equals(entry.getKey())) {
+                metaData.setBlgFilePath(Path.of(getSingleItem(values)));
             } else if (entry.getKey().startsWith(MetaData.FILE_DIRECTORY + '-')) {
                 // The user name starts directly after FILE_DIRECTORY + '-'
                 String user = entry.getKey().substring(MetaData.FILE_DIRECTORY.length() + 1);
diff --git a/src/main/java/org/jabref/model/biblog/BibWarning.java b/src/main/java/org/jabref/model/biblog/BibWarning.java
new file mode 100644
index 00000000000..919d7422bb1
--- /dev/null
+++ b/src/main/java/org/jabref/model/biblog/BibWarning.java
@@ -0,0 +1,57 @@
+package org.jabref.model.biblog;
+
+import java.util.Objects;
+import java.util.Optional;
+
+/**
+ *
+ */
+public class BibWarning {
+    //  [SeverityType] -- [Message] in [EntryKey]
+    private final SeverityType severityType;
+    private final String message;
+    private final String fieldName;
+    private final String entryKey;
+
+    public BibWarning(SeverityType severityType, String message, String fieldName, String entryKey) {
+        this.severityType = severityType;
+        this.message = message;
+        this.fieldName = fieldName;
+        this.entryKey = entryKey;
+    }
+
+    public String getEntryKey() {
+        return entryKey;
+    }
+
+    public Optional<String> getFieldName() {
+        return Optional.ofNullable(fieldName);
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public SeverityType getSeverityType() {
+        return severityType;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof BibWarning that)) {
+            return false;
+        }
+        return severityType == that.severityType &&
+                Objects.equals(message, that.message) &&
+                Objects.equals(fieldName, that.fieldName) &&
+                Objects.equals(entryKey, that.entryKey);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(severityType, message, fieldName, entryKey);
+    }
+}
diff --git a/src/main/java/org/jabref/model/biblog/SeverityType.java b/src/main/java/org/jabref/model/biblog/SeverityType.java
new file mode 100644
index 00000000000..c21a4249df6
--- /dev/null
+++ b/src/main/java/org/jabref/model/biblog/SeverityType.java
@@ -0,0 +1,7 @@
+package org.jabref.model.biblog;
+
+public enum SeverityType {
+    WARNING,
+    ERROR,
+    INFO
+}
diff --git a/src/main/java/org/jabref/model/metadata/MetaData.java b/src/main/java/org/jabref/model/metadata/MetaData.java
index c7be01ce09b..9f9d6c2c671 100644
--- a/src/main/java/org/jabref/model/metadata/MetaData.java
+++ b/src/main/java/org/jabref/model/metadata/MetaData.java
@@ -57,9 +57,8 @@ public class MetaData {
     public static final char ESCAPE_CHARACTER = '\\';
     public static final char SEPARATOR_CHARACTER = ';';
     public static final String SEPARATOR_STRING = String.valueOf(SEPARATOR_CHARACTER);
-
+    public static final String BLG_FILE_PATH = "blgFilePath";
     private static final Logger LOGGER = LoggerFactory.getLogger(MetaData.class);
-
     private final EventBus eventBus = new EventBus();
     private final Map<EntryType, String> citeKeyPatterns = new HashMap<>(); // <BibType, Pattern>
     private final Map<String, String> userFileDirectory = new HashMap<>(); // <User, FilePath>
@@ -81,6 +80,7 @@ public class MetaData {
     private boolean isEventPropagationEnabled = true;
     private boolean encodingExplicitlySupplied;
     private String versionDBStructure;
+    private Optional<Path> blgFilePath = Optional.empty();
 
     /**
      * Constructs an empty metadata.
@@ -413,4 +413,16 @@ public int hashCode() {
     public String toString() {
         return "MetaData [citeKeyPatterns=" + citeKeyPatterns + ", userFileDirectory=" + userFileDirectory + ", laTexFileDirectory=" + laTexFileDirectory + ", groupsRoot=" + groupsRoot + ", encoding=" + encoding + ", saveOrderConfig=" + saveOrder + ", defaultCiteKeyPattern=" + defaultCiteKeyPattern + ", saveActions=" + saveActions + ", mode=" + mode + ", isProtected=" + isProtected + ", librarySpecificFileDirectory=" + librarySpecificFileDirectory + ", contentSelectors=" + contentSelectors + ", encodingExplicitlySupplied=" + encodingExplicitlySupplied + ", VersionDBStructure=" + versionDBStructure + "]";
     }
+
+    public Optional<Path> getBlgFilePath() {
+        return blgFilePath;
+    }
+
+    public void setBlgFilePath(Path path) {
+        this.blgFilePath = Optional.ofNullable(path);
+    }
+
+    public void clearBlgFilePath() {
+        this.blgFilePath = Optional.empty();
+    }
 }
diff --git a/src/test/java/org/jabref/logic/biblog/BibLogPathResolverTest.java b/src/test/java/org/jabref/logic/biblog/BibLogPathResolverTest.java
new file mode 100644
index 00000000000..9d9a16c717f
--- /dev/null
+++ b/src/test/java/org/jabref/logic/biblog/BibLogPathResolverTest.java
@@ -0,0 +1,53 @@
+package org.jabref.logic.biblog;
+
+import java.nio.file.Path;
+import java.util.Optional;
+
+import org.jabref.model.metadata.MetaData;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class BibLogPathResolverTest {
+    /**
+     * Returns the user-defined .blg path if it's set.
+     */
+    @Test
+    void returnsUserDefinedBlgPathIfPresent() {
+        MetaData metaData = new MetaData();
+        Path userBlgPath = Path.of("/custom/path/output.blg");
+        metaData.setBlgFilePath(userBlgPath);
+
+        Optional<Path> result = BibLogPathResolver.resolve(metaData, Optional.of(Path.of("/library.bib")));
+
+        assertTrue(result.isPresent());
+        assertEquals(userBlgPath, result.get());
+    }
+
+    /**
+     * Falls back to default .blg path (same name as .bib) if no user-defined path is set.
+     */
+    @Test
+    void returnsDefaultBlgPathWhenUserPathIsAbsent() {
+        MetaData metaData = new MetaData(); // no blg path set
+
+        Path bibPath = Path.of("/home/user/MyLibrary.bib");
+        Optional<Path> result = BibLogPathResolver.resolve(metaData, Optional.of(bibPath));
+
+        assertTrue(result.isPresent());
+        assertEquals(Path.of("/home/user/MyLibrary.blg"), result.get());
+    }
+
+    /**
+     * Returns empty if neither user-defined path nor .bib path is available.
+     */
+    @Test
+    void returnsEmptyWhenNoUserPathAndNoBibPath() {
+        MetaData metaData = new MetaData();
+        Optional<Path> result = BibLogPathResolver.resolve(metaData, Optional.empty());
+
+        assertTrue(result.isEmpty());
+    }
+}
diff --git a/src/test/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverterTest.java b/src/test/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverterTest.java
new file mode 100644
index 00000000000..9b67473244b
--- /dev/null
+++ b/src/test/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverterTest.java
@@ -0,0 +1,75 @@
+package org.jabref.logic.biblog;
+
+import java.util.List;
+
+import org.jabref.logic.integrity.IntegrityMessage;
+import org.jabref.model.biblog.BibWarning;
+import org.jabref.model.biblog.SeverityType;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.StandardEntryType;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class BibWarningToIntegrityMessageConverterTest {
+    @Test
+    public void convertsWarningsToIntegrityMessagesTest() {
+        BibEntry firstEntry = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("Scholey_2013")
+                .withField(StandardField.AUTHOR, "Scholey");
+        BibEntry secondEntry = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("Tan_2021")
+                .withField(StandardField.AUTHOR, "Tan");
+        BibDatabase database = new BibDatabase();
+        database.insertEntry(firstEntry);
+        database.insertEntry(secondEntry);
+
+        BibDatabaseContext context = new BibDatabaseContext(database);
+
+        List<BibWarning> warnings = List.of(
+                new BibWarning(SeverityType.WARNING, "empty journal", "journal", "Scholey_2013"),
+                new BibWarning(SeverityType.WARNING, "empty year", "year", "Tan_2021")
+        );
+        List<IntegrityMessage> messages = BibWarningToIntegrityMessageConverter.convert(warnings, context);
+
+        assertEquals(2, messages.size());
+
+        IntegrityMessage msg1 = messages.get(0);
+        assertEquals("empty journal", msg1.message());
+        assertEquals(firstEntry, msg1.entry());
+        assertEquals("journal", msg1.field().getName());
+
+        IntegrityMessage msg2 = messages.get(1);
+        assertEquals("empty year", msg2.message());
+        assertEquals(secondEntry, msg2.entry());
+        assertEquals("year", msg2.field().getName());
+    }
+
+    /**
+     * Gracefully skips warnings for entries not found in the database.
+     */
+    @Test
+    public void skipsWarningsForMissingEntries() {
+        // Arrange: only one entry
+        BibEntry scholey = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("Scholey_2013");
+
+        BibDatabase database = new BibDatabase();
+        database.insertEntry(scholey);
+        BibDatabaseContext context = new BibDatabaseContext(database);
+
+        List<BibWarning> warnings = List.of(
+                new BibWarning(SeverityType.WARNING, "empty journal", "journal", "Scholey_2013"),
+                new BibWarning(SeverityType.WARNING, "empty year", "year", "NonExistent_9999") // should be skipped
+        );
+
+        List<IntegrityMessage> messages = BibWarningToIntegrityMessageConverter.convert(warnings, context);
+
+        assertEquals(1, messages.size());
+        assertEquals("Scholey_2013", messages.get(0).entry().getCitationKey().orElseThrow());
+    }
+}
diff --git a/src/test/java/org/jabref/logic/biblog/BibtexLogParserTest.java b/src/test/java/org/jabref/logic/biblog/BibtexLogParserTest.java
new file mode 100644
index 00000000000..0d8ad7a71a1
--- /dev/null
+++ b/src/test/java/org/jabref/logic/biblog/BibtexLogParserTest.java
@@ -0,0 +1,35 @@
+package org.jabref.logic.biblog;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+
+import org.jabref.model.biblog.BibWarning;
+import org.jabref.model.biblog.SeverityType;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class BibtexLogParserTest {
+    private BibtexLogParser parser;
+
+    @BeforeEach
+    public void setup() {
+        parser = new BibtexLogParser();
+    }
+
+    @Test
+    public void parsesWarningsFromResourceFileTest() throws Exception {
+        Path blgFile = Paths.get("src/test/resources/org/jabref/logic/blg/Chocolate.blg");
+        List<BibWarning> warnings = parser.parseBiblog(blgFile);
+        assertEquals(4, warnings.size());
+        assertEquals(List.of(
+                new BibWarning(SeverityType.WARNING, "empty journal", "journal", "Scholey_2013"),
+                new BibWarning(SeverityType.WARNING, "empty year", "year", "Scholey_2013"),
+                new BibWarning(SeverityType.WARNING, "empty journal", "journal", "Tan_2021"),
+                new BibWarning(SeverityType.WARNING, "empty year", "year", "Tan_2021")
+        ), warnings);
+    }
+}
diff --git a/src/test/resources/org/jabref/logic/blg/Chocolate.blg b/src/test/resources/org/jabref/logic/blg/Chocolate.blg
new file mode 100644
index 00000000000..3659a70c804
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/blg/Chocolate.blg
@@ -0,0 +1,51 @@
+This is BibTeX, Version 0.99d (TeX Live 2025)
+Capacity: max_strings=200000, hash_size=200000, hash_prime=170003
+The top-level auxiliary file: paper.aux
+The style file: splncs04.bst
+Database file #1: Chocolate.bib
+Warning--empty journal in Scholey_2013
+Warning--empty year in Scholey_2013
+Warning--empty journal in Tan_2021
+Warning--empty year in Tan_2021
+You've used 2 entries,
+            2850 wiz_defined-function locations,
+            612 strings with 4882 characters,
+and the built_in function-call counts, 1237 in all, are:
+= -- 93
+> -- 39
+< -- 4
++ -- 17
+- -- 14
+* -- 92
+:= -- 151
+add.period$ -- 2
+call.type$ -- 2
+change.case$ -- 13
+chr.to.int$ -- 0
+cite$ -- 6
+duplicate$ -- 106
+empty$ -- 97
+format.name$ -- 16
+if$ -- 258
+int.to.chr$ -- 0
+int.to.str$ -- 2
+missing$ -- 23
+newline$ -- 12
+num.names$ -- 4
+pop$ -- 45
+preamble$ -- 1
+purify$ -- 11
+quote$ -- 0
+skip$ -- 41
+stack$ -- 0
+substring$ -- 63
+swap$ -- 74
+text.length$ -- 4
+text.prefix$ -- 0
+top$ -- 0
+type$ -- 8
+warning$ -- 4
+while$ -- 9
+width$ -- 3
+write$ -- 23
+(There were 4 warnings)

From a4b657f0227c3fcaaff6d758adf3dd1269cb4e25 Mon Sep 17 00:00:00 2001
From: Wanling Fu <wanlingfu3@gmail.com>
Date: Tue, 1 Apr 2025 22:04:31 +0100
Subject: [PATCH 02/17] Apply review suggestions

---
 CHANGELOG.md                                  |  1 +
 src/main/java/org/jabref/gui/LibraryTab.java  |  4 --
 .../gui/integrity/BibLogSettingsPane.java     | 40 +++++++----
 .../integrity/BibLogSettingsViewModel.java    | 47 +++++++------
 .../gui/integrity/IntegrityCheckAction.java   |  8 +--
 .../gui/integrity/IntegrityCheckDialog.java   | 69 ++++++++++---------
 ...BibWarningToIntegrityMessageConverter.java | 24 +++----
 .../jabref/logic/biblog/BibtexLogParser.java  |  9 +--
 .../logic/importer/util/MetaDataParser.java   |  9 ++-
 .../org/jabref/model/biblog/BibWarning.java   | 54 ++-------------
 .../logic/biblog/BibLogPathResolverTest.java  |  9 +--
 .../logic/biblog/BibtexLogParserTest.java     |  3 +-
 12 files changed, 125 insertions(+), 152 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 945fe10cebc..ea638100b43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We added a feature for enabling drag-and-drop of files into groups  [#12540](https://github.com/JabRef/jabref/issues/12540)
 - We added support for reordering keywords via drag and drop, automatic alphabetical ordering, and improved pasting and editing functionalities in the keyword editor. [#10984](https://github.com/JabRef/jabref/issues/10984)
 - We added a new functionality where author names having multiple spaces in-between will be considered as separate user block as it does for " and ". [#12701](https://github.com/JabRef/jabref/issues/12701)
+- We added support for loading and displaying BibTeX .blg warnings in the Check integrity dialog, with custom path selection and metadata persistence. [#11998](https://github.com/JabRef/jabref/issues/11998)
 
 ### Changed
 
diff --git a/src/main/java/org/jabref/gui/LibraryTab.java b/src/main/java/org/jabref/gui/LibraryTab.java
index 723cf851222..f55ca97c751 100644
--- a/src/main/java/org/jabref/gui/LibraryTab.java
+++ b/src/main/java/org/jabref/gui/LibraryTab.java
@@ -1193,8 +1193,4 @@ public String toString() {
     public LibraryTabContainer getLibraryTabContainer() {
         return tabContainer;
     }
-
-    public DialogService getDialogService() {
-        return dialogService;
-    }
 }
diff --git a/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java b/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
index 546826486f0..4e1b5d0520a 100644
--- a/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
+++ b/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
@@ -1,12 +1,14 @@
 package org.jabref.gui.integrity;
 
-import java.io.File;
+import java.nio.file.Path;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.TextField;
 import javafx.stage.FileChooser;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 
 /**
@@ -31,28 +33,36 @@ public void initialize(BibDatabaseContext context, DialogService dialogService,
 
     @FXML
     private void onBrowse() {
-        FileChooser fileChooser = new FileChooser();
-        fileChooser.setTitle("Select .blg file");
-        fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("BibTeX log files", "*.blg"));
-        File selectedFile = fileChooser.showOpenDialog(null);
-        if (selectedFile != null) {
-            viewModel.setBlgFilePath(selectedFile.toPath());
-            if (onBlgPathChanged != null) {
-                // Notify Dialog to refresh
-                onBlgPathChanged.run();
-            }
-        }
+        FileDialogConfiguration fileDialogConfiguration = createBlgFileDialogConfig();
+        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(path -> {
+            viewModel.setBlgFilePath(path);
+            notifyPathChanged();
+        });
     }
 
     @FXML
     private void onReset() {
         viewModel.resetBlgFilePath();
-        if (onBlgPathChanged != null) {
-            onBlgPathChanged.run();
-        }
+        notifyPathChanged();
     }
 
     public BibLogSettingsViewModel getViewModel() {
         return viewModel;
     }
+
+    private FileDialogConfiguration createBlgFileDialogConfig() {
+        FileDialogConfiguration.Builder configBuilder = new FileDialogConfiguration.Builder();
+        Path initialDir = viewModel.getInitialDirectory();
+        configBuilder.withInitialDirectory(initialDir);
+        configBuilder.addExtensionFilter(
+                new FileChooser.ExtensionFilter(Localization.lang("BibTeX log files"), "*.blg")
+        );
+        return configBuilder.build();
+    }
+
+    private void notifyPathChanged() {
+        if (onBlgPathChanged != null) {
+            onBlgPathChanged.run();
+        }
+    }
 }
diff --git a/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java b/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
index 361b657cce5..aa840ae62c9 100644
--- a/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
+++ b/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
@@ -36,16 +36,15 @@ public BibLogSettingsViewModel(MetaData metaData, Optional<Path> bibPath) {
         this.metaData = metaData;
         this.bibPath = bibPath;
 
-        Optional<Path> resolved = BibLogPathResolver.resolve(metaData, bibPath);
-        LOGGER.info("Resolved .blg path = {}", resolved);
-
-        resolved.ifPresent(resolvedPath -> {
-            this.path.set(resolvedPath.toString());
-            // If user hasn't set a path, use resolved path as default for display
-            if (metaData.getBlgFilePath().isEmpty()) {
-                metaData.setBlgFilePath(resolvedPath);
-            }
-        });
+        Path resolvedPath = BibLogPathResolver.resolve(metaData, bibPath).orElse(null);
+        if (resolvedPath == null) {
+            return;
+        }
+        this.path.set(resolvedPath.toString());
+        if (metaData.getBlgFilePath().isEmpty()) {
+            metaData.setBlgFilePath(resolvedPath);
+            this.lastResolvedBlgPath = Optional.of(resolvedPath);
+        }
     }
 
     public StringProperty pathProperty() {
@@ -81,16 +80,24 @@ public Optional<Path> getLastResolvedBlgPath() {
     public List<IntegrityMessage> getBlgWarnings(BibDatabaseContext databaseContext) {
         Optional<Path> resolved = BibLogPathResolver.resolve(metaData, bibPath)
                                                     .filter(Files::exists);
-        if (resolved.isPresent()) {
-            this.lastResolvedBlgPath = resolved;
-            try {
-                BibtexLogParser parser = new BibtexLogParser();
-                List<BibWarning> warnings = parser.parseBiblog(resolved.get());
-                return BibWarningToIntegrityMessageConverter.convert(warnings, databaseContext);
-            } catch (IOException e) {
-                LOGGER.warn("Failed to parse .blg file", e);
-            }
+        if (resolved.isEmpty()) {
+            return List.of();
         }
-        return List.of();
+
+        Path path = resolved.get();
+        this.lastResolvedBlgPath = Optional.of(path);
+        try {
+            BibtexLogParser parser = new BibtexLogParser();
+            List<BibWarning> warnings = parser.parseBiblog(path);
+            return BibWarningToIntegrityMessageConverter.convert(warnings, databaseContext);
+        } catch (IOException e) {
+            LOGGER.warn("Failed to parse .blg file", e);
+            return List.of();
+        }
+    }
+
+    public Path getInitialDirectory() {
+        return bibPath.flatMap(path -> Optional.ofNullable(path.getParent()))
+                      .orElse(Path.of(System.getProperty("user.home")));
     }
 }
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
index ce75cfb20b2..f44f8309658 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
@@ -74,19 +74,15 @@ protected List<IntegrityMessage> call() {
         };
         task.setOnSucceeded(value -> {
             List<IntegrityMessage> messages = task.getValue();
-            // After the main check:
-            // 1. Load .blg warnings using BibLogSettingsViewModel
+            // After the main check: Load .blg warnings using BibLogSettingsViewModel
             BibLogSettingsViewModel viewModel = new BibLogSettingsViewModel(
                     database.getMetaData(),
                     database.getDatabasePath()
             );
-            // 2. Merge them with the existing messages
-            messages.addAll(viewModel.getBlgWarnings(database));
-
             if (messages.isEmpty()) {
                 dialogService.notify(Localization.lang("No problems found."));
             } else {
-                dialogService.showCustomDialogAndWait(new IntegrityCheckDialog(messages, tabSupplier.get()));
+                dialogService.showCustomDialogAndWait(new IntegrityCheckDialog(messages, tabSupplier.get(), dialogService));
             }
         });
         task.setOnFailed(event -> dialogService.showErrorDialogAndWait("Integrity check failed.", task.getException()));
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
index c3589f9eb7b..616a52086cd 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -20,6 +20,7 @@
 import javafx.scene.layout.VBox;
 import javafx.stage.Modality;
 
+import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.BaseDialog;
@@ -49,13 +50,16 @@ public class IntegrityCheckDialog extends BaseDialog<Void> {
     @Inject private ThemeManager themeManager;
     private final List<IntegrityMessage> messages;
     private final LibraryTab libraryTab;
+    private final DialogService dialogService;
     private IntegrityCheckDialogViewModel viewModel;
     private TableFilter<IntegrityMessage> tableFilter;
     private BibLogSettingsPane bibLogSettingsPane;
     private final List<IntegrityMessage> blgWarnings = new ArrayList<>();
-    public IntegrityCheckDialog(List<IntegrityMessage> messages, LibraryTab libraryTab) {
+    public IntegrityCheckDialog(List<IntegrityMessage> messages, LibraryTab libraryTab, DialogService dialogService) {
         this.messages = messages;
         this.libraryTab = libraryTab;
+        this.dialogService = dialogService;
+
         this.setTitle(Localization.lang("Check integrity"));
         this.initModality(Modality.NONE);
 
@@ -141,16 +145,23 @@ public void clearFilters() {
      */
     private void loadBibLogSettingsPane() {
         try {
-            FXMLLoader loader = new FXMLLoader(getClass().getResource("BibLogSettingsPane.fxml"));
-            Node settingsNode = loader.load();
-            bibLogSettingsPane = loader.getController();
-            bibLogSettingsPane.initialize(
-                    libraryTab.getBibDatabaseContext(),
-                    libraryTab.getDialogService(),
-                    this::reloadBlgWarnings
-            );
-            dialogVBox.getChildren().add(1, settingsNode);
-            reloadBlgWarnings();
+            FXMLLoader loader = new FXMLLoader();
+            try (var fxmlStream = getClass().getResourceAsStream("BibLogSettingsPane.fxml")) {
+                if (fxmlStream == null) {
+                    LOGGER.error("Could not find BibLogSettingsPane.fxml");
+                    return;
+                }
+
+                Node settingsNode = loader.load(fxmlStream);
+                bibLogSettingsPane = loader.getController();
+                bibLogSettingsPane.initialize(
+                        libraryTab.getBibDatabaseContext(),
+                        dialogService,
+                        this::reloadBlgWarnings
+                );
+                dialogVBox.getChildren().add(1, settingsNode);
+                reloadBlgWarnings();
+            }
         } catch (IOException e) {
             LOGGER.error("Failed to load BibLogSettingsPane", e);
         }
@@ -167,27 +178,19 @@ private void loadBibLogSettingsPane() {
      * 3. Replace old warnings and update the table.
      */
     private void reloadBlgWarnings() {
-        Optional<Path> maybeNewPath = bibLogSettingsPane.getViewModel().getResolvedBlgPath();
-        if (maybeNewPath.isEmpty()) {
-            return;
-        }
-
-        Path newBlgPath = maybeNewPath.get();
-        Optional<Path> lastPath = bibLogSettingsPane.getViewModel().getLastResolvedBlgPath();
-
-        if (lastPath.isPresent() && newBlgPath.equals(lastPath.get())) {
-            return;
-        }
-
-        List<IntegrityMessage> newWarnings =
-                bibLogSettingsPane.getViewModel().getBlgWarnings(libraryTab.getBibDatabaseContext());
-
-        messages.removeAll(blgWarnings);
-        blgWarnings.clear();
-        blgWarnings.addAll(newWarnings);
-        messages.addAll(blgWarnings);
-
-        viewModel = new IntegrityCheckDialogViewModel(messages);
-        messagesTable.setItems(viewModel.getMessages());
+        bibLogSettingsPane.getViewModel().getResolvedBlgPath().ifPresent(newBlgPath -> {
+            Optional<Path> lastPath = bibLogSettingsPane.getViewModel().getLastResolvedBlgPath();
+            if (lastPath.isPresent() && newBlgPath.equals(lastPath)) {
+                return;
+            }
+            List<IntegrityMessage> newWarnings = bibLogSettingsPane.getViewModel().getBlgWarnings(libraryTab.getBibDatabaseContext());
+            messages.removeAll(blgWarnings);
+            blgWarnings.clear();
+            blgWarnings.addAll(newWarnings);
+            messages.addAll(blgWarnings);
+
+            viewModel = new IntegrityCheckDialogViewModel(messages);
+            messagesTable.setItems(viewModel.getMessages());
+        });
     }
 }
diff --git a/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java b/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
index 1e12b344f92..196d8814b60 100644
--- a/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
+++ b/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
@@ -2,7 +2,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 import org.jabref.logic.integrity.IntegrityMessage;
 import org.jabref.model.biblog.BibWarning;
@@ -29,19 +28,16 @@ public class BibWarningToIntegrityMessageConverter {
     public static List<IntegrityMessage> convert(List<BibWarning> bibWarnings, BibDatabaseContext context) {
         List<IntegrityMessage> messages = new ArrayList<>();
         for (BibWarning bibWarning : bibWarnings) {
-            Optional<BibEntry> maybeEntry = context.getDatabase().getEntryByCitationKey(bibWarning.getEntryKey());
-            if (maybeEntry.isEmpty()) {
-                continue;
-            }
-            BibEntry entry = maybeEntry.get();
-            Field field = bibWarning.getFieldName()
-                    .map(FieldFactory::parseField)
-                    .orElse(InternalField.KEY_FIELD);
-            IntegrityMessage message = new IntegrityMessage(
-                    bibWarning.getMessage(),
-                    entry,
-                    field);
-            messages.add(message);
+            context.getDatabase().getEntryByCitationKey(bibWarning.entryKey()).ifPresent(entry -> {
+                Field field = bibWarning.getFieldName()
+                        .map(FieldFactory::parseField)
+                        .orElse(InternalField.KEY_FIELD);
+                IntegrityMessage message = new IntegrityMessage(
+                        bibWarning.message(),
+                        entry,
+                        field);
+                messages.add(message);
+            });
         }
         return messages;
     }
diff --git a/src/main/java/org/jabref/logic/biblog/BibtexLogParser.java b/src/main/java/org/jabref/logic/biblog/BibtexLogParser.java
index 50539eb3781..91406e10121 100644
--- a/src/main/java/org/jabref/logic/biblog/BibtexLogParser.java
+++ b/src/main/java/org/jabref/logic/biblog/BibtexLogParser.java
@@ -16,6 +16,8 @@
  * Parses the contents of a .blg (BibTeX log) file to extract warning messages.
  */
 public class BibtexLogParser {
+    private static final Pattern WARNING_PATTERN = Pattern.compile("^Warning--(?<message>[a-zA-Z ]+) in (?<entryKey>[^\\s]+)$");
+
     public List<BibWarning> parseBiblog(Path blgFilePath) throws IOException {
         List<BibWarning> warnings = new ArrayList<>();
         List<String> lines = Files.readAllLines(blgFilePath);
@@ -40,11 +42,10 @@ public List<BibWarning> parseBiblog(Path blgFilePath) throws IOException {
      */
     private Optional<BibWarning> parseWarningLine(String line) {
         // TODO: Support additional warning formats
-        Pattern compile = Pattern.compile("^Warning--([a-zA-Z ]+) in ([^\\s]+)$");
-        Matcher matcher = compile.matcher(line);
+        Matcher matcher = WARNING_PATTERN.matcher(line);
         if (matcher.find()) {
-            String message = matcher.group(1).trim();
-            String entryKey = matcher.group(2);
+            String message = matcher.group("message").trim();
+            String entryKey = matcher.group("entryKey");
             String fieldName = null;
             if (message.startsWith("empty")) {
                 fieldName = message.substring("empty".length()).trim();
diff --git a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
index 846c9d6d0ee..a495a59a122 100644
--- a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
+import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -122,7 +123,13 @@ public MetaData parse(MetaData metaData, Map<String, String> data, Character key
             } else if (MetaData.FILE_DIRECTORY.equals(entry.getKey())) {
                 metaData.setLibrarySpecificFileDirectory(parseDirectory(entry.getValue()));
             } else if (MetaData.BLG_FILE_PATH.equals(entry.getKey())) {
-                metaData.setBlgFilePath(Path.of(getSingleItem(values)));
+                try {
+                    String blgPathString = getSingleItem(values);
+                    metaData.setBlgFilePath(Path.of(blgPathString));
+                } catch (ParseException |
+                         InvalidPathException e) {
+                    LOGGER.warn("Invalid .blg file path in metadata: {}", values, e);
+                }
             } else if (entry.getKey().startsWith(MetaData.FILE_DIRECTORY + '-')) {
                 // The user name starts directly after FILE_DIRECTORY + '-'
                 String user = entry.getKey().substring(MetaData.FILE_DIRECTORY.length() + 1);
diff --git a/src/main/java/org/jabref/model/biblog/BibWarning.java b/src/main/java/org/jabref/model/biblog/BibWarning.java
index 919d7422bb1..0517f6bf221 100644
--- a/src/main/java/org/jabref/model/biblog/BibWarning.java
+++ b/src/main/java/org/jabref/model/biblog/BibWarning.java
@@ -1,57 +1,17 @@
 package org.jabref.model.biblog;
 
-import java.util.Objects;
 import java.util.Optional;
 
 /**
- *
+ * Represents a warning message parsed from a BibTeX .blg file.
+ * e.g. [SeverityType] -- [Message] in [EntryKey]
  */
-public class BibWarning {
-    //  [SeverityType] -- [Message] in [EntryKey]
-    private final SeverityType severityType;
-    private final String message;
-    private final String fieldName;
-    private final String entryKey;
-
-    public BibWarning(SeverityType severityType, String message, String fieldName, String entryKey) {
-        this.severityType = severityType;
-        this.message = message;
-        this.fieldName = fieldName;
-        this.entryKey = entryKey;
-    }
-
-    public String getEntryKey() {
-        return entryKey;
-    }
-
+public record BibWarning(
+        SeverityType severityType,
+        String message,
+        String fieldName,
+        String entryKey) {
     public Optional<String> getFieldName() {
         return Optional.ofNullable(fieldName);
     }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public SeverityType getSeverityType() {
-        return severityType;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof BibWarning that)) {
-            return false;
-        }
-        return severityType == that.severityType &&
-                Objects.equals(message, that.message) &&
-                Objects.equals(fieldName, that.fieldName) &&
-                Objects.equals(entryKey, that.entryKey);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(severityType, message, fieldName, entryKey);
-    }
 }
diff --git a/src/test/java/org/jabref/logic/biblog/BibLogPathResolverTest.java b/src/test/java/org/jabref/logic/biblog/BibLogPathResolverTest.java
index 9d9a16c717f..9e6d211a200 100644
--- a/src/test/java/org/jabref/logic/biblog/BibLogPathResolverTest.java
+++ b/src/test/java/org/jabref/logic/biblog/BibLogPathResolverTest.java
@@ -8,7 +8,6 @@
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class BibLogPathResolverTest {
     /**
@@ -22,8 +21,7 @@ void returnsUserDefinedBlgPathIfPresent() {
 
         Optional<Path> result = BibLogPathResolver.resolve(metaData, Optional.of(Path.of("/library.bib")));
 
-        assertTrue(result.isPresent());
-        assertEquals(userBlgPath, result.get());
+        assertEquals(Optional.of(userBlgPath), result);
     }
 
     /**
@@ -36,8 +34,7 @@ void returnsDefaultBlgPathWhenUserPathIsAbsent() {
         Path bibPath = Path.of("/home/user/MyLibrary.bib");
         Optional<Path> result = BibLogPathResolver.resolve(metaData, Optional.of(bibPath));
 
-        assertTrue(result.isPresent());
-        assertEquals(Path.of("/home/user/MyLibrary.blg"), result.get());
+        assertEquals(Optional.of(Path.of("/home/user/MyLibrary.blg")), result);
     }
 
     /**
@@ -48,6 +45,6 @@ void returnsEmptyWhenNoUserPathAndNoBibPath() {
         MetaData metaData = new MetaData();
         Optional<Path> result = BibLogPathResolver.resolve(metaData, Optional.empty());
 
-        assertTrue(result.isEmpty());
+        assertEquals(Optional.empty(), result);
     }
 }
diff --git a/src/test/java/org/jabref/logic/biblog/BibtexLogParserTest.java b/src/test/java/org/jabref/logic/biblog/BibtexLogParserTest.java
index 0d8ad7a71a1..d6299b4dce0 100644
--- a/src/test/java/org/jabref/logic/biblog/BibtexLogParserTest.java
+++ b/src/test/java/org/jabref/logic/biblog/BibtexLogParserTest.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.biblog;
 
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.List;
 
 import org.jabref.model.biblog.BibWarning;
@@ -22,7 +21,7 @@ public void setup() {
 
     @Test
     public void parsesWarningsFromResourceFileTest() throws Exception {
-        Path blgFile = Paths.get("src/test/resources/org/jabref/logic/blg/Chocolate.blg");
+        Path blgFile = Path.of("src/test/resources/org/jabref/logic/blg/Chocolate.blg");
         List<BibWarning> warnings = parser.parseBiblog(blgFile);
         assertEquals(4, warnings.size());
         assertEquals(List.of(

From 753cadca1024d42b8adda74b9b59057a4ecfe361 Mon Sep 17 00:00:00 2001
From: Wanling Fu <wanlingfu3@gmail.com>
Date: Tue, 1 Apr 2025 23:31:54 +0100
Subject: [PATCH 03/17] Apply changes based on review feedback

---
 .../integrity/BibLogSettingsViewModel.java    | 16 +++++------
 ...BibWarningToIntegrityMessageConverter.java |  3 ++
 .../jabref/logic/biblog/BibtexLogParser.java  | 28 +++++++++----------
 .../logic/importer/util/MetaDataParser.java   | 13 ++++++---
 src/main/resources/csl-styles                 |  2 +-
 5 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java b/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
index aa840ae62c9..2af9db180fe 100644
--- a/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
+++ b/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
@@ -36,15 +36,13 @@ public BibLogSettingsViewModel(MetaData metaData, Optional<Path> bibPath) {
         this.metaData = metaData;
         this.bibPath = bibPath;
 
-        Path resolvedPath = BibLogPathResolver.resolve(metaData, bibPath).orElse(null);
-        if (resolvedPath == null) {
-            return;
-        }
-        this.path.set(resolvedPath.toString());
-        if (metaData.getBlgFilePath().isEmpty()) {
-            metaData.setBlgFilePath(resolvedPath);
-            this.lastResolvedBlgPath = Optional.of(resolvedPath);
-        }
+        BibLogPathResolver.resolve(metaData, bibPath).ifPresent(resolvedPath -> {
+            this.path.set(resolvedPath.toString());
+            if (metaData.getBlgFilePath().isEmpty()) {
+                metaData.setBlgFilePath(resolvedPath);
+                this.lastResolvedBlgPath = Optional.of(resolvedPath);
+            }
+        });
     }
 
     public StringProperty pathProperty() {
diff --git a/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java b/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
index 196d8814b60..c324951c479 100644
--- a/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
+++ b/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
@@ -26,6 +26,9 @@
  */
 public class BibWarningToIntegrityMessageConverter {
     public static List<IntegrityMessage> convert(List<BibWarning> bibWarnings, BibDatabaseContext context) {
+        if (bibWarnings == null || context == null) {
+            return List.of();
+        }
         List<IntegrityMessage> messages = new ArrayList<>();
         for (BibWarning bibWarning : bibWarnings) {
             context.getDatabase().getEntryByCitationKey(bibWarning.entryKey()).ifPresent(entry -> {
diff --git a/src/main/java/org/jabref/logic/biblog/BibtexLogParser.java b/src/main/java/org/jabref/logic/biblog/BibtexLogParser.java
index 91406e10121..bae959e8fa4 100644
--- a/src/main/java/org/jabref/logic/biblog/BibtexLogParser.java
+++ b/src/main/java/org/jabref/logic/biblog/BibtexLogParser.java
@@ -43,20 +43,20 @@ public List<BibWarning> parseBiblog(Path blgFilePath) throws IOException {
     private Optional<BibWarning> parseWarningLine(String line) {
         // TODO: Support additional warning formats
         Matcher matcher = WARNING_PATTERN.matcher(line);
-        if (matcher.find()) {
-            String message = matcher.group("message").trim();
-            String entryKey = matcher.group("entryKey");
-            String fieldName = null;
-            if (message.startsWith("empty")) {
-                fieldName = message.substring("empty".length()).trim();
-            }
-            return Optional.of(new BibWarning(
-                    SeverityType.WARNING,
-                    message,
-                    fieldName,
-                    entryKey
-            ));
+        if (!matcher.find()) {
+            return Optional.empty();
         }
-        return Optional.empty();
+        String message = matcher.group("message").trim();
+        String entryKey = matcher.group("entryKey");
+        String fieldName = null;
+        if (message.startsWith("empty")) {
+            fieldName = message.substring("empty".length()).trim();
+        }
+        return Optional.of(new BibWarning(
+                SeverityType.WARNING,
+                message,
+                fieldName,
+                entryKey
+        ));
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
index a495a59a122..21abcd270e0 100644
--- a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
@@ -123,12 +123,17 @@ public MetaData parse(MetaData metaData, Map<String, String> data, Character key
             } else if (MetaData.FILE_DIRECTORY.equals(entry.getKey())) {
                 metaData.setLibrarySpecificFileDirectory(parseDirectory(entry.getValue()));
             } else if (MetaData.BLG_FILE_PATH.equals(entry.getKey())) {
+                String blgPathString;
+                try {
+                    blgPathString = getSingleItem(values);
+                } catch (ParseException e) {
+                    LOGGER.warn("Invalid .blg metadata value (ParseException): {}", values, e);
+                    continue;
+                }
                 try {
-                    String blgPathString = getSingleItem(values);
                     metaData.setBlgFilePath(Path.of(blgPathString));
-                } catch (ParseException |
-                         InvalidPathException e) {
-                    LOGGER.warn("Invalid .blg file path in metadata: {}", values, e);
+                } catch (InvalidPathException e) {
+                    LOGGER.warn("Invalid .blg file path (InvalidPathException): {}", blgPathString, e);
                 }
             } else if (entry.getKey().startsWith(MetaData.FILE_DIRECTORY + '-')) {
                 // The user name starts directly after FILE_DIRECTORY + '-'
diff --git a/src/main/resources/csl-styles b/src/main/resources/csl-styles
index 8c5439ee7e0..5dcaf2790ec 160000
--- a/src/main/resources/csl-styles
+++ b/src/main/resources/csl-styles
@@ -1 +1 @@
-Subproject commit 8c5439ee7e0689c5afb44e2fff9694eb9d36ec7b
+Subproject commit 5dcaf2790ecac10dde44e70538a790b52c78fa4b

From a3b6847201c4e4fdfd8f6a79529f4ab5a9b1d964 Mon Sep 17 00:00:00 2001
From: Wanling Fu <wanlingfu3@gmail.com>
Date: Wed, 2 Apr 2025 00:02:49 +0100
Subject: [PATCH 04/17] add missing localization key for BibTeX log files

---
 .../org/jabref/gui/integrity/BibLogSettingsViewModel.java   | 6 +++++-
 .../java/org/jabref/logic/importer/util/MetaDataParser.java | 4 ++--
 src/main/resources/l10n/JabRef_en.properties                | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java b/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
index 2af9db180fe..50877eaa72a 100644
--- a/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
+++ b/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
@@ -73,7 +73,11 @@ public Optional<Path> getLastResolvedBlgPath() {
     }
 
     /**
-     * Parses .blg file into IntegrityMessages (if path exists).
+     * Parses the .blg file (if it exists) into integrity messages.
+     * Returns an empty list if the file doesn't exist or can't be read.
+     *
+     * @param databaseContext the current database context used to resolve citation keys in warnings
+     * @return a list of {@link IntegrityMessage}s parsed from the .blg file, or an empty list if unavailable
      */
     public List<IntegrityMessage> getBlgWarnings(BibDatabaseContext databaseContext) {
         Optional<Path> resolved = BibLogPathResolver.resolve(metaData, bibPath)
diff --git a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
index 21abcd270e0..dd189efd4bf 100644
--- a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
@@ -127,13 +127,13 @@ public MetaData parse(MetaData metaData, Map<String, String> data, Character key
                 try {
                     blgPathString = getSingleItem(values);
                 } catch (ParseException e) {
-                    LOGGER.warn("Invalid .blg metadata value (ParseException): {}", values, e);
+                    LOGGER.warn("Invalid .blg metadata value", e);
                     continue;
                 }
                 try {
                     metaData.setBlgFilePath(Path.of(blgPathString));
                 } catch (InvalidPathException e) {
-                    LOGGER.warn("Invalid .blg file path (InvalidPathException): {}", blgPathString, e);
+                    LOGGER.warn("Invalid .blg file path", e);
                 }
             } else if (entry.getKey().startsWith(MetaData.FILE_DIRECTORY + '-')) {
                 // The user name starts directly after FILE_DIRECTORY + '-'
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 0ff60ae32fc..6ca206964fe 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1028,6 +1028,7 @@ Line\ %0\:\ Found\ corrupted\ citation\ key\ %1\ (comma\ missing).=Line %0: Foun
 Check\ integrity=Check integrity
 Checking\ integrity...=Checking integrity...
 Waiting\ for\ the\ check\ to\ finish...=Waiting for the check to finish...
+BibTeX\ log\ files=BibTeX log files
 
 Field\ Presence\ Consistency\ Check\ Result=Field Presence Consistency Check Result
 required\ field\ is\ present=required field is present

From 6760ced627f1def1210dd0c048814dedb6257f60 Mon Sep 17 00:00:00 2001
From: Wanling Fu <wanlingfu3@gmail.com>
Date: Wed, 2 Apr 2025 00:18:27 +0100
Subject: [PATCH 05/17] apply OpenRewrite suggestions

---
 .../org/jabref/gui/integrity/BibLogSettingsViewModel.java     | 4 ++--
 .../java/org/jabref/logic/importer/util/MetaDataParser.java   | 4 ++--
 .../biblog/BibWarningToIntegrityMessageConverterTest.java     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java b/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
index 50877eaa72a..669241c1276 100644
--- a/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
+++ b/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
@@ -76,8 +76,8 @@ public Optional<Path> getLastResolvedBlgPath() {
      * Parses the .blg file (if it exists) into integrity messages.
      * Returns an empty list if the file doesn't exist or can't be read.
      *
-     * @param databaseContext the current database context used to resolve citation keys in warnings
-     * @return a list of {@link IntegrityMessage}s parsed from the .blg file, or an empty list if unavailable
+     * @param databaseContext the current database context used to resolve citation keys in warnings.
+     * @return a list of {@link IntegrityMessage}s parsed from the .blg file, or an empty list if unavailable.
      */
     public List<IntegrityMessage> getBlgWarnings(BibDatabaseContext databaseContext) {
         Optional<Path> resolved = BibLogPathResolver.resolve(metaData, bibPath)
diff --git a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
index dd189efd4bf..d81d5878bee 100644
--- a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
@@ -127,13 +127,13 @@ public MetaData parse(MetaData metaData, Map<String, String> data, Character key
                 try {
                     blgPathString = getSingleItem(values);
                 } catch (ParseException e) {
-                    LOGGER.warn("Invalid .blg metadata value", e);
+                    LOGGER.warn("Invalid .blg metadata value for key {} with values: {}", entry.getKey(), values, e);
                     continue;
                 }
                 try {
                     metaData.setBlgFilePath(Path.of(blgPathString));
                 } catch (InvalidPathException e) {
-                    LOGGER.warn("Invalid .blg file path", e);
+                    LOGGER.warn("Invalid .blg file path: {} (parsed from metadata key {})", blgPathString, entry.getKey(), e);
                 }
             } else if (entry.getKey().startsWith(MetaData.FILE_DIRECTORY + '-')) {
                 // The user name starts directly after FILE_DIRECTORY + '-'
diff --git a/src/test/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverterTest.java b/src/test/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverterTest.java
index 9b67473244b..5138a73970b 100644
--- a/src/test/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverterTest.java
+++ b/src/test/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverterTest.java
@@ -38,7 +38,7 @@ public void convertsWarningsToIntegrityMessagesTest() {
 
         assertEquals(2, messages.size());
 
-        IntegrityMessage msg1 = messages.get(0);
+        IntegrityMessage msg1 = messages.getFirst();
         assertEquals("empty journal", msg1.message());
         assertEquals(firstEntry, msg1.entry());
         assertEquals("journal", msg1.field().getName());
@@ -70,6 +70,6 @@ public void skipsWarningsForMissingEntries() {
         List<IntegrityMessage> messages = BibWarningToIntegrityMessageConverter.convert(warnings, context);
 
         assertEquals(1, messages.size());
-        assertEquals("Scholey_2013", messages.get(0).entry().getCitationKey().orElseThrow());
+        assertEquals("Scholey_2013", messages.getFirst().entry().getCitationKey().orElseThrow());
     }
 }

From b694915baf41c30a9e56d4b971b6a82ffcac8ec9 Mon Sep 17 00:00:00 2001
From: Wanling Fu <wanlingfu3@gmail.com>
Date: Wed, 2 Apr 2025 13:36:58 +0100
Subject: [PATCH 06/17] Fix preferences and Reset logic for .blg file settings

---
 .../integrity/BibLogSettingsViewModel.java    | 34 ++++++++------
 .../logic/biblog/BibLogPathResolver.java      | 21 +++++----
 .../logic/exporter/MetaDataSerializer.java    |  5 ++-
 .../logic/importer/util/MetaDataParser.java   | 44 +++++++++++++------
 .../org/jabref/model/metadata/MetaData.java   | 20 ++++++---
 .../logic/biblog/BibLogPathResolverTest.java  | 12 ++---
 .../exporter/MetaDataSerializerTest.java      | 16 +++++++
 .../importer/util/MetaDataParserTest.java     | 17 +++++++
 8 files changed, 119 insertions(+), 50 deletions(-)

diff --git a/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java b/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
index 669241c1276..b62676268eb 100644
--- a/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
+++ b/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
@@ -29,17 +29,20 @@ public class BibLogSettingsViewModel {
     private static final Logger LOGGER = LoggerFactory.getLogger(BibLogSettingsViewModel.class);
     private final MetaData metaData;
     private final Optional<Path> bibPath;
+    private final String user;
     private final StringProperty path = new SimpleStringProperty("");
     private Optional<Path> lastResolvedBlgPath = Optional.empty();
 
     public BibLogSettingsViewModel(MetaData metaData, Optional<Path> bibPath) {
         this.metaData = metaData;
         this.bibPath = bibPath;
+        this.user = System.getProperty("user.name");
 
-        BibLogPathResolver.resolve(metaData, bibPath).ifPresent(resolvedPath -> {
+        BibLogPathResolver.resolve(metaData, bibPath, user)
+                          .ifPresent(resolvedPath -> {
             this.path.set(resolvedPath.toString());
-            if (metaData.getBlgFilePath().isEmpty()) {
-                metaData.setBlgFilePath(resolvedPath);
+            if (metaData.getBlgFilePath(user).isEmpty()) {
+                metaData.setBlgFilePath(user, resolvedPath);
                 this.lastResolvedBlgPath = Optional.of(resolvedPath);
             }
         });
@@ -50,21 +53,27 @@ public StringProperty pathProperty() {
     }
 
     public void setBlgFilePath(Path path) {
-        metaData.setBlgFilePath(path);
+        metaData.setBlgFilePath(user, path);
         this.path.set(path.toString());
+        this.lastResolvedBlgPath = Optional.of(path);
     }
 
     public void resetBlgFilePath() {
-        metaData.clearBlgFilePath();
-        BibLogPathResolver.resolve(metaData, bibPath)
-                          .map(Path::toString)
-                          .ifPresentOrElse(
-                                  this.path::set,
-                                  () -> this.path.set(""));
+        metaData.clearBlgFilePath(user);
+        Optional<Path> resolved = BibLogPathResolver.resolve(metaData, bibPath, user);
+        if (resolved.isEmpty()) {
+            path.set("");
+            lastResolvedBlgPath = Optional.empty();
+            return;
+        }
+
+        Path resolvedPath = resolved.get();
+        path.set(resolvedPath.toString());
+        lastResolvedBlgPath = Optional.of(resolvedPath);
     }
 
     public Optional<Path> getResolvedBlgPath() {
-        return BibLogPathResolver.resolve(metaData, bibPath)
+        return BibLogPathResolver.resolve(metaData, bibPath, user)
                                  .filter(Files::exists);
     }
 
@@ -80,8 +89,7 @@ public Optional<Path> getLastResolvedBlgPath() {
      * @return a list of {@link IntegrityMessage}s parsed from the .blg file, or an empty list if unavailable.
      */
     public List<IntegrityMessage> getBlgWarnings(BibDatabaseContext databaseContext) {
-        Optional<Path> resolved = BibLogPathResolver.resolve(metaData, bibPath)
-                                                    .filter(Files::exists);
+        Optional<Path> resolved = getResolvedBlgPath();
         if (resolved.isEmpty()) {
             return List.of();
         }
diff --git a/src/main/java/org/jabref/logic/biblog/BibLogPathResolver.java b/src/main/java/org/jabref/logic/biblog/BibLogPathResolver.java
index 44dfea24c5c..72db23b692a 100644
--- a/src/main/java/org/jabref/logic/biblog/BibLogPathResolver.java
+++ b/src/main/java/org/jabref/logic/biblog/BibLogPathResolver.java
@@ -6,23 +6,28 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.metadata.MetaData;
 
+/**
+ * Resolves custom or default .blg path for this library.
+ *
+ * Priority:
+ * 1. User-defined path from MetaData
+ * 2. Default: same name as .bib file with .blg extension
+ */
 public class BibLogPathResolver {
+
     /**
-     * Resolves custom or default .blg path for this library.
-     *
-     * Priority:
-     * 1. User-defined path from MetaData
-     * 2. Default: same name as .bib file with .blg extension
+     * Resolves .blg path using current user context.
      */
     public static Optional<Path> resolve(BibDatabaseContext context) {
-        return resolve(context.getMetaData(), context.getDatabasePath());
+        String user = System.getProperty("user.name");
+        return resolve(context.getMetaData(), context.getDatabasePath(), user);
     }
 
     /**
      * Test-friendly API (allows direct input of MetaData and Path)
      */
-    public static Optional<Path> resolve(MetaData metaData, Optional<Path> databasePath) {
-        Optional<Path> userDefined = metaData.getBlgFilePath();
+    public static Optional<Path> resolve(MetaData metaData, Optional<Path> databasePath, String user) {
+        Optional<Path> userDefined = metaData.getBlgFilePath(user);
         if (userDefined.isPresent()) {
             return userDefined;
         }
diff --git a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java b/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
index e365be6a366..485782ebe43 100644
--- a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
+++ b/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
@@ -60,8 +60,9 @@ public static Map<String, String> getSerializedStringMap(MetaData metaData,
                 .put(MetaData.FILE_DIRECTORY_LATEX + '-' + user, Collections.singletonList(path.toString().trim())));
         metaData.getVersionDBStructure().ifPresent(
                 versionDBStructure -> stringyMetaData.put(MetaData.VERSION_DB_STRUCT, Collections.singletonList(versionDBStructure.trim())));
-        metaData.getBlgFilePath().ifPresent(
-                path -> stringyMetaData.put(MetaData.BLG_FILE_PATH, Collections.singletonList(path.toString().trim())));
+        metaData.getBlgFilePaths().forEach((user, path) -> {
+            stringyMetaData.put(MetaData.BLG_FILE_PATH + "-" + user, Collections.singletonList(path.toString().trim()));
+        });
 
         for (ContentSelector selector : metaData.getContentSelectorsSorted()) {
             stringyMetaData.put(MetaData.SELECTOR_META_PREFIX + selector.getField().getName(), selector.getValues());
diff --git a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
index d81d5878bee..5175528043e 100644
--- a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
-import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -122,19 +121,8 @@ public MetaData parse(MetaData metaData, Map<String, String> data, Character key
                 metaData.addContentSelector(ContentSelectors.parse(FieldFactory.parseField(entry.getKey().substring(MetaData.SELECTOR_META_PREFIX.length())), StringUtil.unquote(entry.getValue(), MetaData.ESCAPE_CHARACTER)));
             } else if (MetaData.FILE_DIRECTORY.equals(entry.getKey())) {
                 metaData.setLibrarySpecificFileDirectory(parseDirectory(entry.getValue()));
-            } else if (MetaData.BLG_FILE_PATH.equals(entry.getKey())) {
-                String blgPathString;
-                try {
-                    blgPathString = getSingleItem(values);
-                } catch (ParseException e) {
-                    LOGGER.warn("Invalid .blg metadata value for key {} with values: {}", entry.getKey(), values, e);
-                    continue;
-                }
-                try {
-                    metaData.setBlgFilePath(Path.of(blgPathString));
-                } catch (InvalidPathException e) {
-                    LOGGER.warn("Invalid .blg file path: {} (parsed from metadata key {})", blgPathString, entry.getKey(), e);
-                }
+            } else if (entry.getKey().startsWith(MetaData.BLG_FILE_PATH + "-")) {
+                handleBlgFilePathEntry(entry, metaData);
             } else if (entry.getKey().startsWith(MetaData.FILE_DIRECTORY + '-')) {
                 // The user name starts directly after FILE_DIRECTORY + '-'
                 String user = entry.getKey().substring(MetaData.FILE_DIRECTORY.length() + 1);
@@ -279,4 +267,32 @@ public static FieldFormatterCleanups fieldFormatterCleanupsParse(List<String> fo
             return new FieldFormatterCleanups(false, DEFAULT_SAVE_ACTIONS);
         }
     }
+
+    /**
+     * Handles a blgFilePath-* metadata entry. Expects exactly one valid path.
+     *
+     * @param entry the metadata entry containing the user-specific .blg path.
+     * @param metaData the MetaData object to update.
+     */
+    private void handleBlgFilePathEntry(Map.Entry<String, String> entry, MetaData metaData) {
+        String user = entry.getKey().substring(MetaData.BLG_FILE_PATH.length() + 1);
+        List<String> values;
+        try {
+            values = getAsList(entry.getValue());
+        } catch (ParseException e) {
+            LOGGER.warn("Invalid .blg metadata format for user {}: {}", user, entry.getValue(), e);
+            return;
+        }
+        if (values.size() != 1) {
+            LOGGER.warn("Expected single .blg path entry for user {}, but got {}", user, values);
+            return;
+        }
+        String pathStr = values.getFirst();
+        try {
+            Path path = Path.of(pathStr);
+            metaData.setBlgFilePath(user, path);
+        } catch (Exception e) {
+            LOGGER.warn("Invalid .blg file path for user {}: {}", user, pathStr, e);
+        }
+    }
 }
diff --git a/src/main/java/org/jabref/model/metadata/MetaData.java b/src/main/java/org/jabref/model/metadata/MetaData.java
index 9f9d6c2c671..dee4a473011 100644
--- a/src/main/java/org/jabref/model/metadata/MetaData.java
+++ b/src/main/java/org/jabref/model/metadata/MetaData.java
@@ -66,6 +66,7 @@ public class MetaData {
 
     private final ObjectProperty<GroupTreeNode> groupsRoot = new SimpleObjectProperty<>(null);
     private final OptionalBinding<GroupTreeNode> groupsRootBinding = new OptionalWrapper<>(groupsRoot);
+    private final Map<String, Path> blgFilePathMap = new HashMap<>();
     private Optional<Version> groupSearchSyntaxVersion = Optional.empty();
 
     private Charset encoding;
@@ -80,7 +81,6 @@ public class MetaData {
     private boolean isEventPropagationEnabled = true;
     private boolean encodingExplicitlySupplied;
     private String versionDBStructure;
-    private Optional<Path> blgFilePath = Optional.empty();
 
     /**
      * Constructs an empty metadata.
@@ -414,15 +414,21 @@ public String toString() {
         return "MetaData [citeKeyPatterns=" + citeKeyPatterns + ", userFileDirectory=" + userFileDirectory + ", laTexFileDirectory=" + laTexFileDirectory + ", groupsRoot=" + groupsRoot + ", encoding=" + encoding + ", saveOrderConfig=" + saveOrder + ", defaultCiteKeyPattern=" + defaultCiteKeyPattern + ", saveActions=" + saveActions + ", mode=" + mode + ", isProtected=" + isProtected + ", librarySpecificFileDirectory=" + librarySpecificFileDirectory + ", contentSelectors=" + contentSelectors + ", encodingExplicitlySupplied=" + encodingExplicitlySupplied + ", VersionDBStructure=" + versionDBStructure + "]";
     }
 
-    public Optional<Path> getBlgFilePath() {
-        return blgFilePath;
+    public Optional<Path> getBlgFilePath(String user) {
+        return Optional.ofNullable(blgFilePathMap.get(user));
     }
 
-    public void setBlgFilePath(Path path) {
-        this.blgFilePath = Optional.ofNullable(path);
+    public void setBlgFilePath(String user, Path path) {
+        blgFilePathMap.put(Objects.requireNonNull(user), Objects.requireNonNull(path));
+        postChange();
+    }
+
+    public void clearBlgFilePath(String user) {
+        blgFilePathMap.remove(user);
+        postChange();
     }
 
-    public void clearBlgFilePath() {
-        this.blgFilePath = Optional.empty();
+    public Map<String, Path> getBlgFilePaths() {
+        return blgFilePathMap;
     }
 }
diff --git a/src/test/java/org/jabref/logic/biblog/BibLogPathResolverTest.java b/src/test/java/org/jabref/logic/biblog/BibLogPathResolverTest.java
index 9e6d211a200..f25ab4983f7 100644
--- a/src/test/java/org/jabref/logic/biblog/BibLogPathResolverTest.java
+++ b/src/test/java/org/jabref/logic/biblog/BibLogPathResolverTest.java
@@ -10,17 +10,18 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BibLogPathResolverTest {
+    private static final String TEST_USER = "testUser";
     /**
      * Returns the user-defined .blg path if it's set.
      */
     @Test
     void returnsUserDefinedBlgPathIfPresent() {
         MetaData metaData = new MetaData();
-        Path userBlgPath = Path.of("/custom/path/output.blg");
-        metaData.setBlgFilePath(userBlgPath);
 
-        Optional<Path> result = BibLogPathResolver.resolve(metaData, Optional.of(Path.of("/library.bib")));
+        Path userBlgPath = Path.of("/custom/path/output.blg");
+        metaData.setBlgFilePath(TEST_USER, userBlgPath);
 
+        Optional<Path> result = BibLogPathResolver.resolve(metaData, Optional.of(Path.of("/library.bib")), TEST_USER);
         assertEquals(Optional.of(userBlgPath), result);
     }
 
@@ -32,7 +33,7 @@ void returnsDefaultBlgPathWhenUserPathIsAbsent() {
         MetaData metaData = new MetaData(); // no blg path set
 
         Path bibPath = Path.of("/home/user/MyLibrary.bib");
-        Optional<Path> result = BibLogPathResolver.resolve(metaData, Optional.of(bibPath));
+        Optional<Path> result = BibLogPathResolver.resolve(metaData, Optional.of(bibPath), TEST_USER);
 
         assertEquals(Optional.of(Path.of("/home/user/MyLibrary.blg")), result);
     }
@@ -43,8 +44,7 @@ void returnsDefaultBlgPathWhenUserPathIsAbsent() {
     @Test
     void returnsEmptyWhenNoUserPathAndNoBibPath() {
         MetaData metaData = new MetaData();
-        Optional<Path> result = BibLogPathResolver.resolve(metaData, Optional.empty());
-
+        Optional<Path> result = BibLogPathResolver.resolve(metaData, Optional.empty(), TEST_USER);
         assertEquals(Optional.empty(), result);
     }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java b/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java
index 5722d326d48..2254e60dcc1 100644
--- a/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java
+++ b/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java
@@ -1,5 +1,6 @@
 package org.jabref.logic.exporter;
 
+import java.nio.file.Path;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -140,4 +141,19 @@ public static Stream<Arguments> serializeCustomizedEntryType() {
     void serializeCustomizedEntryType(BibEntryTypeBuilder bibEntryTypeBuilder, String expected) {
         assertEquals(expected, MetaDataSerializer.serializeCustomEntryTypes(bibEntryTypeBuilder.build()));
     }
+
+    /**
+     * Ensures that user-specific .blg path is correctly serialized
+     * to the form: blgFilePath-{username}=/path/to/file.blg;
+     */
+    @Test
+    void serializeUserSpecificBlgPath() {
+        String user = "testUser";
+        Path blgPath = Path.of("/home/user/test.blg");
+        metaData.setBlgFilePath(user, blgPath);
+
+        Map<String, String> serialized = MetaDataSerializer.getSerializedStringMap(metaData, pattern);
+
+        assertEquals("/home/user/test.blg;", serialized.get("blgFilePath-" + user));
+    }
 }
diff --git a/src/test/java/org/jabref/logic/importer/util/MetaDataParserTest.java b/src/test/java/org/jabref/logic/importer/util/MetaDataParserTest.java
index 73bd5e2d62c..46d553892a3 100644
--- a/src/test/java/org/jabref/logic/importer/util/MetaDataParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/MetaDataParserTest.java
@@ -1,5 +1,6 @@
 package org.jabref.logic.importer.util;
 
+import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -77,4 +78,20 @@ void saveActions() throws Exception {
         expected.setSaveActions(fieldFormatterCleanups);
         assertEquals(expected, parsed);
     }
+
+    /**
+     * Verifies that a user-specific .blg path (e.g. blgFilePath-testUser) is correctly parsed from metadata.
+     * Ensures that the trailing semicolon (used as separator in .bib metadata) is handled and stripped properly.
+     */
+    @Test
+    void parsesUserSpecificBlgPathSuccessfully() throws Exception {
+        String user = "testUser";
+        String rawKey = "blgFilePath-" + user;
+        String rawValue = "/home/user/test.blg;";
+
+        MetaDataParser parser = new MetaDataParser(new DummyFileUpdateMonitor());
+        MetaData parsed = parser.parse(Map.of(rawKey, rawValue), ',');
+
+        assertEquals(Optional.of(Path.of("/home/user/test.blg")), parsed.getBlgFilePath(user));
+    }
 }

From f86643b820d28b29d7dc3f9602ab10362a21abae Mon Sep 17 00:00:00 2001
From: Wanling Fu <wanlingfu3@gmail.com>
Date: Wed, 2 Apr 2025 17:54:26 +0100
Subject: [PATCH 07/17] Apply review suggestions

---
 .../java/org/jabref/gui/integrity/BibLogSettingsPane.java  | 5 ++---
 .../biblog/BibWarningToIntegrityMessageConverter.java      | 1 +
 src/main/java/org/jabref/logic/biblog/BibtexLogParser.java | 2 ++
 .../java/org/jabref/logic/exporter/MetaDataSerializer.java | 1 +
 .../org/jabref/logic/importer/util/MetaDataParser.java     | 7 ++++---
 src/main/java/org/jabref/model/metadata/MetaData.java      | 5 +++--
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java b/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
index 4e1b5d0520a..00cf8e3a958 100644
--- a/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
+++ b/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.integrity;
 
 import java.nio.file.Path;
+import java.util.Optional;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.TextField;
@@ -61,8 +62,6 @@ private FileDialogConfiguration createBlgFileDialogConfig() {
     }
 
     private void notifyPathChanged() {
-        if (onBlgPathChanged != null) {
-            onBlgPathChanged.run();
-        }
+        Optional.ofNullable(onBlgPathChanged).ifPresent(Runnable::run);
     }
 }
diff --git a/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java b/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
index c324951c479..bdcf62d6617 100644
--- a/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
+++ b/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
@@ -29,6 +29,7 @@ public static List<IntegrityMessage> convert(List<BibWarning> bibWarnings, BibDa
         if (bibWarnings == null || context == null) {
             return List.of();
         }
+
         List<IntegrityMessage> messages = new ArrayList<>();
         for (BibWarning bibWarning : bibWarnings) {
             context.getDatabase().getEntryByCitationKey(bibWarning.entryKey()).ifPresent(entry -> {
diff --git a/src/main/java/org/jabref/logic/biblog/BibtexLogParser.java b/src/main/java/org/jabref/logic/biblog/BibtexLogParser.java
index bae959e8fa4..0cc6d279ea7 100644
--- a/src/main/java/org/jabref/logic/biblog/BibtexLogParser.java
+++ b/src/main/java/org/jabref/logic/biblog/BibtexLogParser.java
@@ -46,12 +46,14 @@ private Optional<BibWarning> parseWarningLine(String line) {
         if (!matcher.find()) {
             return Optional.empty();
         }
+
         String message = matcher.group("message").trim();
         String entryKey = matcher.group("entryKey");
         String fieldName = null;
         if (message.startsWith("empty")) {
             fieldName = message.substring("empty".length()).trim();
         }
+
         return Optional.of(new BibWarning(
                 SeverityType.WARNING,
                 message,
diff --git a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java b/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
index 485782ebe43..06ac141e1b2 100644
--- a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
+++ b/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
@@ -32,6 +32,7 @@ private MetaDataSerializer() {
 
     /**
      * Writes all data in the format &lt;key, serialized data>.
+     * Also serializes user-defined .blg file paths (if present).
      */
     public static Map<String, String> getSerializedStringMap(MetaData metaData,
                                                              GlobalCitationKeyPatterns globalCiteKeyPatterns) {
diff --git a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
index 5175528043e..c4d5cd0c1ef 100644
--- a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
@@ -280,11 +280,11 @@ private void handleBlgFilePathEntry(Map.Entry<String, String> entry, MetaData me
         try {
             values = getAsList(entry.getValue());
         } catch (ParseException e) {
-            LOGGER.warn("Invalid .blg metadata format for user {}: {}", user, entry.getValue(), e);
+            LOGGER.error("Invalid .blg metadata format for user {}: {}", user, entry.getValue(), e);
             return;
         }
         if (values.size() != 1) {
-            LOGGER.warn("Expected single .blg path entry for user {}, but got {}", user, values);
+            LOGGER.error("Expected single .blg path entry for user {}, but got {}", user, values);
             return;
         }
         String pathStr = values.getFirst();
@@ -292,7 +292,8 @@ private void handleBlgFilePathEntry(Map.Entry<String, String> entry, MetaData me
             Path path = Path.of(pathStr);
             metaData.setBlgFilePath(user, path);
         } catch (Exception e) {
-            LOGGER.warn("Invalid .blg file path for user {}: {}", user, pathStr, e);
+            LOGGER.error("Invalid .blg file path for user {}: {}", user, pathStr, e);
+            return;
         }
     }
 }
diff --git a/src/main/java/org/jabref/model/metadata/MetaData.java b/src/main/java/org/jabref/model/metadata/MetaData.java
index dee4a473011..ba93f761ab3 100644
--- a/src/main/java/org/jabref/model/metadata/MetaData.java
+++ b/src/main/java/org/jabref/model/metadata/MetaData.java
@@ -31,6 +31,7 @@
 import com.google.common.eventbus.EventBus;
 import com.tobiasdiez.easybind.optional.OptionalBinding;
 import com.tobiasdiez.easybind.optional.OptionalWrapper;
+import jakarta.annotation.Nonnull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -418,8 +419,8 @@ public Optional<Path> getBlgFilePath(String user) {
         return Optional.ofNullable(blgFilePathMap.get(user));
     }
 
-    public void setBlgFilePath(String user, Path path) {
-        blgFilePathMap.put(Objects.requireNonNull(user), Objects.requireNonNull(path));
+    public void setBlgFilePath(@Nonnull String user, @Nonnull Path path) {
+        blgFilePathMap.put(user, path);
         postChange();
     }
 

From 64301bec792222c69de6c2dfcac1a370a43e385b Mon Sep 17 00:00:00 2001
From: Wanling Fu <wanlingfu3@gmail.com>
Date: Wed, 2 Apr 2025 18:10:15 +0100
Subject: [PATCH 08/17] Apply review suggestions

---
 .../java/org/jabref/gui/integrity/BibLogSettingsPane.java     | 2 +-
 src/main/java/org/jabref/model/metadata/MetaData.java         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java b/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
index 00cf8e3a958..8ca8207db6c 100644
--- a/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
+++ b/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
@@ -56,7 +56,7 @@ private FileDialogConfiguration createBlgFileDialogConfig() {
         Path initialDir = viewModel.getInitialDirectory();
         configBuilder.withInitialDirectory(initialDir);
         configBuilder.addExtensionFilter(
-                new FileChooser.ExtensionFilter(Localization.lang("BibTeX log files"), "*.blg")
+                new FileChooser.ExtensionFilter(Localization.lang("%BibTeX log files"), "*.blg")
         );
         return configBuilder.build();
     }
diff --git a/src/main/java/org/jabref/model/metadata/MetaData.java b/src/main/java/org/jabref/model/metadata/MetaData.java
index ba93f761ab3..addeededb0f 100644
--- a/src/main/java/org/jabref/model/metadata/MetaData.java
+++ b/src/main/java/org/jabref/model/metadata/MetaData.java
@@ -31,7 +31,7 @@
 import com.google.common.eventbus.EventBus;
 import com.tobiasdiez.easybind.optional.OptionalBinding;
 import com.tobiasdiez.easybind.optional.OptionalWrapper;
-import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.NonNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -419,7 +419,7 @@ public Optional<Path> getBlgFilePath(String user) {
         return Optional.ofNullable(blgFilePathMap.get(user));
     }
 
-    public void setBlgFilePath(@Nonnull String user, @Nonnull Path path) {
+    public void setBlgFilePath(@NonNull String user, @NonNull Path path) {
         blgFilePathMap.put(user, path);
         postChange();
     }

From 6f2aab312f19ec6065276054dc7a3e144e928339 Mon Sep 17 00:00:00 2001
From: Wanling Fu <wanlingfu3@gmail.com>
Date: Wed, 2 Apr 2025 20:40:22 +0100
Subject: [PATCH 09/17] Fix failing unit tests

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

diff --git a/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java b/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
index 8ca8207db6c..00cf8e3a958 100644
--- a/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
+++ b/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
@@ -56,7 +56,7 @@ private FileDialogConfiguration createBlgFileDialogConfig() {
         Path initialDir = viewModel.getInitialDirectory();
         configBuilder.withInitialDirectory(initialDir);
         configBuilder.addExtensionFilter(
-                new FileChooser.ExtensionFilter(Localization.lang("%BibTeX log files"), "*.blg")
+                new FileChooser.ExtensionFilter(Localization.lang("BibTeX log files"), "*.blg")
         );
         return configBuilder.build();
     }

From 32dd1990f00365b438e6eef4e558fd104dbe9580 Mon Sep 17 00:00:00 2001
From: Wanling Fu <wanlingfu3@gmail.com>
Date: Mon, 7 Apr 2025 12:56:27 +0100
Subject: [PATCH 10/17] Apply review suggestions

---
 .../gui/integrity/IntegrityCheckDialog.java   | 33 +++++++++++--------
 .../logic/biblog/BibLogPathResolver.java      |  4 +++
 ...BibWarningToIntegrityMessageConverter.java |  4 +++
 ...arningToIntegrityMessageConverterTest.java |  4 +--
 .../logic/biblog/BibtexLogParserTest.java     |  4 +--
 5 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
index 616a52086cd..2095d22fd58 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -178,19 +178,24 @@ private void loadBibLogSettingsPane() {
      * 3. Replace old warnings and update the table.
      */
     private void reloadBlgWarnings() {
-        bibLogSettingsPane.getViewModel().getResolvedBlgPath().ifPresent(newBlgPath -> {
-            Optional<Path> lastPath = bibLogSettingsPane.getViewModel().getLastResolvedBlgPath();
-            if (lastPath.isPresent() && newBlgPath.equals(lastPath)) {
-                return;
-            }
-            List<IntegrityMessage> newWarnings = bibLogSettingsPane.getViewModel().getBlgWarnings(libraryTab.getBibDatabaseContext());
-            messages.removeAll(blgWarnings);
-            blgWarnings.clear();
-            blgWarnings.addAll(newWarnings);
-            messages.addAll(blgWarnings);
-
-            viewModel = new IntegrityCheckDialogViewModel(messages);
-            messagesTable.setItems(viewModel.getMessages());
-        });
+        Optional<Path> resolvedBlgPath = bibLogSettingsPane.getViewModel().getResolvedBlgPath();
+        if (resolvedBlgPath.isEmpty()) {
+            return;
+        }
+
+        Path newBlgPath = resolvedBlgPath.get();
+        Optional<Path> lastPath = bibLogSettingsPane.getViewModel().getLastResolvedBlgPath();
+        if (lastPath.isPresent() && newBlgPath.equals(lastPath)) {
+            return;
+        }
+
+        List<IntegrityMessage> newWarnings = bibLogSettingsPane.getViewModel().getBlgWarnings(libraryTab.getBibDatabaseContext());
+        messages.removeAll(blgWarnings);
+        blgWarnings.clear();
+        blgWarnings.addAll(newWarnings);
+        messages.addAll(blgWarnings);
+
+        viewModel = new IntegrityCheckDialogViewModel(messages);
+        messagesTable.setItems(viewModel.getMessages());
     }
 }
diff --git a/src/main/java/org/jabref/logic/biblog/BibLogPathResolver.java b/src/main/java/org/jabref/logic/biblog/BibLogPathResolver.java
index 72db23b692a..42cc5892eed 100644
--- a/src/main/java/org/jabref/logic/biblog/BibLogPathResolver.java
+++ b/src/main/java/org/jabref/logic/biblog/BibLogPathResolver.java
@@ -32,6 +32,10 @@ public static Optional<Path> resolve(MetaData metaData, Optional<Path> databaseP
             return userDefined;
         }
 
+        if (databasePath.isEmpty()) {
+            return Optional.empty();
+        }
+
         return databasePath.map(path ->
                 path.resolveSibling(
                         path.getFileName().toString().replaceFirst("\\.bib$", ".blg")
diff --git a/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java b/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
index bdcf62d6617..e8e02390d57 100644
--- a/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
+++ b/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
@@ -30,6 +30,10 @@ public static List<IntegrityMessage> convert(List<BibWarning> bibWarnings, BibDa
             return List.of();
         }
 
+        if (bibWarnings.isEmpty()) {
+            return List.of();
+        }
+
         List<IntegrityMessage> messages = new ArrayList<>();
         for (BibWarning bibWarning : bibWarnings) {
             context.getDatabase().getEntryByCitationKey(bibWarning.entryKey()).ifPresent(entry -> {
diff --git a/src/test/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverterTest.java b/src/test/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverterTest.java
index 5138a73970b..da652f72548 100644
--- a/src/test/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverterTest.java
+++ b/src/test/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverterTest.java
@@ -17,7 +17,7 @@
 
 public class BibWarningToIntegrityMessageConverterTest {
     @Test
-    public void convertsWarningsToIntegrityMessagesTest() {
+    void convertsWarningsToIntegrityMessagesTest() {
         BibEntry firstEntry = new BibEntry(StandardEntryType.Article)
                 .withCitationKey("Scholey_2013")
                 .withField(StandardField.AUTHOR, "Scholey");
@@ -53,7 +53,7 @@ public void convertsWarningsToIntegrityMessagesTest() {
      * Gracefully skips warnings for entries not found in the database.
      */
     @Test
-    public void skipsWarningsForMissingEntries() {
+    void skipsWarningsForMissingEntries() {
         // Arrange: only one entry
         BibEntry scholey = new BibEntry(StandardEntryType.Article)
                 .withCitationKey("Scholey_2013");
diff --git a/src/test/java/org/jabref/logic/biblog/BibtexLogParserTest.java b/src/test/java/org/jabref/logic/biblog/BibtexLogParserTest.java
index d6299b4dce0..e1bc90d1fa1 100644
--- a/src/test/java/org/jabref/logic/biblog/BibtexLogParserTest.java
+++ b/src/test/java/org/jabref/logic/biblog/BibtexLogParserTest.java
@@ -15,12 +15,12 @@ public class BibtexLogParserTest {
     private BibtexLogParser parser;
 
     @BeforeEach
-    public void setup() {
+    void setup() {
         parser = new BibtexLogParser();
     }
 
     @Test
-    public void parsesWarningsFromResourceFileTest() throws Exception {
+    void parsesWarningsFromResourceFileTest() throws Exception {
         Path blgFile = Path.of("src/test/resources/org/jabref/logic/blg/Chocolate.blg");
         List<BibWarning> warnings = parser.parseBiblog(blgFile);
         assertEquals(4, warnings.size());

From 2f5ec93a7d52ed1b1560651ebf8f7e33db86a458 Mon Sep 17 00:00:00 2001
From: Wanling Fu <wanlingfu3@gmail.com>
Date: Mon, 14 Apr 2025 22:04:48 +0100
Subject: [PATCH 11/17] Apply review suggestions and improve separation of
 concerns for blg warning panel

---
 .../gui/integrity/BibLogSettingsPane.fxml     |  4 --
 .../gui/integrity/BibLogSettingsPane.java     | 40 +++++++----
 .../integrity/BibLogSettingsViewModel.java    | 71 +++++++++++--------
 .../gui/integrity/IntegrityCheckAction.java   |  5 --
 .../gui/integrity/IntegrityCheckDialog.java   | 65 ++++++++---------
 .../logic/biblog/BibLogPathResolver.java      | 12 +++-
 ...BibWarningToIntegrityMessageConverter.java | 10 +--
 .../jabref/logic/biblog/BibtexLogParser.java  | 10 ++-
 .../logic/importer/util/MetaDataParser.java   |  3 +-
 .../jabref/logic/util/StandardFileType.java   |  2 +
 .../logic/biblog/BibLogPathResolverTest.java  | 10 +--
 .../logic/biblog/BibtexLogParserTest.java     |  1 -
 12 files changed, 120 insertions(+), 113 deletions(-)

diff --git a/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.fxml b/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.fxml
index 4f15d903e51..4bce3f09411 100644
--- a/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.fxml
+++ b/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.fxml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
diff --git a/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java b/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
index 00cf8e3a958..2278fcd1956 100644
--- a/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
+++ b/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
@@ -3,15 +3,19 @@
 import java.nio.file.Path;
 import java.util.Optional;
 
+import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.control.TextField;
-import javafx.stage.FileChooser;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.logic.integrity.IntegrityMessage;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
 
+import jakarta.inject.Inject;
+
 /**
  * Controller for the .blg file settings panel.
  *
@@ -22,14 +26,22 @@ public class BibLogSettingsPane {
     @FXML
     private TextField pathField;
     private BibLogSettingsViewModel viewModel;
-    private DialogService dialogService;
+    @Inject private DialogService dialogService;
     private Runnable onBlgPathChanged;
 
-    public void initialize(BibDatabaseContext context, DialogService dialogService, Runnable onBlgPathChanged) {
-        this.dialogService = dialogService;
+    public void initializeViewModel(BibDatabaseContext context, Runnable onBlgPathChanged) {
         this.onBlgPathChanged = onBlgPathChanged;
         this.viewModel = new BibLogSettingsViewModel(context.getMetaData(), context.getDatabasePath());
         pathField.textProperty().bindBidirectional(viewModel.pathProperty());
+        viewModel.getBlgWarnings(context);
+    }
+
+    public ObservableList<IntegrityMessage> getBlgWarnings() {
+        return viewModel.getBlgWarningsObservable();
+    }
+
+    public void refreshWarnings(BibDatabaseContext context) {
+        viewModel.getBlgWarnings(context);
     }
 
     @FXML
@@ -47,21 +59,21 @@ private void onReset() {
         notifyPathChanged();
     }
 
+    private void notifyPathChanged() {
+        Optional.ofNullable(onBlgPathChanged).ifPresent(Runnable::run);
+    }
+
     public BibLogSettingsViewModel getViewModel() {
         return viewModel;
     }
 
     private FileDialogConfiguration createBlgFileDialogConfig() {
-        FileDialogConfiguration.Builder configBuilder = new FileDialogConfiguration.Builder();
         Path initialDir = viewModel.getInitialDirectory();
-        configBuilder.withInitialDirectory(initialDir);
-        configBuilder.addExtensionFilter(
-                new FileChooser.ExtensionFilter(Localization.lang("BibTeX log files"), "*.blg")
-        );
-        return configBuilder.build();
-    }
-
-    private void notifyPathChanged() {
-        Optional.ofNullable(onBlgPathChanged).ifPresent(Runnable::run);
+        FileDialogConfiguration config = new FileDialogConfiguration.Builder()
+                .addExtensionFilter(Localization.lang("BibTeX log files"), StandardFileType.BLG)
+                .withDefaultExtension(Localization.lang("BibTeX log files"), StandardFileType.BLG)
+                .withInitialDirectory(viewModel.getInitialDirectory())
+                .build();
+        return config;
     }
 }
diff --git a/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java b/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
index b62676268eb..0706d26cf02 100644
--- a/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
+++ b/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
@@ -8,7 +8,10 @@
 
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 
+import org.jabref.gui.AbstractViewModel;
 import org.jabref.logic.biblog.BibLogPathResolver;
 import org.jabref.logic.biblog.BibWarningToIntegrityMessageConverter;
 import org.jabref.logic.biblog.BibtexLogParser;
@@ -25,12 +28,13 @@
  * 2. Wraps .blg warnings as IntegrityMessages.
  * 3. Supports file browsing and reset actions.
  */
-public class BibLogSettingsViewModel {
+public class BibLogSettingsViewModel extends AbstractViewModel {
     private static final Logger LOGGER = LoggerFactory.getLogger(BibLogSettingsViewModel.class);
+    private final ObservableList<IntegrityMessage> blgWarnings = FXCollections.observableArrayList();
+    private final StringProperty path = new SimpleStringProperty("");
     private final MetaData metaData;
     private final Optional<Path> bibPath;
     private final String user;
-    private final StringProperty path = new SimpleStringProperty("");
     private Optional<Path> lastResolvedBlgPath = Optional.empty();
 
     public BibLogSettingsViewModel(MetaData metaData, Optional<Path> bibPath) {
@@ -48,6 +52,40 @@ public BibLogSettingsViewModel(MetaData metaData, Optional<Path> bibPath) {
         });
     }
 
+    /**
+     * Parses the .blg file (if it exists) into the observable list.
+     *
+     * @param databaseContext the current database context used to resolve citation keys in warnings.
+     */
+    public void getBlgWarnings(BibDatabaseContext databaseContext) {
+        Optional<Path> resolved = getResolvedBlgPath();
+        if (resolved.isEmpty()) {
+            blgWarnings.clear();
+            return;
+        }
+
+        Path path = resolved.get();
+
+        this.lastResolvedBlgPath = Optional.of(path);
+        try {
+            BibtexLogParser parser = new BibtexLogParser();
+            List<BibWarning> warnings = parser.parseBiblog(path);
+            List<IntegrityMessage> newWarnings = BibWarningToIntegrityMessageConverter.convert(warnings, databaseContext);
+            if (newWarnings.isEmpty()) {
+                LOGGER.debug("No blg warning matched the current database.");
+            }
+            blgWarnings.setAll(newWarnings);
+        } catch (IOException e) {
+            LOGGER.warn("Failed to parse .blg file", e);
+            blgWarnings.clear();
+            throw new RuntimeException("Failed to parse .blg file", e);
+        }
+    }
+
+    public ObservableList<IntegrityMessage> getBlgWarningsObservable() {
+        return blgWarnings;
+    }
+
     public StringProperty pathProperty() {
         return path;
     }
@@ -77,35 +115,6 @@ public Optional<Path> getResolvedBlgPath() {
                                  .filter(Files::exists);
     }
 
-    public Optional<Path> getLastResolvedBlgPath() {
-        return lastResolvedBlgPath;
-    }
-
-    /**
-     * Parses the .blg file (if it exists) into integrity messages.
-     * Returns an empty list if the file doesn't exist or can't be read.
-     *
-     * @param databaseContext the current database context used to resolve citation keys in warnings.
-     * @return a list of {@link IntegrityMessage}s parsed from the .blg file, or an empty list if unavailable.
-     */
-    public List<IntegrityMessage> getBlgWarnings(BibDatabaseContext databaseContext) {
-        Optional<Path> resolved = getResolvedBlgPath();
-        if (resolved.isEmpty()) {
-            return List.of();
-        }
-
-        Path path = resolved.get();
-        this.lastResolvedBlgPath = Optional.of(path);
-        try {
-            BibtexLogParser parser = new BibtexLogParser();
-            List<BibWarning> warnings = parser.parseBiblog(path);
-            return BibWarningToIntegrityMessageConverter.convert(warnings, databaseContext);
-        } catch (IOException e) {
-            LOGGER.warn("Failed to parse .blg file", e);
-            return List.of();
-        }
-    }
-
     public Path getInitialDirectory() {
         return bibPath.flatMap(path -> Optional.ofNullable(path.getParent()))
                       .orElse(Path.of(System.getProperty("user.home")));
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
index f44f8309658..e5c0e048a0e 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
@@ -74,11 +74,6 @@ protected List<IntegrityMessage> call() {
         };
         task.setOnSucceeded(value -> {
             List<IntegrityMessage> messages = task.getValue();
-            // After the main check: Load .blg warnings using BibLogSettingsViewModel
-            BibLogSettingsViewModel viewModel = new BibLogSettingsViewModel(
-                    database.getMetaData(),
-                    database.getDatabasePath()
-            );
             if (messages.isEmpty()) {
                 dialogService.notify(Localization.lang("No problems found."));
             } else {
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
index 2095d22fd58..fab17e6eb13 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -1,15 +1,11 @@
 package org.jabref.gui.integrity;
 
-import java.io.IOException;
-import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import java.util.function.Function;
 
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
 import javafx.scene.Node;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuButton;
@@ -30,6 +26,7 @@
 import org.jabref.logic.l10n.Localization;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import com.airhacks.afterburner.views.ViewLoaderResult;
 import jakarta.inject.Inject;
 import org.controlsfx.control.table.TableFilter;
 import org.slf4j.Logger;
@@ -145,24 +142,24 @@ public void clearFilters() {
      */
     private void loadBibLogSettingsPane() {
         try {
-            FXMLLoader loader = new FXMLLoader();
-            try (var fxmlStream = getClass().getResourceAsStream("BibLogSettingsPane.fxml")) {
-                if (fxmlStream == null) {
-                    LOGGER.error("Could not find BibLogSettingsPane.fxml");
-                    return;
-                }
-
-                Node settingsNode = loader.load(fxmlStream);
-                bibLogSettingsPane = loader.getController();
-                bibLogSettingsPane.initialize(
-                        libraryTab.getBibDatabaseContext(),
-                        dialogService,
-                        this::reloadBlgWarnings
-                );
-                dialogVBox.getChildren().add(1, settingsNode);
-                reloadBlgWarnings();
+            ViewLoaderResult result = ViewLoader.view(BibLogSettingsPane.class).load();
+
+            Node settingsNode = result.getView();
+            bibLogSettingsPane = (BibLogSettingsPane) result.getController();
+
+            if (bibLogSettingsPane == null) {
+                LOGGER.error("Failed to get controller from ViewLoader");
+                return;
             }
-        } catch (IOException e) {
+            bibLogSettingsPane.initializeViewModel(
+                    libraryTab.getBibDatabaseContext(),
+                    this::reloadBlgWarnings
+            );
+            dialogVBox.getChildren().add(1, settingsNode);
+            reloadBlgWarnings();
+        } catch (IllegalStateException e) {
+            LOGGER.error("Failed to load BibLogSettingsPane due to invalid state", e);
+        } catch (RuntimeException e) {
             LOGGER.error("Failed to load BibLogSettingsPane", e);
         }
     }
@@ -172,30 +169,24 @@ private void loadBibLogSettingsPane() {
      * (1) Dialog initialization (default load)
      * (2) User triggers Browse or Reset in BibLogSettingsPane
      *
-     * Steps:
-     * 1. Get the resolved .blg path and check if it has changed.
-     * 2. Fetch new .blg warnings from ViewModel.
-     * 3. Replace old warnings and update the table.
+     * This reloads .blg warnings and merges them into the main message list.
      */
     private void reloadBlgWarnings() {
-        Optional<Path> resolvedBlgPath = bibLogSettingsPane.getViewModel().getResolvedBlgPath();
-        if (resolvedBlgPath.isEmpty()) {
-            return;
-        }
+        bibLogSettingsPane.refreshWarnings(libraryTab.getBibDatabaseContext());
 
-        Path newBlgPath = resolvedBlgPath.get();
-        Optional<Path> lastPath = bibLogSettingsPane.getViewModel().getLastResolvedBlgPath();
-        if (lastPath.isPresent() && newBlgPath.equals(lastPath)) {
-            return;
+        List<IntegrityMessage> newWarnings = new ArrayList<>(bibLogSettingsPane.getBlgWarnings());
+
+        if (!newWarnings.isEmpty()) {
+            LOGGER.debug("Loaded {} .blg warnings", newWarnings.size());
+        } else {
+            dialogService.notify(Localization.lang("No warnings found. Please check if the .blg file matches the current library."));
         }
 
-        List<IntegrityMessage> newWarnings = bibLogSettingsPane.getViewModel().getBlgWarnings(libraryTab.getBibDatabaseContext());
         messages.removeAll(blgWarnings);
         blgWarnings.clear();
         blgWarnings.addAll(newWarnings);
-        messages.addAll(blgWarnings);
+        messages.addAll(newWarnings);
 
-        viewModel = new IntegrityCheckDialogViewModel(messages);
-        messagesTable.setItems(viewModel.getMessages());
+        viewModel.getMessages().setAll(messages);
     }
 }
diff --git a/src/main/java/org/jabref/logic/biblog/BibLogPathResolver.java b/src/main/java/org/jabref/logic/biblog/BibLogPathResolver.java
index 42cc5892eed..0f9c56c3cc6 100644
--- a/src/main/java/org/jabref/logic/biblog/BibLogPathResolver.java
+++ b/src/main/java/org/jabref/logic/biblog/BibLogPathResolver.java
@@ -19,6 +19,10 @@ public class BibLogPathResolver {
      * Resolves .blg path using current user context.
      */
     public static Optional<Path> resolve(BibDatabaseContext context) {
+        if (context == null) {
+            return Optional.empty();
+        }
+
         String user = System.getProperty("user.name");
         return resolve(context.getMetaData(), context.getDatabasePath(), user);
     }
@@ -27,12 +31,16 @@ public static Optional<Path> resolve(BibDatabaseContext context) {
      * Test-friendly API (allows direct input of MetaData and Path)
      */
     public static Optional<Path> resolve(MetaData metaData, Optional<Path> databasePath, String user) {
+        if (metaData == null || user == null) {
+            return Optional.empty();
+        }
+
         Optional<Path> userDefined = metaData.getBlgFilePath(user);
-        if (userDefined.isPresent()) {
+        if (userDefined.isPresent() && userDefined != null) {
             return userDefined;
         }
 
-        if (databasePath.isEmpty()) {
+        if (databasePath == null || databasePath.isEmpty()) {
             return Optional.empty();
         }
 
diff --git a/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java b/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
index e8e02390d57..069c516c4f8 100644
--- a/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
+++ b/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
@@ -11,6 +11,8 @@
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.InternalField;
 
+import org.jspecify.annotations.NonNull;
+
 /**
  * Converts {@link BibWarning}s into {@link IntegrityMessage}s for integration with the existing integrity check UI.
  *
@@ -25,11 +27,9 @@
  *   to support warnings without fields cleanly.
  */
 public class BibWarningToIntegrityMessageConverter {
-    public static List<IntegrityMessage> convert(List<BibWarning> bibWarnings, BibDatabaseContext context) {
-        if (bibWarnings == null || context == null) {
-            return List.of();
-        }
-
+    public static @NonNull List<IntegrityMessage> convert(
+            @NonNull List<BibWarning> bibWarnings,
+            @NonNull BibDatabaseContext context) {
         if (bibWarnings.isEmpty()) {
             return List.of();
         }
diff --git a/src/main/java/org/jabref/logic/biblog/BibtexLogParser.java b/src/main/java/org/jabref/logic/biblog/BibtexLogParser.java
index 0cc6d279ea7..a362570fcd0 100644
--- a/src/main/java/org/jabref/logic/biblog/BibtexLogParser.java
+++ b/src/main/java/org/jabref/logic/biblog/BibtexLogParser.java
@@ -12,13 +12,16 @@
 import org.jabref.model.biblog.BibWarning;
 import org.jabref.model.biblog.SeverityType;
 
+import org.jspecify.annotations.NonNull;
+
 /**
  * Parses the contents of a .blg (BibTeX log) file to extract warning messages.
  */
 public class BibtexLogParser {
     private static final Pattern WARNING_PATTERN = Pattern.compile("^Warning--(?<message>[a-zA-Z ]+) in (?<entryKey>[^\\s]+)$");
+    private static final String EMPTY_FIELD_PREFIX = "empty";
 
-    public List<BibWarning> parseBiblog(Path blgFilePath) throws IOException {
+    public List<BibWarning> parseBiblog(@NonNull Path blgFilePath) throws IOException {
         List<BibWarning> warnings = new ArrayList<>();
         List<String> lines = Files.readAllLines(blgFilePath);
         for (String line : lines) {
@@ -49,9 +52,10 @@ private Optional<BibWarning> parseWarningLine(String line) {
 
         String message = matcher.group("message").trim();
         String entryKey = matcher.group("entryKey");
+        // Extract field name for warnings related to empty fields  (e.g., "empty journal" -> fieldName = "journal")
         String fieldName = null;
-        if (message.startsWith("empty")) {
-            fieldName = message.substring("empty".length()).trim();
+        if (message.startsWith(EMPTY_FIELD_PREFIX)) {
+            fieldName = message.substring(EMPTY_FIELD_PREFIX.length()).trim();
         }
 
         return Optional.of(new BibWarning(
diff --git a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
index c4d5cd0c1ef..0d7f6be6c22 100644
--- a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
@@ -280,7 +280,7 @@ private void handleBlgFilePathEntry(Map.Entry<String, String> entry, MetaData me
         try {
             values = getAsList(entry.getValue());
         } catch (ParseException e) {
-            LOGGER.error("Invalid .blg metadata format for user {}: {}", user, entry.getValue(), e);
+            LOGGER.error("Invalid .blg metadata format for user {}", user, e);
             return;
         }
         if (values.size() != 1) {
@@ -293,7 +293,6 @@ private void handleBlgFilePathEntry(Map.Entry<String, String> entry, MetaData me
             metaData.setBlgFilePath(user, path);
         } catch (Exception e) {
             LOGGER.error("Invalid .blg file path for user {}: {}", user, pathStr, e);
-            return;
         }
     }
 }
diff --git a/src/main/java/org/jabref/logic/util/StandardFileType.java b/src/main/java/org/jabref/logic/util/StandardFileType.java
index e6ccc825486..17a19dfc819 100644
--- a/src/main/java/org/jabref/logic/util/StandardFileType.java
+++ b/src/main/java/org/jabref/logic/util/StandardFileType.java
@@ -15,6 +15,8 @@ public enum StandardFileType implements FileType {
     AUX("Aux file", "aux"),
     BIBTEX_DB("Bibtex library", "bib"),
     BST("BibTeX-Style file", "bst"),
+    BLG("BibTeX log file", "blg"),
+
     CER("SSL Certificate", "cer"),
     CFF("CFF", "cff"),
     CITATION_STYLE("Citation Style", "csl"),
diff --git a/src/test/java/org/jabref/logic/biblog/BibLogPathResolverTest.java b/src/test/java/org/jabref/logic/biblog/BibLogPathResolverTest.java
index f25ab4983f7..7db753c21c1 100644
--- a/src/test/java/org/jabref/logic/biblog/BibLogPathResolverTest.java
+++ b/src/test/java/org/jabref/logic/biblog/BibLogPathResolverTest.java
@@ -11,9 +11,7 @@
 
 public class BibLogPathResolverTest {
     private static final String TEST_USER = "testUser";
-    /**
-     * Returns the user-defined .blg path if it's set.
-     */
+
     @Test
     void returnsUserDefinedBlgPathIfPresent() {
         MetaData metaData = new MetaData();
@@ -25,9 +23,6 @@ void returnsUserDefinedBlgPathIfPresent() {
         assertEquals(Optional.of(userBlgPath), result);
     }
 
-    /**
-     * Falls back to default .blg path (same name as .bib) if no user-defined path is set.
-     */
     @Test
     void returnsDefaultBlgPathWhenUserPathIsAbsent() {
         MetaData metaData = new MetaData(); // no blg path set
@@ -38,9 +33,6 @@ void returnsDefaultBlgPathWhenUserPathIsAbsent() {
         assertEquals(Optional.of(Path.of("/home/user/MyLibrary.blg")), result);
     }
 
-    /**
-     * Returns empty if neither user-defined path nor .bib path is available.
-     */
     @Test
     void returnsEmptyWhenNoUserPathAndNoBibPath() {
         MetaData metaData = new MetaData();
diff --git a/src/test/java/org/jabref/logic/biblog/BibtexLogParserTest.java b/src/test/java/org/jabref/logic/biblog/BibtexLogParserTest.java
index e1bc90d1fa1..57e72bfdd95 100644
--- a/src/test/java/org/jabref/logic/biblog/BibtexLogParserTest.java
+++ b/src/test/java/org/jabref/logic/biblog/BibtexLogParserTest.java
@@ -23,7 +23,6 @@ void setup() {
     void parsesWarningsFromResourceFileTest() throws Exception {
         Path blgFile = Path.of("src/test/resources/org/jabref/logic/blg/Chocolate.blg");
         List<BibWarning> warnings = parser.parseBiblog(blgFile);
-        assertEquals(4, warnings.size());
         assertEquals(List.of(
                 new BibWarning(SeverityType.WARNING, "empty journal", "journal", "Scholey_2013"),
                 new BibWarning(SeverityType.WARNING, "empty year", "year", "Scholey_2013"),

From 05d2cd38a8e699cf4e228d5c3f30c0ecdcb1b6fe Mon Sep 17 00:00:00 2001
From: Wanling Fu <wanlingfu3@gmail.com>
Date: Mon, 14 Apr 2025 23:39:24 +0100
Subject: [PATCH 12/17] Fix localization key + apply bot suggestions

---
 .../gui/integrity/BibLogSettingsPane.java     | 10 +++++---
 .../integrity/BibLogSettingsViewModel.java    | 11 +++++---
 .../gui/integrity/IntegrityCheckDialog.java   | 16 +++++++-----
 ...BibWarningToIntegrityMessageConverter.java | 25 +++++++++++--------
 .../logic/importer/util/MetaDataParser.java   |  7 ++++--
 src/main/resources/l10n/JabRef_en.properties  |  1 +
 .../logic/biblog/BibLogPathResolverTest.java  |  2 +-
 .../logic/util/StandardFileTypeTest.java      | 21 ++++++++++++++++
 8 files changed, 67 insertions(+), 26 deletions(-)
 create mode 100644 src/test/java/org/jabref/logic/util/StandardFileTypeTest.java

diff --git a/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java b/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
index 2278fcd1956..94a9662b029 100644
--- a/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
+++ b/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.integrity;
 
 import java.nio.file.Path;
-import java.util.Optional;
 
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
@@ -9,6 +8,7 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.logic.JabRefException;
 import org.jabref.logic.integrity.IntegrityMessage;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.StandardFileType;
@@ -29,7 +29,7 @@ public class BibLogSettingsPane {
     @Inject private DialogService dialogService;
     private Runnable onBlgPathChanged;
 
-    public void initializeViewModel(BibDatabaseContext context, Runnable onBlgPathChanged) {
+    public void initializeViewModel(BibDatabaseContext context, Runnable onBlgPathChanged) throws JabRefException {
         this.onBlgPathChanged = onBlgPathChanged;
         this.viewModel = new BibLogSettingsViewModel(context.getMetaData(), context.getDatabasePath());
         pathField.textProperty().bindBidirectional(viewModel.pathProperty());
@@ -40,7 +40,7 @@ public ObservableList<IntegrityMessage> getBlgWarnings() {
         return viewModel.getBlgWarningsObservable();
     }
 
-    public void refreshWarnings(BibDatabaseContext context) {
+    public void refreshWarnings(BibDatabaseContext context) throws JabRefException {
         viewModel.getBlgWarnings(context);
     }
 
@@ -60,7 +60,9 @@ private void onReset() {
     }
 
     private void notifyPathChanged() {
-        Optional.ofNullable(onBlgPathChanged).ifPresent(Runnable::run);
+        if (onBlgPathChanged != null) {
+            onBlgPathChanged.run();
+        }
     }
 
     public BibLogSettingsViewModel getViewModel() {
diff --git a/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java b/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
index 0706d26cf02..9890dc5fdbe 100644
--- a/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
+++ b/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
@@ -12,10 +12,12 @@
 import javafx.collections.ObservableList;
 
 import org.jabref.gui.AbstractViewModel;
+import org.jabref.logic.JabRefException;
 import org.jabref.logic.biblog.BibLogPathResolver;
 import org.jabref.logic.biblog.BibWarningToIntegrityMessageConverter;
 import org.jabref.logic.biblog.BibtexLogParser;
 import org.jabref.logic.integrity.IntegrityMessage;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.model.biblog.BibWarning;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.metadata.MetaData;
@@ -57,7 +59,7 @@ public BibLogSettingsViewModel(MetaData metaData, Optional<Path> bibPath) {
      *
      * @param databaseContext the current database context used to resolve citation keys in warnings.
      */
-    public void getBlgWarnings(BibDatabaseContext databaseContext) {
+    public void getBlgWarnings(BibDatabaseContext databaseContext) throws JabRefException {
         Optional<Path> resolved = getResolvedBlgPath();
         if (resolved.isEmpty()) {
             blgWarnings.clear();
@@ -76,9 +78,12 @@ public void getBlgWarnings(BibDatabaseContext databaseContext) {
             }
             blgWarnings.setAll(newWarnings);
         } catch (IOException e) {
-            LOGGER.warn("Failed to parse .blg file", e);
             blgWarnings.clear();
-            throw new RuntimeException("Failed to parse .blg file", e);
+            throw new JabRefException(
+                    "Failed to parse .blg file",
+                    Localization.lang("Could not read BibTeX log file. Please check the file path and try again."),
+                    e
+            );
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
index fab17e6eb13..f5573a144fc 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -22,6 +22,7 @@
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ValueTableCellFactory;
 import org.jabref.gui.util.ViewModelTableRowFactory;
+import org.jabref.logic.JabRefException;
 import org.jabref.logic.integrity.IntegrityMessage;
 import org.jabref.logic.l10n.Localization;
 
@@ -157,10 +158,9 @@ private void loadBibLogSettingsPane() {
             );
             dialogVBox.getChildren().add(1, settingsNode);
             reloadBlgWarnings();
-        } catch (IllegalStateException e) {
-            LOGGER.error("Failed to load BibLogSettingsPane due to invalid state", e);
-        } catch (RuntimeException e) {
-            LOGGER.error("Failed to load BibLogSettingsPane", e);
+        } catch (JabRefException e) {
+            dialogService.notify(e.getLocalizedMessage());
+            LOGGER.error("Failed to initialize BibLogSettingsPane", e);
         }
     }
 
@@ -172,8 +172,12 @@ private void loadBibLogSettingsPane() {
      * This reloads .blg warnings and merges them into the main message list.
      */
     private void reloadBlgWarnings() {
-        bibLogSettingsPane.refreshWarnings(libraryTab.getBibDatabaseContext());
-
+        try {
+            bibLogSettingsPane.refreshWarnings(libraryTab.getBibDatabaseContext());
+        } catch (JabRefException e) {
+            dialogService.notify(e.getLocalizedMessage());
+            LOGGER.warn("Failed to load .blg warnings", e);
+        }
         List<IntegrityMessage> newWarnings = new ArrayList<>(bibLogSettingsPane.getBlgWarnings());
 
         if (!newWarnings.isEmpty()) {
diff --git a/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java b/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
index 069c516c4f8..b4e115b65d3 100644
--- a/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
+++ b/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
@@ -36,16 +36,21 @@ public class BibWarningToIntegrityMessageConverter {
 
         List<IntegrityMessage> messages = new ArrayList<>();
         for (BibWarning bibWarning : bibWarnings) {
-            context.getDatabase().getEntryByCitationKey(bibWarning.entryKey()).ifPresent(entry -> {
-                Field field = bibWarning.getFieldName()
-                        .map(FieldFactory::parseField)
-                        .orElse(InternalField.KEY_FIELD);
-                IntegrityMessage message = new IntegrityMessage(
-                        bibWarning.message(),
-                        entry,
-                        field);
-                messages.add(message);
-            });
+            if (!context.getDatabase().getEntryByCitationKey(bibWarning.entryKey()).isPresent()) {
+                continue;
+            }
+
+            BibEntry entry = context.getDatabase().getEntryByCitationKey(bibWarning.entryKey()).get();
+
+            Field field = bibWarning.getFieldName()
+                                    .map(FieldFactory::parseField)
+                                    .orElse(InternalField.KEY_FIELD);
+
+            IntegrityMessage message = new IntegrityMessage(
+                    bibWarning.message(),
+                    entry,
+                    field);
+            messages.add(message);
         }
         return messages;
     }
diff --git a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
index 0d7f6be6c22..7407a8be8c9 100644
--- a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
+import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -291,8 +292,10 @@ private void handleBlgFilePathEntry(Map.Entry<String, String> entry, MetaData me
         try {
             Path path = Path.of(pathStr);
             metaData.setBlgFilePath(user, path);
-        } catch (Exception e) {
-            LOGGER.error("Invalid .blg file path for user {}: {}", user, pathStr, e);
+        } catch (InvalidPathException e) {
+            LOGGER.error("Invalid .blg file path for user '{}': '{}'", user, pathStr, e);
+        } catch (IllegalArgumentException e) {
+            LOGGER.error("Illegal argument in .blg file path '{}' for user '{}': {}", pathStr, user, e.getMessage(), e);
         }
     }
 }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index d16d68a2ca6..d8e40e1e911 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1036,6 +1036,7 @@ Check\ integrity=Check integrity
 Checking\ integrity...=Checking integrity...
 Waiting\ for\ the\ check\ to\ finish...=Waiting for the check to finish...
 BibTeX\ log\ files=BibTeX log files
+No\ warnings\ found.\ Please\ check\ if\ the\ .blg\ file\ matches\ the\ current\ library.=No warnings found. Please check if the .blg file matches the current library.
 
 Field\ Presence\ Consistency\ Check\ Result=Field Presence Consistency Check Result
 required\ field\ is\ present=required field is present
diff --git a/src/test/java/org/jabref/logic/biblog/BibLogPathResolverTest.java b/src/test/java/org/jabref/logic/biblog/BibLogPathResolverTest.java
index 7db753c21c1..640320f4bb9 100644
--- a/src/test/java/org/jabref/logic/biblog/BibLogPathResolverTest.java
+++ b/src/test/java/org/jabref/logic/biblog/BibLogPathResolverTest.java
@@ -25,7 +25,7 @@ void returnsUserDefinedBlgPathIfPresent() {
 
     @Test
     void returnsDefaultBlgPathWhenUserPathIsAbsent() {
-        MetaData metaData = new MetaData(); // no blg path set
+        MetaData metaData = new MetaData();
 
         Path bibPath = Path.of("/home/user/MyLibrary.bib");
         Optional<Path> result = BibLogPathResolver.resolve(metaData, Optional.of(bibPath), TEST_USER);
diff --git a/src/test/java/org/jabref/logic/util/StandardFileTypeTest.java b/src/test/java/org/jabref/logic/util/StandardFileTypeTest.java
new file mode 100644
index 00000000000..85f849e33d4
--- /dev/null
+++ b/src/test/java/org/jabref/logic/util/StandardFileTypeTest.java
@@ -0,0 +1,21 @@
+package org.jabref.logic.util;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class StandardFileTypeTest {
+    @Test
+    void testRecognizeBlgFileType() {
+        FileType detected = StandardFileType.fromExtensions("blg");
+        assertEquals(StandardFileType.BLG, detected);
+    }
+
+    @Test
+    void testBlgFileTypeProperties() {
+        assertEquals("BibTeX log file", StandardFileType.BLG.getName());
+        assertEquals(List.of("blg"), StandardFileType.BLG.getExtensions());
+    }
+}

From f21199c211e9baa424be3807eaa71f7859fb14c5 Mon Sep 17 00:00:00 2001
From: Wanling Fu <wanlingfu3@gmail.com>
Date: Tue, 15 Apr 2025 11:11:54 +0100
Subject: [PATCH 13/17] Apply bot suggestions on fast-fail, fix Rewrite and
 test failures

---
 .../java/org/jabref/gui/integrity/BibLogSettingsPane.java | 8 ++++++++
 .../org/jabref/gui/integrity/BibLogSettingsViewModel.java | 1 +
 .../org/jabref/gui/integrity/IntegrityCheckDialog.java    | 4 +---
 .../biblog/BibWarningToIntegrityMessageConverter.java     | 2 +-
 .../org/jabref/logic/importer/util/MetaDataParser.java    | 2 +-
 src/main/resources/l10n/JabRef_en.properties              | 1 +
 .../java/org/jabref/logic/util/StandardFileTypeTest.java  | 4 ++--
 7 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java b/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
index 94a9662b029..3ac52a6be61 100644
--- a/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
+++ b/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
@@ -15,6 +15,8 @@
 import org.jabref.model.database.BibDatabaseContext;
 
 import jakarta.inject.Inject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Controller for the .blg file settings panel.
@@ -23,6 +25,7 @@
  * and handles browse/reset button actions.
  */
 public class BibLogSettingsPane {
+    private static final Logger LOGGER = LoggerFactory.getLogger(BibLogSettingsPane.class);
     @FXML
     private TextField pathField;
     private BibLogSettingsViewModel viewModel;
@@ -30,6 +33,11 @@ public class BibLogSettingsPane {
     private Runnable onBlgPathChanged;
 
     public void initializeViewModel(BibDatabaseContext context, Runnable onBlgPathChanged) throws JabRefException {
+        if (context == null || context.getMetaData() == null) {
+            LOGGER.warn("BibLogSettingsPane initialized with null BibDatabaseContext or MetaData");
+            return;
+        }
+
         this.onBlgPathChanged = onBlgPathChanged;
         this.viewModel = new BibLogSettingsViewModel(context.getMetaData(), context.getDatabasePath());
         pathField.textProperty().bindBidirectional(viewModel.pathProperty());
diff --git a/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java b/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
index 9890dc5fdbe..003d3898a3e 100644
--- a/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
+++ b/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
@@ -58,6 +58,7 @@ public BibLogSettingsViewModel(MetaData metaData, Optional<Path> bibPath) {
      * Parses the .blg file (if it exists) into the observable list.
      *
      * @param databaseContext the current database context used to resolve citation keys in warnings.
+     * @throws JabRefException if the .blg file cannot be parsed or read
      */
     public void getBlgWarnings(BibDatabaseContext databaseContext) throws JabRefException {
         Optional<Path> resolved = getResolvedBlgPath();
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
index f5573a144fc..7c15d795404 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -180,9 +180,7 @@ private void reloadBlgWarnings() {
         }
         List<IntegrityMessage> newWarnings = new ArrayList<>(bibLogSettingsPane.getBlgWarnings());
 
-        if (!newWarnings.isEmpty()) {
-            LOGGER.debug("Loaded {} .blg warnings", newWarnings.size());
-        } else {
+        if (newWarnings.isEmpty()) {
             dialogService.notify(Localization.lang("No warnings found. Please check if the .blg file matches the current library."));
         }
 
diff --git a/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java b/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
index b4e115b65d3..e25a664335e 100644
--- a/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
+++ b/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
@@ -36,7 +36,7 @@ public class BibWarningToIntegrityMessageConverter {
 
         List<IntegrityMessage> messages = new ArrayList<>();
         for (BibWarning bibWarning : bibWarnings) {
-            if (!context.getDatabase().getEntryByCitationKey(bibWarning.entryKey()).isPresent()) {
+            if (context.getDatabase().getEntryByCitationKey(bibWarning.entryKey()).isEmpty()) {
                 continue;
             }
 
diff --git a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
index 7407a8be8c9..918e8e6b5c5 100644
--- a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
@@ -295,7 +295,7 @@ private void handleBlgFilePathEntry(Map.Entry<String, String> entry, MetaData me
         } catch (InvalidPathException e) {
             LOGGER.error("Invalid .blg file path for user '{}': '{}'", user, pathStr, e);
         } catch (IllegalArgumentException e) {
-            LOGGER.error("Illegal argument in .blg file path '{}' for user '{}': {}", pathStr, user, e.getMessage(), e);
+            LOGGER.error("Illegal argument in .blg file path '{}' for user '{}'", pathStr, user, e);
         }
     }
 }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index d8e40e1e911..393e26f8a9c 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1037,6 +1037,7 @@ Checking\ integrity...=Checking integrity...
 Waiting\ for\ the\ check\ to\ finish...=Waiting for the check to finish...
 BibTeX\ log\ files=BibTeX log files
 No\ warnings\ found.\ Please\ check\ if\ the\ .blg\ file\ matches\ the\ current\ library.=No warnings found. Please check if the .blg file matches the current library.
+Could\ not\ read\ BibTeX\ log\ file.\ Please\ check\ the\ file\ path\ and\ try\ again.=Could not read BibTeX log file. Please check the file path and try again.
 
 Field\ Presence\ Consistency\ Check\ Result=Field Presence Consistency Check Result
 required\ field\ is\ present=required field is present
diff --git a/src/test/java/org/jabref/logic/util/StandardFileTypeTest.java b/src/test/java/org/jabref/logic/util/StandardFileTypeTest.java
index 85f849e33d4..c9dea652af2 100644
--- a/src/test/java/org/jabref/logic/util/StandardFileTypeTest.java
+++ b/src/test/java/org/jabref/logic/util/StandardFileTypeTest.java
@@ -8,13 +8,13 @@
 
 public class StandardFileTypeTest {
     @Test
-    void testRecognizeBlgFileType() {
+    void recognizeBlgFileType() {
         FileType detected = StandardFileType.fromExtensions("blg");
         assertEquals(StandardFileType.BLG, detected);
     }
 
     @Test
-    void testBlgFileTypeProperties() {
+    void blgFileTypeProperties() {
         assertEquals("BibTeX log file", StandardFileType.BLG.getName());
         assertEquals(List.of("blg"), StandardFileType.BLG.getExtensions());
     }

From cf93fc13a4faec36fd007c869403a3a9f38aa4e4 Mon Sep 17 00:00:00 2001
From: Wanling Fu <wanlingfu3@gmail.com>
Date: Tue, 15 Apr 2025 11:47:16 +0100
Subject: [PATCH 14/17] Remove star imports

---
 .../java/org/jabref/gui/integrity/BibLogSettingsPane.fxml  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.fxml b/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.fxml
index 4bce3f09411..5b9355a5730 100644
--- a/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.fxml
+++ b/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.fxml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.HBox?>
 
 <HBox xmlns="http://javafx.com/javafx"
       xmlns:fx="http://javafx.com/fxml"

From a75431b9b2ad319cd2a1b32a95e1d5ab5a4dc8fc Mon Sep 17 00:00:00 2001
From: Wanling Fu <wanlingfu3@gmail.com>
Date: Thu, 17 Apr 2025 23:39:42 +0100
Subject: [PATCH 15/17] Remove unnecessary @NonNull annotations and fix
 misleading UI warning logic

---
 .../jabref/gui/integrity/BibLogSettingsPane.java  |  9 ++++-----
 .../gui/integrity/BibLogSettingsViewModel.java    | 15 ++++++++++-----
 .../gui/integrity/IntegrityCheckDialog.java       |  2 +-
 .../BibWarningToIntegrityMessageConverter.java    |  8 +++-----
 .../org/jabref/logic/biblog/BibtexLogParser.java  |  2 ++
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java b/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
index 3ac52a6be61..096e5633884 100644
--- a/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
+++ b/src/main/java/org/jabref/gui/integrity/BibLogSettingsPane.java
@@ -33,11 +33,6 @@ public class BibLogSettingsPane {
     private Runnable onBlgPathChanged;
 
     public void initializeViewModel(BibDatabaseContext context, Runnable onBlgPathChanged) throws JabRefException {
-        if (context == null || context.getMetaData() == null) {
-            LOGGER.warn("BibLogSettingsPane initialized with null BibDatabaseContext or MetaData");
-            return;
-        }
-
         this.onBlgPathChanged = onBlgPathChanged;
         this.viewModel = new BibLogSettingsViewModel(context.getMetaData(), context.getDatabasePath());
         pathField.textProperty().bindBidirectional(viewModel.pathProperty());
@@ -86,4 +81,8 @@ private FileDialogConfiguration createBlgFileDialogConfig() {
                 .build();
         return config;
     }
+
+    public boolean wasBlgFileManuallySelected() {
+        return viewModel.wasBlgFileManuallySelected();
+    }
 }
diff --git a/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java b/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
index 003d3898a3e..c94bb57bfad 100644
--- a/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
+++ b/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
@@ -38,6 +38,7 @@ public class BibLogSettingsViewModel extends AbstractViewModel {
     private final Optional<Path> bibPath;
     private final String user;
     private Optional<Path> lastResolvedBlgPath = Optional.empty();
+    private boolean userManuallySelectedBlgFile = false;
 
     public BibLogSettingsViewModel(MetaData metaData, Optional<Path> bibPath) {
         this.metaData = metaData;
@@ -60,11 +61,11 @@ public BibLogSettingsViewModel(MetaData metaData, Optional<Path> bibPath) {
      * @param databaseContext the current database context used to resolve citation keys in warnings.
      * @throws JabRefException if the .blg file cannot be parsed or read
      */
-    public void getBlgWarnings(BibDatabaseContext databaseContext) throws JabRefException {
+    public Optional<List<IntegrityMessage>> getBlgWarnings(BibDatabaseContext databaseContext) throws JabRefException {
         Optional<Path> resolved = getResolvedBlgPath();
         if (resolved.isEmpty()) {
             blgWarnings.clear();
-            return;
+            return Optional.empty();
         }
 
         Path path = resolved.get();
@@ -74,10 +75,8 @@ public void getBlgWarnings(BibDatabaseContext databaseContext) throws JabRefExce
             BibtexLogParser parser = new BibtexLogParser();
             List<BibWarning> warnings = parser.parseBiblog(path);
             List<IntegrityMessage> newWarnings = BibWarningToIntegrityMessageConverter.convert(warnings, databaseContext);
-            if (newWarnings.isEmpty()) {
-                LOGGER.debug("No blg warning matched the current database.");
-            }
             blgWarnings.setAll(newWarnings);
+            return Optional.of(newWarnings);
         } catch (IOException e) {
             blgWarnings.clear();
             throw new JabRefException(
@@ -100,10 +99,12 @@ public void setBlgFilePath(Path path) {
         metaData.setBlgFilePath(user, path);
         this.path.set(path.toString());
         this.lastResolvedBlgPath = Optional.of(path);
+        this.userManuallySelectedBlgFile = true;
     }
 
     public void resetBlgFilePath() {
         metaData.clearBlgFilePath(user);
+        userManuallySelectedBlgFile = false;
         Optional<Path> resolved = BibLogPathResolver.resolve(metaData, bibPath, user);
         if (resolved.isEmpty()) {
             path.set("");
@@ -125,4 +126,8 @@ public Path getInitialDirectory() {
         return bibPath.flatMap(path -> Optional.ofNullable(path.getParent()))
                       .orElse(Path.of(System.getProperty("user.home")));
     }
+
+    public boolean wasBlgFileManuallySelected() {
+        return userManuallySelectedBlgFile;
+    }
 }
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
index 7c15d795404..ca78d71b062 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -180,7 +180,7 @@ private void reloadBlgWarnings() {
         }
         List<IntegrityMessage> newWarnings = new ArrayList<>(bibLogSettingsPane.getBlgWarnings());
 
-        if (newWarnings.isEmpty()) {
+        if (newWarnings.isEmpty() && bibLogSettingsPane.wasBlgFileManuallySelected()) {
             dialogService.notify(Localization.lang("No warnings found. Please check if the .blg file matches the current library."));
         }
 
diff --git a/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java b/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
index e25a664335e..2cd2dcd7b3b 100644
--- a/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
+++ b/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
@@ -11,8 +11,6 @@
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.InternalField;
 
-import org.jspecify.annotations.NonNull;
-
 /**
  * Converts {@link BibWarning}s into {@link IntegrityMessage}s for integration with the existing integrity check UI.
  *
@@ -27,9 +25,9 @@
  *   to support warnings without fields cleanly.
  */
 public class BibWarningToIntegrityMessageConverter {
-    public static @NonNull List<IntegrityMessage> convert(
-            @NonNull List<BibWarning> bibWarnings,
-            @NonNull BibDatabaseContext context) {
+    public static List<IntegrityMessage> convert(
+            List<BibWarning> bibWarnings,
+            BibDatabaseContext context) {
         if (bibWarnings.isEmpty()) {
             return List.of();
         }
diff --git a/src/main/java/org/jabref/logic/biblog/BibtexLogParser.java b/src/main/java/org/jabref/logic/biblog/BibtexLogParser.java
index a362570fcd0..be859a5c054 100644
--- a/src/main/java/org/jabref/logic/biblog/BibtexLogParser.java
+++ b/src/main/java/org/jabref/logic/biblog/BibtexLogParser.java
@@ -11,6 +11,7 @@
 
 import org.jabref.model.biblog.BibWarning;
 import org.jabref.model.biblog.SeverityType;
+import org.jabref.model.entry.field.FieldFactory;
 
 import org.jspecify.annotations.NonNull;
 
@@ -56,6 +57,7 @@ private Optional<BibWarning> parseWarningLine(String line) {
         String fieldName = null;
         if (message.startsWith(EMPTY_FIELD_PREFIX)) {
             fieldName = message.substring(EMPTY_FIELD_PREFIX.length()).trim();
+            fieldName = FieldFactory.parseField(fieldName).getName();
         }
 
         return Optional.of(new BibWarning(

From a629dbb38d5cf74f90c0411b00cc208d9bfe8ac2 Mon Sep 17 00:00:00 2001
From: Wanling Fu <wanlingfu3@gmail.com>
Date: Fri, 18 Apr 2025 10:57:45 +0100
Subject: [PATCH 16/17] Apply review suggestions: simplify test and update
 Javadoc

---
 .../integrity/BibLogSettingsViewModel.java    | 26 ++++++++-----------
 .../logic/biblog/BibLogPathResolver.java      | 13 +++++-----
 ...BibWarningToIntegrityMessageConverter.java | 24 ++++++++---------
 ...arningToIntegrityMessageConverterTest.java | 18 +++++--------
 4 files changed, 35 insertions(+), 46 deletions(-)

diff --git a/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java b/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
index c94bb57bfad..e6a1c39351b 100644
--- a/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
+++ b/src/main/java/org/jabref/gui/integrity/BibLogSettingsViewModel.java
@@ -22,16 +22,10 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.metadata.MetaData;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * 1. Connects MetaData with the view.
- * 2. Wraps .blg warnings as IntegrityMessages.
- * 3. Supports file browsing and reset actions.
- */
+/// 1. Connects MetaData with the view.
+/// 2. Wraps .blg warnings as IntegrityMessages.
+/// 3. Supports file browsing and reset actions.
 public class BibLogSettingsViewModel extends AbstractViewModel {
-    private static final Logger LOGGER = LoggerFactory.getLogger(BibLogSettingsViewModel.class);
     private final ObservableList<IntegrityMessage> blgWarnings = FXCollections.observableArrayList();
     private final StringProperty path = new SimpleStringProperty("");
     private final MetaData metaData;
@@ -47,18 +41,20 @@ public BibLogSettingsViewModel(MetaData metaData, Optional<Path> bibPath) {
 
         BibLogPathResolver.resolve(metaData, bibPath, user)
                           .ifPresent(resolvedPath -> {
-            this.path.set(resolvedPath.toString());
-            if (metaData.getBlgFilePath(user).isEmpty()) {
-                metaData.setBlgFilePath(user, resolvedPath);
-                this.lastResolvedBlgPath = Optional.of(resolvedPath);
-            }
-        });
+                              this.path.set(resolvedPath.toString());
+                              if (metaData.getBlgFilePath(user).isEmpty()) {
+                                  metaData.setBlgFilePath(user, resolvedPath);
+                                  this.lastResolvedBlgPath = Optional.of(resolvedPath);
+                              }
+                          });
     }
 
     /**
      * Parses the .blg file (if it exists) into the observable list.
      *
      * @param databaseContext the current database context used to resolve citation keys in warnings.
+     * @return An Optional containing the list of integrity messages if the file exists and can be parsed,
+     *         or an empty Optional if the file does not exist.
      * @throws JabRefException if the .blg file cannot be parsed or read
      */
     public Optional<List<IntegrityMessage>> getBlgWarnings(BibDatabaseContext databaseContext) throws JabRefException {
diff --git a/src/main/java/org/jabref/logic/biblog/BibLogPathResolver.java b/src/main/java/org/jabref/logic/biblog/BibLogPathResolver.java
index 0f9c56c3cc6..f1ab730eab6 100644
--- a/src/main/java/org/jabref/logic/biblog/BibLogPathResolver.java
+++ b/src/main/java/org/jabref/logic/biblog/BibLogPathResolver.java
@@ -6,13 +6,12 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.metadata.MetaData;
 
-/**
- * Resolves custom or default .blg path for this library.
- *
- * Priority:
- * 1. User-defined path from MetaData
- * 2. Default: same name as .bib file with .blg extension
- */
+/// Resolves custom or default .blg path for this library.
+///
+/// Priority:
+///
+/// 1. User-defined path from MetaData
+/// 2. Default: same name as .bib file with .blg extension
 public class BibLogPathResolver {
 
     /**
diff --git a/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java b/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
index 2cd2dcd7b3b..ca84a1f90f5 100644
--- a/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
+++ b/src/main/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverter.java
@@ -11,19 +11,17 @@
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.InternalField;
 
-/**
- * Converts {@link BibWarning}s into {@link IntegrityMessage}s for integration with the existing integrity check UI.
- *
- * Notes:
- * - The current IntegrityMessage interface expects a {@link BibEntry} and a {@link Field},
- *   but .blg warnings come from a different source and may not include a field.
- * - For now, we map missing fields to a placeholder (InternalField.KEY_FIELD) to make it compatible with the UI.
- * - This is a minimal MVP solution to reuse the Integrity tab without changing the UI structure.
- *
- * Future direction:
- * - Consider defining a proper interface (e.g., IntegrityMessageWithField / WithoutField)
- *   to support warnings without fields cleanly.
- */
+/// Converts {@link BibWarning}s into {@link IntegrityMessage}s for integration with the existing integrity check UI.
+///
+/// Notes:
+/// - The current IntegrityMessage interface expects a {@link BibEntry} and a {@link Field},
+///   but .blg warnings come from a different source and may not include a field.
+/// - For now, we map missing fields to a placeholder (InternalField.KEY_FIELD) to make it compatible with the UI.
+/// - This is a minimal MVP solution to reuse the Integrity tab without changing the UI structure.
+///
+/// Future direction:
+/// - Consider defining a proper interface (e.g., IntegrityMessageWithField / WithoutField)
+///   to support warnings without fields cleanly.
 public class BibWarningToIntegrityMessageConverter {
     public static List<IntegrityMessage> convert(
             List<BibWarning> bibWarnings,
diff --git a/src/test/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverterTest.java b/src/test/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverterTest.java
index da652f72548..e56af08a5a1 100644
--- a/src/test/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverterTest.java
+++ b/src/test/java/org/jabref/logic/biblog/BibWarningToIntegrityMessageConverterTest.java
@@ -8,6 +8,7 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 
@@ -34,19 +35,14 @@ void convertsWarningsToIntegrityMessagesTest() {
                 new BibWarning(SeverityType.WARNING, "empty journal", "journal", "Scholey_2013"),
                 new BibWarning(SeverityType.WARNING, "empty year", "year", "Tan_2021")
         );
-        List<IntegrityMessage> messages = BibWarningToIntegrityMessageConverter.convert(warnings, context);
-
-        assertEquals(2, messages.size());
+        List<IntegrityMessage> actualMessages = BibWarningToIntegrityMessageConverter.convert(warnings, context);
 
-        IntegrityMessage msg1 = messages.getFirst();
-        assertEquals("empty journal", msg1.message());
-        assertEquals(firstEntry, msg1.entry());
-        assertEquals("journal", msg1.field().getName());
+        List<IntegrityMessage> expectedMessages = List.of(
+                new IntegrityMessage("empty journal", firstEntry, FieldFactory.parseField("journal")),
+                new IntegrityMessage("empty year", secondEntry, FieldFactory.parseField("year"))
+        );
 
-        IntegrityMessage msg2 = messages.get(1);
-        assertEquals("empty year", msg2.message());
-        assertEquals(secondEntry, msg2.entry());
-        assertEquals("year", msg2.field().getName());
+        assertEquals(expectedMessages, actualMessages);
     }
 
     /**

From 19a7c5fa062afa7e45862a656ad2726b4289b595 Mon Sep 17 00:00:00 2001
From: Wanling Fu <wanlingfu3@gmail.com>
Date: Fri, 18 Apr 2025 12:18:14 +0100
Subject: [PATCH 17/17] Revert unintended submodule change to csl-styles

---
 src/main/resources/csl-styles | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/csl-styles b/src/main/resources/csl-styles
index 5dcaf2790ec..616763159e5 160000
--- a/src/main/resources/csl-styles
+++ b/src/main/resources/csl-styles
@@ -1 +1 @@
-Subproject commit 5dcaf2790ecac10dde44e70538a790b52c78fa4b
+Subproject commit 616763159e5fbedcfb574ac02648e727b8166dad