From 9b11edf566ea8b82a8f5043b685cb6a3c911e206 Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Thu, 13 Feb 2025 03:42:05 +0530
Subject: [PATCH 01/30] Add fix options for integrity issues

---
 .../java/org/jabref/gui/frame/MainMenu.java   |   2 +-
 .../gui/integrity/IntegrityCheckAction.java   |  11 +-
 .../gui/integrity/IntegrityCheckDialog.fxml   |  14 ++-
 .../gui/integrity/IntegrityCheckDialog.java   | 106 +++++++++++++++++-
 .../IntegrityCheckDialogViewModel.java        |  42 ++++++-
 src/main/resources/l10n/JabRef_en.properties  |  10 ++
 6 files changed, 174 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/jabref/gui/frame/MainMenu.java b/src/main/java/org/jabref/gui/frame/MainMenu.java
index a320bdd6348..a07028b2500 100644
--- a/src/main/java/org/jabref/gui/frame/MainMenu.java
+++ b/src/main/java/org/jabref/gui/frame/MainMenu.java
@@ -250,7 +250,7 @@ private void createMenu() {
         quality.getItems().addAll(
                 factory.createMenuItem(StandardActions.FIND_DUPLICATES, new DuplicateSearch(frame::getCurrentLibraryTab, dialogService, stateManager, preferences, entryTypesManager, taskExecutor)),
                 factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(dialogService, stateManager, undoManager, preferences)),
-                factory.createMenuItem(StandardActions.CHECK_INTEGRITY, new IntegrityCheckAction(frame::getCurrentLibraryTab, preferences, dialogService, stateManager, (UiTaskExecutor) taskExecutor, abbreviationRepository)),
+                factory.createMenuItem(StandardActions.CHECK_INTEGRITY, new IntegrityCheckAction(frame::getCurrentLibraryTab, preferences, dialogService, stateManager, (UiTaskExecutor) taskExecutor, preferences, undoManager, abbreviationRepository)),
                 factory.createMenuItem(StandardActions.CHECK_CONSISTENCY, new ConsistencyCheckAction(frame::getCurrentLibraryTab, dialogService, stateManager, preferences, entryTypesManager, (UiTaskExecutor) taskExecutor)),
                 factory.createMenuItem(StandardActions.CLEANUP_ENTRIES, new CleanupAction(frame::getCurrentLibraryTab, preferences, dialogService, stateManager, taskExecutor, undoManager)),
 
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
index 506dee530fb..008a706d678 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
@@ -4,6 +4,8 @@
 import java.util.List;
 import java.util.function.Supplier;
 
+import javax.swing.undo.UndoManager;
+
 import javafx.collections.ObservableList;
 import javafx.concurrent.Task;
 
@@ -17,6 +19,7 @@
 import org.jabref.logic.integrity.IntegrityMessage;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
@@ -29,6 +32,8 @@ public class IntegrityCheckAction extends SimpleCommand {
     private final Supplier<LibraryTab> tabSupplier;
     private final GuiPreferences preferences;
     private final StateManager stateManager;
+    private final CliPreferences cliPreferences;
+    private final UndoManager undoManager;
     private final JournalAbbreviationRepository abbreviationRepository;
 
     public IntegrityCheckAction(Supplier<LibraryTab> tabSupplier,
@@ -36,12 +41,16 @@ public IntegrityCheckAction(Supplier<LibraryTab> tabSupplier,
                                 DialogService dialogService,
                                 StateManager stateManager,
                                 UiTaskExecutor taskExecutor,
+                                CliPreferences cliPreferences,
+                                UndoManager undoManager,
                                 JournalAbbreviationRepository abbreviationRepository) {
         this.tabSupplier = tabSupplier;
         this.stateManager = stateManager;
         this.taskExecutor = taskExecutor;
         this.preferences = preferences;
         this.dialogService = dialogService;
+        this.cliPreferences = cliPreferences;
+        this.undoManager = undoManager;
         this.abbreviationRepository = abbreviationRepository;
         this.executable.bind(needsDatabase(this.stateManager));
     }
@@ -78,7 +87,7 @@ protected List<IntegrityMessage> call() {
             if (messages.isEmpty()) {
                 dialogService.notify(Localization.lang("No problems found."));
             } else {
-                dialogService.showCustomDialogAndWait(new IntegrityCheckDialog(messages, tabSupplier.get()));
+                dialogService.showCustomDialogAndWait(new IntegrityCheckDialog(messages, tabSupplier, dialogService, stateManager, taskExecutor, cliPreferences, undoManager));
             }
         });
         task.setOnFailed(event -> dialogService.showErrorDialogAndWait("Integrity check failed.", task.getException()));
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml
index 7666785b6ad..1691749e670 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml
@@ -8,15 +8,18 @@
 <?import javafx.scene.control.TableView?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
+<?import javafx.scene.layout.Region?>
+<?import javafx.scene.control.ComboBox?>
 <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 spacing="10.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"/>
                     <TableColumn fx:id="fieldColumn" prefWidth="110.0" maxWidth="200" text="%Field"/>
-                    <TableColumn fx:id="messageColumn" prefWidth="400" text="%Message"/>
+                    <TableColumn fx:id="messageColumn" prefWidth="300" text="%Message"/>
+                    <TableColumn fx:id="fixesColumn" prefWidth="140.0" maxWidth="200" text="%Fixes"/>
                 </columns>
                 <columnResizePolicy>
                     <TableView fx:constant="CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN"/>
@@ -26,7 +29,12 @@
                 <MenuButton fx:id="keyFilterButton" prefHeight="30.0" maxHeight="30.0" text="%Citation key filters"/>
                 <MenuButton fx:id="fieldFilterButton" prefHeight="30.0" maxHeight="30.0" text="%Field filters"/>
                 <MenuButton fx:id="messageFilterButton" prefHeight="30.0" maxHeight="30.0" text="%Message filters"/>
-                <Button onAction="#clearFilters" text="%Clear filters"/>
+            </HBox>
+            <HBox maxHeight="30" spacing="4.0" alignment="CENTER">
+                <Button prefHeight="20.0" text="%Fix all"/>
+                <Region HBox.hgrow="ALWAYS" />
+                <ComboBox fx:id="entryTypeCombo" maxWidth="400"  />
+                <Button onAction="#fixByType" alignment="CENTER_RIGHT" prefHeight="20.0" text="%Fix by type"/>
             </HBox>
         </VBox>
     </content>
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
index 00b3cc32bc9..9639a6614b0 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -2,23 +2,38 @@
 
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Supplier;
+
+import javax.swing.undo.UndoManager;
 
 import javafx.beans.property.ReadOnlyStringWrapper;
+import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ComboBox;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuButton;
+import javafx.scene.control.TableCell;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.input.MouseButton;
 import javafx.stage.Modality;
 
+import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.citationkeypattern.GenerateCitationKeyAction;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ValueTableCellFactory;
 import org.jabref.logic.integrity.IntegrityMessage;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.preferences.CliPreferences;
+import org.jabref.logic.util.TaskExecutor;
+import org.jabref.model.entry.field.InternalField;
+import org.jabref.model.entry.field.StandardField;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import jakarta.inject.Inject;
@@ -30,20 +45,40 @@ public class IntegrityCheckDialog extends BaseDialog<Void> {
     @FXML private TableColumn<IntegrityMessage, String> keyColumn;
     @FXML private TableColumn<IntegrityMessage, String> fieldColumn;
     @FXML private TableColumn<IntegrityMessage, String> messageColumn;
+    @FXML private TableColumn<IntegrityMessage, String> fixesColumn;
     @FXML private MenuButton keyFilterButton;
     @FXML private MenuButton fieldFilterButton;
     @FXML private MenuButton messageFilterButton;
+    @FXML private ComboBox<String> entryTypeCombo;
 
     @Inject private ThemeManager themeManager;
 
     private final List<IntegrityMessage> messages;
-    private final LibraryTab libraryTab;
+    private final Supplier<LibraryTab> tabSupplier;
+    private final DialogService dialogService;
+    private final StateManager stateManager;
+    private final TaskExecutor taskExecutor;
+    private final CliPreferences preferences;
+    private final UndoManager undoManager;
+
     private IntegrityCheckDialogViewModel viewModel;
     private TableFilter<IntegrityMessage> tableFilter;
 
-    public IntegrityCheckDialog(List<IntegrityMessage> messages, LibraryTab libraryTab) {
+    public IntegrityCheckDialog(List<IntegrityMessage> messages,
+                                Supplier<LibraryTab> tabSupplier,
+                                DialogService dialogService,
+                                StateManager stateManager,
+                                TaskExecutor taskExecutor,
+                                CliPreferences preferences,
+                                UndoManager undoManager) {
         this.messages = messages;
-        this.libraryTab = libraryTab;
+        this.tabSupplier = tabSupplier;
+        this.dialogService = dialogService;
+        this.stateManager = stateManager;
+        this.taskExecutor = taskExecutor;
+        this.preferences = preferences;
+        this.undoManager = undoManager;
+
         this.setTitle(Localization.lang("Check integrity"));
         this.initModality(Modality.NONE);
 
@@ -57,7 +92,7 @@ public IntegrityCheckDialog(List<IntegrityMessage> messages, LibraryTab libraryT
     private void onSelectionChanged(ListChangeListener.Change<? extends IntegrityMessage> change) {
         if (change.next()) {
             change.getAddedSubList().stream().findFirst().ifPresent(message ->
-                    libraryTab.editEntryAndFocusField(message.entry(), message.field()));
+                    tabSupplier.get().editEntryAndFocusField(message.entry(), message.field()));
         }
     }
 
@@ -67,14 +102,50 @@ public IntegrityCheckDialogViewModel getViewModel() {
 
     @FXML
     private void initialize() {
-        viewModel = new IntegrityCheckDialogViewModel(messages);
+        viewModel = new IntegrityCheckDialogViewModel(messages, dialogService);
 
         messagesTable.getSelectionModel().getSelectedItems().addListener(this::onSelectionChanged);
         messagesTable.setItems(viewModel.getMessages());
+        entryTypeCombo.getItems().addAll(viewModel.getEntryTypes());
+        entryTypeCombo.getSelectionModel().selectFirst();
         keyColumn.setCellValueFactory(row -> new ReadOnlyStringWrapper(row.getValue().entry().getCitationKey().orElse("")));
         fieldColumn.setCellValueFactory(row -> new ReadOnlyStringWrapper(row.getValue().field().getDisplayName()));
         messageColumn.setCellValueFactory(row -> new ReadOnlyStringWrapper(row.getValue().message()));
 
+        fixesColumn.setCellFactory(row -> new TableCell<>() {
+            private final Button button = new Button();
+
+            @Override
+            protected void updateItem(String item, boolean empty) {
+                super.updateItem(item, empty);
+                if (empty || getTableRow() == null || getTableRow().getItem() == null) {
+                    setGraphic(null);
+                } else {
+                    IntegrityMessage rowData = getTableRow().getItem();
+                    switch (rowData.field()) {
+                        case StandardField.TITLE:
+                            button.setText("Fix");
+                            button.setOnAction(event -> {
+                                viewModel.fixTitle(rowData);
+                                dialogService.notify(Localization.lang("Masked capital letters using curly brackets {}"));
+                                removeRowFromTable(getTableRow().getItem());
+                            });
+                            setGraphic(button);
+                            break;
+                        case InternalField.KEY_FIELD:
+                            button.setText(Localization.lang("Generate Key"));
+                            button.setOnAction(event -> new GenerateCitationKeyAction(tabSupplier, dialogService, stateManager, taskExecutor, preferences, undoManager).execute());
+                            removeRowFromTable(getTableRow().getItem());
+                            setGraphic(button);
+                            break;
+                        default:
+                            setGraphic(null);
+                            break;
+                    }
+                }
+            }
+        });
+
         new ValueTableCellFactory<IntegrityMessage, String>()
                 .withText(Function.identity())
                 .withTooltip(Function.identity())
@@ -116,4 +187,29 @@ public void clearFilters() {
             });
         }
     }
+
+    private void removeRowFromTable(IntegrityMessage message) {
+        ObservableList<IntegrityMessage> mutableMessages = FXCollections.observableArrayList(messagesTable.getItems());
+        mutableMessages.remove(message);
+        messagesTable.setItems(mutableMessages);
+    }
+
+    @FXML
+    private void fixByType() {
+        String selectedType = entryTypeCombo.getSelectionModel().getSelectedItem();
+        if (selectedType.equals(StandardField.TITLE.getDisplayName())) {
+            for (IntegrityMessage message : messagesTable.getItems()) {
+                if (message.field().getDisplayName().equals(selectedType)) {
+                    viewModel.fixTitle(message);
+                    removeRowFromTable(message);
+                    viewModel.removeFromEntryTypes(message.field().getDisplayName());
+                    entryTypeCombo.getItems().setAll(viewModel.getEntryTypes());
+                    entryTypeCombo.getSelectionModel().selectFirst();
+                    dialogService.notify(Localization.lang("Fixed successfully!"));
+                }
+            }
+        } else {
+            dialogService.notify(Localization.lang("No fixes available!"));
+        }
+    }
 }
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
index 1313417642e..30dde132446 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
@@ -1,22 +1,62 @@
 package org.jabref.gui.integrity;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import javafx.collections.ObservableSet;
 
 import org.jabref.gui.AbstractViewModel;
+import org.jabref.gui.DialogService;
 import org.jabref.logic.integrity.IntegrityMessage;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
 
 public class IntegrityCheckDialogViewModel extends AbstractViewModel {
 
     private final ObservableList<IntegrityMessage> messages;
+    private final ObservableSet<String> entryTypes;
 
-    public IntegrityCheckDialogViewModel(List<IntegrityMessage> messages) {
+    private final DialogService dialogService;
+
+    public IntegrityCheckDialogViewModel(List<IntegrityMessage> messages, DialogService dialogService) {
         this.messages = FXCollections.observableArrayList(messages);
+        this.dialogService = dialogService;
+
+        Set<String> types = messages.stream()
+                                    .map(item -> item.field().getDisplayName())
+                                    .collect(Collectors.toSet());
+        this.entryTypes = FXCollections.observableSet(types);
     }
 
     public ObservableList<IntegrityMessage> getMessages() {
         return messages;
     }
+
+    public Set<String> getEntryTypes() {
+        return entryTypes;
+    }
+
+    public void removeFromEntryTypes(String entry) {
+        entryTypes.remove(entry);
+    }
+
+    public void fixTitle(IntegrityMessage message) {
+        String title = message.entry().getTitle().get();
+        StringBuilder result = new StringBuilder();
+        for (char ch : title.toCharArray()) {
+            if (Character.isUpperCase(ch)) {
+                result.append("{").append(ch).append("}");
+            } else {
+                result.append(ch);
+            }
+        }
+        Map<Field, String> fields = new HashMap<>();
+        fields.put(StandardField.TITLE, result.toString());
+        message.entry().setField(fields);
+    }
 }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index a9a3fa05aba..45f2243ba6b 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2190,6 +2190,16 @@ Citation\ key\ filters=Citation key filters
 Field\ filters=Field filters
 Message\ filters=Message filters
 Clear\ filters=Clear filters
+Fixed\ all=Fixed all
+Fixes=Fixes
+Fix=Fix
+Fix\ all=Fix all
+Fix\ selected=Fix selected
+Fix\ by\ type=Fix by type
+Generate\ Key=Generate Key
+Masked\ capital\ letters\ using\ curly\ brackets\ {}=Masked capital letters using curly brackets {}
+Fixed\ successfully!=Fixed successfully!
+No\ fixes\ available!=No fixes available!
 
 Add\ new\ Field=Add new Field
 Add\ new\ entry\ type=Add new entry type

From 02d8e75d8f48cab58e0e73cc092d07d35249cff9 Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Thu, 13 Feb 2025 03:51:26 +0530
Subject: [PATCH 02/30] Fix the check

---
 src/main/resources/l10n/JabRef_en.properties | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 45f2243ba6b..b6af21a2f67 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2189,17 +2189,13 @@ Grobid=Grobid
 Citation\ key\ filters=Citation key filters
 Field\ filters=Field filters
 Message\ filters=Message filters
-Clear\ filters=Clear filters
-Fixed\ all=Fixed all
 Fixes=Fixes
 Fix=Fix
 Fix\ all=Fix all
-Fix\ selected=Fix selected
 Fix\ by\ type=Fix by type
 Generate\ Key=Generate Key
 Masked\ capital\ letters\ using\ curly\ brackets\ {}=Masked capital letters using curly brackets {}
 Fixed\ successfully!=Fixed successfully!
-No\ fixes\ available!=No fixes available!
 
 Add\ new\ Field=Add new Field
 Add\ new\ entry\ type=Add new entry type

From 754b6adf56cc6623c74798fb1ddfefd0f4b5d35e Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Thu, 13 Feb 2025 04:05:05 +0530
Subject: [PATCH 03/30] Add a missing entry for Localization.lang

---
 src/main/resources/l10n/JabRef_en.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index b6af21a2f67..c20ec85ce1d 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2196,6 +2196,7 @@ Fix\ by\ type=Fix by type
 Generate\ Key=Generate Key
 Masked\ capital\ letters\ using\ curly\ brackets\ {}=Masked capital letters using curly brackets {}
 Fixed\ successfully!=Fixed successfully!
+No\ fixes\ available!=No fixes available!
 
 Add\ new\ Field=Add new Field
 Add\ new\ entry\ type=Add new entry type

From 696f90411d2e5035ad20c7cfe01866c9d983ddee Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Thu, 13 Feb 2025 05:06:12 +0530
Subject: [PATCH 04/30] Fix the check

---
 .../java/org/jabref/gui/integrity/IntegrityCheckDialog.java | 4 ++--
 .../jabref/gui/integrity/IntegrityCheckDialogViewModel.java | 6 +-----
 src/main/resources/l10n/JabRef_en.properties                | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
index 9639a6614b0..b506e68538b 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -102,7 +102,7 @@ public IntegrityCheckDialogViewModel getViewModel() {
 
     @FXML
     private void initialize() {
-        viewModel = new IntegrityCheckDialogViewModel(messages, dialogService);
+        viewModel = new IntegrityCheckDialogViewModel(messages);
 
         messagesTable.getSelectionModel().getSelectedItems().addListener(this::onSelectionChanged);
         messagesTable.setItems(viewModel.getMessages());
@@ -124,7 +124,7 @@ protected void updateItem(String item, boolean empty) {
                     IntegrityMessage rowData = getTableRow().getItem();
                     switch (rowData.field()) {
                         case StandardField.TITLE:
-                            button.setText("Fix");
+                            button.setText(Localization.lang("Fix"));
                             button.setOnAction(event -> {
                                 viewModel.fixTitle(rowData);
                                 dialogService.notify(Localization.lang("Masked capital letters using curly brackets {}"));
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
index 30dde132446..4fc17e52dc0 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
@@ -11,7 +11,6 @@
 import javafx.collections.ObservableSet;
 
 import org.jabref.gui.AbstractViewModel;
-import org.jabref.gui.DialogService;
 import org.jabref.logic.integrity.IntegrityMessage;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
@@ -21,11 +20,8 @@ public class IntegrityCheckDialogViewModel extends AbstractViewModel {
     private final ObservableList<IntegrityMessage> messages;
     private final ObservableSet<String> entryTypes;
 
-    private final DialogService dialogService;
-
-    public IntegrityCheckDialogViewModel(List<IntegrityMessage> messages, DialogService dialogService) {
+    public IntegrityCheckDialogViewModel(List<IntegrityMessage> messages) {
         this.messages = FXCollections.observableArrayList(messages);
-        this.dialogService = dialogService;
 
         Set<String> types = messages.stream()
                                     .map(item -> item.field().getDisplayName())
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index c20ec85ce1d..170036f993b 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2189,8 +2189,8 @@ Grobid=Grobid
 Citation\ key\ filters=Citation key filters
 Field\ filters=Field filters
 Message\ filters=Message filters
-Fixes=Fixes
 Fix=Fix
+Fixes=Fixes
 Fix\ all=Fix all
 Fix\ by\ type=Fix by type
 Generate\ Key=Generate Key

From 4ab36a8518b1a3c33d85969e2fc1a69efdc5d47c Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Fri, 14 Feb 2025 18:47:50 +0530
Subject: [PATCH 05/30] Refactor code

---
 .../gui/integrity/IntegrityCheckDialog.java   | 95 ++++++++++++-------
 .../IntegrityCheckDialogViewModel.java        | 60 +++++++++++-
 src/main/resources/l10n/JabRef_en.properties  |  1 +
 3 files changed, 122 insertions(+), 34 deletions(-)

diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
index b506e68538b..0e25bc00fc0 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -24,7 +24,6 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
-import org.jabref.gui.citationkeypattern.GenerateCitationKeyAction;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ValueTableCellFactory;
@@ -102,7 +101,7 @@ public IntegrityCheckDialogViewModel getViewModel() {
 
     @FXML
     private void initialize() {
-        viewModel = new IntegrityCheckDialogViewModel(messages);
+        viewModel = new IntegrityCheckDialogViewModel(messages, tabSupplier, dialogService, stateManager, taskExecutor, preferences, undoManager);
 
         messagesTable.getSelectionModel().getSelectedItems().addListener(this::onSelectionChanged);
         messagesTable.setItems(viewModel.getMessages());
@@ -120,29 +119,42 @@ protected void updateItem(String item, boolean empty) {
                 super.updateItem(item, empty);
                 if (empty || getTableRow() == null || getTableRow().getItem() == null) {
                     setGraphic(null);
-                } else {
-                    IntegrityMessage rowData = getTableRow().getItem();
-                    switch (rowData.field()) {
-                        case StandardField.TITLE:
-                            button.setText(Localization.lang("Fix"));
-                            button.setOnAction(event -> {
-                                viewModel.fixTitle(rowData);
-                                dialogService.notify(Localization.lang("Masked capital letters using curly brackets {}"));
-                                removeRowFromTable(getTableRow().getItem());
-                            });
-                            setGraphic(button);
-                            break;
-                        case InternalField.KEY_FIELD:
-                            button.setText(Localization.lang("Generate Key"));
-                            button.setOnAction(event -> new GenerateCitationKeyAction(tabSupplier, dialogService, stateManager, taskExecutor, preferences, undoManager).execute());
-                            removeRowFromTable(getTableRow().getItem());
-                            setGraphic(button);
-                            break;
-                        default:
-                            setGraphic(null);
-                            break;
-                    }
+                    return;
                 }
+                IntegrityMessage rowData = getTableRow().getItem();
+                configureButton(rowData);
+            }
+
+            private void configureButton(IntegrityMessage rowData) {
+                switch (rowData.field()) {
+                    case StandardField.URLDATE:
+                        configureButton("Remove field", () -> {
+                            viewModel.fix(StandardField.URLDATE, rowData, "Field removed successfully");
+                            removeRowFromTable(rowData);
+                        });
+                        break;
+                    case StandardField.TITLE:
+                        configureButton(Localization.lang("Fix"), () -> {
+                            viewModel.fix(StandardField.TITLE, rowData, "Masked capital letters using curly brackets {}");
+                            removeRowFromTable(rowData);
+                        });
+                        break;
+                    case InternalField.KEY_FIELD:
+                        configureButton(Localization.lang("Generate Key"), () -> {
+                            viewModel.fix(InternalField.KEY_FIELD, rowData, null);
+                            removeRowFromTable(rowData);
+                        });
+                        break;
+                    default:
+                        setGraphic(null);
+                        return;
+                }
+                setGraphic(button);
+            }
+
+            private void configureButton(String text, Runnable action) {
+                button.setText(text);
+                button.setOnAction(event -> action.run());
             }
         });
 
@@ -194,20 +206,37 @@ private void removeRowFromTable(IntegrityMessage message) {
         messagesTable.setItems(mutableMessages);
     }
 
+    private void updateEntryTypeCombo() {
+        entryTypeCombo.getItems().setAll(viewModel.getEntryTypes());
+        entryTypeCombo.getSelectionModel().selectFirst();
+    }
+
     @FXML
     private void fixByType() {
         String selectedType = entryTypeCombo.getSelectionModel().getSelectedItem();
-        if (selectedType.equals(StandardField.TITLE.getDisplayName())) {
-            for (IntegrityMessage message : messagesTable.getItems()) {
-                if (message.field().getDisplayName().equals(selectedType)) {
-                    viewModel.fixTitle(message);
-                    removeRowFromTable(message);
-                    viewModel.removeFromEntryTypes(message.field().getDisplayName());
-                    entryTypeCombo.getItems().setAll(viewModel.getEntryTypes());
-                    entryTypeCombo.getSelectionModel().selectFirst();
-                    dialogService.notify(Localization.lang("Fixed successfully!"));
+        boolean isFixed = false;
+
+        for (IntegrityMessage message : messages) {
+            if (message.field().getDisplayName().equals(selectedType)) {
+                if (selectedType.equals(StandardField.TITLE.getDisplayName())) {
+                    viewModel.fix(StandardField.URLDATE, message, Localization.lang("Masked capital letters using curly brackets {}"));
+                } else if (selectedType.equals(StandardField.URLDATE.getDisplayName())) {
+                    viewModel.fix(StandardField.TITLE, message, Localization.lang("Field removed successfully!"));
+                } else if (selectedType.equals(InternalField.KEY_FIELD.getDisplayName())) {
+                    viewModel.fix(InternalField.KEY_FIELD, message, null);
+                } else {
+                    continue;
                 }
+                removeRowFromTable(message);
+                viewModel.removeFromEntryTypes(message.field().getDisplayName());
+                isFixed = true;
             }
+        }
+
+        updateEntryTypeCombo();
+
+        if (isFixed) {
+            dialogService.notify(Localization.lang("Fixed successfully!"));
         } else {
             dialogService.notify(Localization.lang("No fixes available!"));
         }
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
index 4fc17e52dc0..3c2fdcd481f 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
@@ -4,24 +4,53 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
+import javax.swing.undo.UndoManager;
+
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.collections.ObservableSet;
 
 import org.jabref.gui.AbstractViewModel;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.LibraryTab;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.citationkeypattern.GenerateCitationKeyAction;
 import org.jabref.logic.integrity.IntegrityMessage;
+import org.jabref.logic.preferences.CliPreferences;
+import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
 
 public class IntegrityCheckDialogViewModel extends AbstractViewModel {
 
+    private final Supplier<LibraryTab> tabSupplier;
+    private final DialogService dialogService;
+    private final StateManager stateManager;
+    private final TaskExecutor taskExecutor;
+    private final CliPreferences preferences;
+    private final UndoManager undoManager;
+
     private final ObservableList<IntegrityMessage> messages;
     private final ObservableSet<String> entryTypes;
 
-    public IntegrityCheckDialogViewModel(List<IntegrityMessage> messages) {
+    public IntegrityCheckDialogViewModel(List<IntegrityMessage> messages,
+                                         Supplier<LibraryTab> tabSupplier,
+                                         DialogService dialogService,
+                                         StateManager stateManager,
+                                         TaskExecutor taskExecutor,
+                                         CliPreferences preferences,
+                                         UndoManager undoManager) {
         this.messages = FXCollections.observableArrayList(messages);
+        this.tabSupplier = tabSupplier;
+        this.dialogService = dialogService;
+        this.stateManager = stateManager;
+        this.taskExecutor = taskExecutor;
+        this.preferences = preferences;
+        this.undoManager = undoManager;
 
         Set<String> types = messages.stream()
                                     .map(item -> item.field().getDisplayName())
@@ -41,6 +70,29 @@ public void removeFromEntryTypes(String entry) {
         entryTypes.remove(entry);
     }
 
+    public void fix(Field field, IntegrityMessage message, String text) {
+        boolean fixed = true;
+
+        switch (field) {
+            case StandardField.TITLE:
+                fixTitle(message);
+                break;
+            case StandardField.URLDATE:
+                fixBiblatexFieldOnly(message);
+                break;
+            case InternalField.KEY_FIELD:
+                new GenerateCitationKeyAction(tabSupplier, dialogService, stateManager, taskExecutor, preferences, undoManager).execute();
+                break;
+            default:
+                fixed = false;
+                break;
+        }
+
+        if (fixed && text != null) {
+            dialogService.notify(text);
+        }
+    }
+
     public void fixTitle(IntegrityMessage message) {
         String title = message.entry().getTitle().get();
         StringBuilder result = new StringBuilder();
@@ -55,4 +107,10 @@ public void fixTitle(IntegrityMessage message) {
         fields.put(StandardField.TITLE, result.toString());
         message.entry().setField(fields);
     }
+
+    public void fixBiblatexFieldOnly(IntegrityMessage message) {
+        Map<Field, String> fields = new HashMap<>();
+        fields.put(StandardField.URLDATE, "");
+        message.entry().setField(fields);
+    }
 }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 170036f993b..c3e28bbd619 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2194,6 +2194,7 @@ Fixes=Fixes
 Fix\ all=Fix all
 Fix\ by\ type=Fix by type
 Generate\ Key=Generate Key
+Field\ removed\ successfully=Field removed successfully
 Masked\ capital\ letters\ using\ curly\ brackets\ {}=Masked capital letters using curly brackets {}
 Fixed\ successfully!=Fixed successfully!
 No\ fixes\ available!=No fixes available!

From 28de796808cbbd04c83a946604dd09273c93d242 Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Fri, 14 Feb 2025 18:55:06 +0530
Subject: [PATCH 06/30] Fix the check

---
 src/main/resources/l10n/JabRef_en.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index c3e28bbd619..a6daf07fb10 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2194,7 +2194,7 @@ Fixes=Fixes
 Fix\ all=Fix all
 Fix\ by\ type=Fix by type
 Generate\ Key=Generate Key
-Field\ removed\ successfully=Field removed successfully
+Field\ removed\ successfully!=Field removed successfully!
 Masked\ capital\ letters\ using\ curly\ brackets\ {}=Masked capital letters using curly brackets {}
 Fixed\ successfully!=Fixed successfully!
 No\ fixes\ available!=No fixes available!

From 70ae8eb91b21a9e7bbab20bffbb3c9a48df4475e Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Fri, 14 Feb 2025 19:04:24 +0530
Subject: [PATCH 07/30] Add a CHANGELOG.md entry

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32fa3ab34ea..8329d811c93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 
 ### Added
 
+- We added a feature to fix integrity issues one at a time or similar issues by selecting a type, or to fix all at once. [#11419](https://github.com/JabRef/jabref/issues/11419)
 - We added a new CLI that supports txt, csv, and console-based output for consistency in BibTeX entries. [#11984](https://github.com/JabRef/jabref/issues/11984)
 - We added a new dialog for bibliography consistency check. [#11950](https://github.com/JabRef/jabref/issues/11950)
 - We added a feature for copying entries to libraries, available via the context menu, with an option to include cross-references. [#12374](https://github.com/JabRef/jabref/pull/12374)

From 77df6eaa1f6badcb5404100c13080f47362d0a7f Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Thu, 20 Feb 2025 01:10:53 +0530
Subject: [PATCH 08/30] Refactor the code

---
 .../gui/integrity/IntegrityCheckDialog.java   | 82 +++++++++----------
 .../IntegrityCheckDialogViewModel.java        | 41 ++++++----
 .../jabref/gui/integrity/IntegrityIssue.java  | 43 ++++++++++
 .../jabref/logic/integrity/DateChecker.java   |  4 +-
 4 files changed, 108 insertions(+), 62 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/integrity/IntegrityIssue.java

diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
index 0e25bc00fc0..b58bde56b72 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -1,6 +1,9 @@
 package org.jabref.gui.integrity;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
@@ -31,8 +34,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.logic.util.TaskExecutor;
-import org.jabref.model.entry.field.InternalField;
-import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.field.Field;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import jakarta.inject.Inject;
@@ -105,8 +107,7 @@ private void initialize() {
 
         messagesTable.getSelectionModel().getSelectedItems().addListener(this::onSelectionChanged);
         messagesTable.setItems(viewModel.getMessages());
-        entryTypeCombo.getItems().addAll(viewModel.getEntryTypes());
-        entryTypeCombo.getSelectionModel().selectFirst();
+        updateEntryTypeCombo();
         keyColumn.setCellValueFactory(row -> new ReadOnlyStringWrapper(row.getValue().entry().getCitationKey().orElse("")));
         fieldColumn.setCellValueFactory(row -> new ReadOnlyStringWrapper(row.getValue().field().getDisplayName()));
         messageColumn.setCellValueFactory(row -> new ReadOnlyStringWrapper(row.getValue().message()));
@@ -122,38 +123,25 @@ protected void updateItem(String item, boolean empty) {
                     return;
                 }
                 IntegrityMessage rowData = getTableRow().getItem();
-                configureButton(rowData);
+                configureAction(rowData);
             }
 
-            private void configureButton(IntegrityMessage rowData) {
-                switch (rowData.field()) {
-                    case StandardField.URLDATE:
-                        configureButton("Remove field", () -> {
-                            viewModel.fix(StandardField.URLDATE, rowData, "Field removed successfully");
-                            removeRowFromTable(rowData);
-                        });
-                        break;
-                    case StandardField.TITLE:
-                        configureButton(Localization.lang("Fix"), () -> {
-                            viewModel.fix(StandardField.TITLE, rowData, "Masked capital letters using curly brackets {}");
-                            removeRowFromTable(rowData);
-                        });
-                        break;
-                    case InternalField.KEY_FIELD:
-                        configureButton(Localization.lang("Generate Key"), () -> {
-                            viewModel.fix(InternalField.KEY_FIELD, rowData, null);
-                            removeRowFromTable(rowData);
-                        });
-                        break;
-                    default:
-                        setGraphic(null);
-                        return;
+            private void configureAction(IntegrityMessage message) {
+                Optional<IntegrityIssue> issue = IntegrityIssue.fromField(message.field());
+                if (issue.isPresent()) {
+                    configureButton("Fix", () -> {
+                        viewModel.fix(issue.get(), message);
+                        removeRowFromTable(message);
+                    });
+                    setGraphic(button);
+                    return;
                 }
-                setGraphic(button);
+                setGraphic(null);
             }
 
             private void configureButton(String text, Runnable action) {
                 button.setText(text);
+                button.setPrefHeight(20.0);
                 button.setOnAction(event -> action.run());
             }
         });
@@ -207,8 +195,16 @@ private void removeRowFromTable(IntegrityMessage message) {
     }
 
     private void updateEntryTypeCombo() {
-        entryTypeCombo.getItems().setAll(viewModel.getEntryTypes());
-        entryTypeCombo.getSelectionModel().selectFirst();
+        Set<Field> entryTypes = viewModel.getEntryTypes();
+        entryTypeCombo.getItems().clear();
+
+        Arrays.stream(IntegrityIssue.values())
+              .filter(issue -> entryTypes.contains(issue.getField()))
+              .forEach(issue -> entryTypeCombo.getItems().add(issue.getText()));
+
+        if (!entryTypeCombo.getItems().isEmpty()) {
+            entryTypeCombo.getSelectionModel().selectFirst();
+        }
     }
 
     @FXML
@@ -216,20 +212,18 @@ private void fixByType() {
         String selectedType = entryTypeCombo.getSelectionModel().getSelectedItem();
         boolean isFixed = false;
 
-        for (IntegrityMessage message : messages) {
-            if (message.field().getDisplayName().equals(selectedType)) {
-                if (selectedType.equals(StandardField.TITLE.getDisplayName())) {
-                    viewModel.fix(StandardField.URLDATE, message, Localization.lang("Masked capital letters using curly brackets {}"));
-                } else if (selectedType.equals(StandardField.URLDATE.getDisplayName())) {
-                    viewModel.fix(StandardField.TITLE, message, Localization.lang("Field removed successfully!"));
-                } else if (selectedType.equals(InternalField.KEY_FIELD.getDisplayName())) {
-                    viewModel.fix(InternalField.KEY_FIELD, message, null);
-                } else {
-                    continue;
+        Optional<IntegrityIssue> selectedIssue = Arrays.stream(IntegrityIssue.values())
+                                                       .filter(issue -> issue.getText().equals(selectedType))
+                                                       .findFirst();
+
+        if (selectedIssue.isPresent()) {
+            for (IntegrityMessage message : messages) {
+                if (message.field().equals(selectedIssue.get().getField())) {
+                    viewModel.fix(selectedIssue.get(), message);
+                    removeRowFromTable(message);
+                    viewModel.removeFromEntryTypes(message.field().getDisplayName());
+                    isFixed = true;
                 }
-                removeRowFromTable(message);
-                viewModel.removeFromEntryTypes(message.field().getDisplayName());
-                isFixed = true;
             }
         }
 
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
index 3c2fdcd481f..7a2a807bca5 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
@@ -22,7 +22,6 @@
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
 
 public class IntegrityCheckDialogViewModel extends AbstractViewModel {
@@ -35,7 +34,7 @@ public class IntegrityCheckDialogViewModel extends AbstractViewModel {
     private final UndoManager undoManager;
 
     private final ObservableList<IntegrityMessage> messages;
-    private final ObservableSet<String> entryTypes;
+    private final ObservableSet<Field> entryTypes;
 
     public IntegrityCheckDialogViewModel(List<IntegrityMessage> messages,
                                          Supplier<LibraryTab> tabSupplier,
@@ -52,8 +51,8 @@ public IntegrityCheckDialogViewModel(List<IntegrityMessage> messages,
         this.preferences = preferences;
         this.undoManager = undoManager;
 
-        Set<String> types = messages.stream()
-                                    .map(item -> item.field().getDisplayName())
+        Set<Field> types = messages.stream()
+                                    .map(IntegrityMessage::field)
                                     .collect(Collectors.toSet());
         this.entryTypes = FXCollections.observableSet(types);
     }
@@ -62,7 +61,7 @@ public ObservableList<IntegrityMessage> getMessages() {
         return messages;
     }
 
-    public Set<String> getEntryTypes() {
+    public Set<Field> getEntryTypes() {
         return entryTypes;
     }
 
@@ -70,26 +69,35 @@ public void removeFromEntryTypes(String entry) {
         entryTypes.remove(entry);
     }
 
-    public void fix(Field field, IntegrityMessage message, String text) {
+    public void fix(IntegrityIssue issue, IntegrityMessage message) {
         boolean fixed = true;
 
-        switch (field) {
-            case StandardField.TITLE:
-                fixTitle(message);
+        switch (issue) {
+            case CAPITAL_LETTER_ARE_NOT_MASKED_USING_CURLY_BRACKETS:
+                if (issue.getField().equals(StandardField.TITLE)) {
+                    fixTitle(message);
+                    return;
+                }
                 break;
-            case StandardField.URLDATE:
-                fixBiblatexFieldOnly(message);
+            case BIBTEX_FIELD_ONLY_KEY, BIBTEX_FIELD_ONLY_CROSS_REF:
+                removeField(message, issue.getField());
                 break;
-            case InternalField.KEY_FIELD:
+            case CITATION_KEY_DEVIATES_FROM_GENERATED_KEY:
                 new GenerateCitationKeyAction(tabSupplier, dialogService, stateManager, taskExecutor, preferences, undoManager).execute();
                 break;
+            case INCORRECT_FORMAT:
+                if (issue.getField().equals(StandardField.ISSN)) {
+                    dialogService.notify("fixed issn");
+                    return;
+                }
+                break;
             default:
                 fixed = false;
                 break;
         }
 
-        if (fixed && text != null) {
-            dialogService.notify(text);
+         if (fixed) {
+            dialogService.notify("Fixed the issue");
         }
     }
 
@@ -108,9 +116,10 @@ public void fixTitle(IntegrityMessage message) {
         message.entry().setField(fields);
     }
 
-    public void fixBiblatexFieldOnly(IntegrityMessage message) {
+    public void removeField(IntegrityMessage message, Field
+        field) {
         Map<Field, String> fields = new HashMap<>();
-        fields.put(StandardField.URLDATE, "");
+        fields.put(field, "");
         message.entry().setField(fields);
     }
 }
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityIssue.java b/src/main/java/org/jabref/gui/integrity/IntegrityIssue.java
new file mode 100644
index 00000000000..2a28c37b922
--- /dev/null
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityIssue.java
@@ -0,0 +1,43 @@
+package org.jabref.gui.integrity;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.InternalField;
+import org.jabref.model.entry.field.StandardField;
+
+public enum IntegrityIssue {
+    CITATION_KEY_DEVIATES_FROM_GENERATED_KEY(InternalField.KEY_FIELD, "citation key deviates from generated key"),
+    BIBTEX_FIELD_ONLY_KEY(InternalField.KEY_FIELD, "bibtex field only"),
+    BIBTEX_FIELD_ONLY_CROSS_REF(StandardField.CROSSREF, "bibtex field only"),
+    INCORRECT_FORMAT(StandardField.ISSN, "incorrect format"),
+    JOURNAL_NOT_FOUND_IN_ABBREVIATION_LIST(StandardField.JOURNAL, "journal not found in the abbreviation list"),
+    NO_INTEGER_AS_VALUE_FOR_EDITION_ALLOWED(StandardField.EDITION, "no integer as value for edition allowed"),
+    REFERENCED_CITATION_KEY_DOES_NOT_EXIST(StandardField.CROSSREF, "referenced citation key does ont exist"),
+    NON_ASCII_ENCODED_CHARACTER_FOUND(StandardField.ABSTRACT, "Non-Ascii encoded character found"),
+    SHOULD_CONTAIN_A_VALID_PAGE_NUMBER_RANGE(StandardField.PAGES, "should contain a valid page number range"),
+    CAPITAL_LETTER_ARE_NOT_MASKED_USING_CURLY_BRACKETS(StandardField.TITLE, "capital letters are not masked using curly brackets {}");
+
+    private final Field field;
+    private final String text;
+
+    IntegrityIssue(Field field, String text) {
+        this.field = field;
+        this.text = text;
+    }
+
+    public Field getField() {
+        return field;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public static Optional<IntegrityIssue> fromField(Field field) {
+        return Arrays.stream(IntegrityIssue.values())
+                     .filter(symbol -> symbol.getField().equals(field))
+                     .findFirst();
+    }
+}
diff --git a/src/main/java/org/jabref/logic/integrity/DateChecker.java b/src/main/java/org/jabref/logic/integrity/DateChecker.java
index a79e37994e8..67f4cdfa518 100644
--- a/src/main/java/org/jabref/logic/integrity/DateChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/DateChecker.java
@@ -2,7 +2,7 @@
 
 import java.util.Optional;
 
-import org.jabref.logic.l10n.Localization;
+import org.jabref.gui.integrity.IntegrityIssue;
 import org.jabref.model.entry.Date;
 import org.jabref.model.strings.StringUtil;
 
@@ -16,7 +16,7 @@ public Optional<String> checkValue(String value) {
 
         Optional<Date> parsedDate = Date.parse(value);
         if (parsedDate.isEmpty()) {
-            return Optional.of(Localization.lang("incorrect format"));
+            return Optional.of(IntegrityIssue.INCORRECT_FORMAT.getText());
         }
 
         return Optional.empty();

From 30c81cee6b1e9fedc4dc641651c9397156e78d1b Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Thu, 20 Feb 2025 16:47:41 +0530
Subject: [PATCH 09/30] Make use of IntegrityIssue enum

---
 .../gui/integrity/IntegrityCheckDialog.fxml   |  6 ++--
 .../gui/integrity/IntegrityCheckDialog.java   | 15 ++--------
 .../IntegrityCheckDialogViewModel.java        | 17 ++---------
 .../jabref/gui/integrity/IntegrityIssue.java  | 28 +++++++++++++++----
 .../integrity/ASCIICharacterChecker.java      |  4 +--
 .../jabref/logic/integrity/DateChecker.java   |  2 +-
 .../logic/integrity/EditionChecker.java       |  7 +++--
 .../logic/integrity/EntryLinkChecker.java     |  4 +--
 .../jabref/logic/integrity/ISBNChecker.java   |  6 ++--
 .../jabref/logic/integrity/ISSNChecker.java   |  6 ++--
 .../jabref/logic/integrity/PagesChecker.java  |  4 +--
 .../jabref/logic/integrity/TitleChecker.java  |  4 +--
 12 files changed, 49 insertions(+), 54 deletions(-)

diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml
index 1691749e670..00364c979c5 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml
@@ -14,12 +14,12 @@
             xmlns="http://javafx.com/javafx/8.0.121" fx:controller="org.jabref.gui.integrity.IntegrityCheckDialog">
     <content>
         <VBox spacing="10.0">
-            <TableView fx:id="messagesTable" prefHeight="550" prefWidth="700.0" VBox.vgrow="ALWAYS" HBox.hgrow="ALWAYS">
+            <TableView fx:id="messagesTable" prefHeight="550" prefWidth="750.0" VBox.vgrow="ALWAYS" HBox.hgrow="ALWAYS">
                 <columns>
                     <TableColumn fx:id="keyColumn" prefWidth="150.0" maxWidth="200"  text="%Citation key"/>
-                    <TableColumn fx:id="fieldColumn" prefWidth="110.0" maxWidth="200" text="%Field"/>
+                    <TableColumn fx:id="fieldColumn" prefWidth="100.0" maxWidth="200" text="%Field"/>
                     <TableColumn fx:id="messageColumn" prefWidth="300" text="%Message"/>
-                    <TableColumn fx:id="fixesColumn" prefWidth="140.0" maxWidth="200" text="%Fixes"/>
+                    <TableColumn fx:id="fixesColumn" prefWidth="200.0" maxWidth="200" text="%Fixes"/>
                 </columns>
                 <columnResizePolicy>
                     <TableView fx:constant="CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN"/>
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
index b58bde56b72..8ccef940aac 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -128,8 +128,8 @@ protected void updateItem(String item, boolean empty) {
 
             private void configureAction(IntegrityMessage message) {
                 Optional<IntegrityIssue> issue = IntegrityIssue.fromField(message.field());
-                if (issue.isPresent()) {
-                    configureButton("Fix", () -> {
+                if (issue.isPresent() && issue.get().getFix() != null) {
+                    configureButton(issue.get().getFix(), () -> {
                         viewModel.fix(issue.get(), message);
                         removeRowFromTable(message);
                     });
@@ -210,29 +210,18 @@ private void updateEntryTypeCombo() {
     @FXML
     private void fixByType() {
         String selectedType = entryTypeCombo.getSelectionModel().getSelectedItem();
-        boolean isFixed = false;
-
         Optional<IntegrityIssue> selectedIssue = Arrays.stream(IntegrityIssue.values())
                                                        .filter(issue -> issue.getText().equals(selectedType))
                                                        .findFirst();
-
         if (selectedIssue.isPresent()) {
             for (IntegrityMessage message : messages) {
                 if (message.field().equals(selectedIssue.get().getField())) {
                     viewModel.fix(selectedIssue.get(), message);
                     removeRowFromTable(message);
                     viewModel.removeFromEntryTypes(message.field().getDisplayName());
-                    isFixed = true;
                 }
             }
         }
-
         updateEntryTypeCombo();
-
-        if (isFixed) {
-            dialogService.notify(Localization.lang("Fixed successfully!"));
-        } else {
-            dialogService.notify(Localization.lang("No fixes available!"));
-        }
     }
 }
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
index 7a2a807bca5..a649c3e3375 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
@@ -70,12 +70,10 @@ public void removeFromEntryTypes(String entry) {
     }
 
     public void fix(IntegrityIssue issue, IntegrityMessage message) {
-        boolean fixed = true;
-
         switch (issue) {
             case CAPITAL_LETTER_ARE_NOT_MASKED_USING_CURLY_BRACKETS:
                 if (issue.getField().equals(StandardField.TITLE)) {
-                    fixTitle(message);
+                    maskTitle(message);
                     return;
                 }
                 break;
@@ -85,23 +83,12 @@ public void fix(IntegrityIssue issue, IntegrityMessage message) {
             case CITATION_KEY_DEVIATES_FROM_GENERATED_KEY:
                 new GenerateCitationKeyAction(tabSupplier, dialogService, stateManager, taskExecutor, preferences, undoManager).execute();
                 break;
-            case INCORRECT_FORMAT:
-                if (issue.getField().equals(StandardField.ISSN)) {
-                    dialogService.notify("fixed issn");
-                    return;
-                }
-                break;
             default:
-                fixed = false;
                 break;
         }
-
-         if (fixed) {
-            dialogService.notify("Fixed the issue");
-        }
     }
 
-    public void fixTitle(IntegrityMessage message) {
+    public void maskTitle(IntegrityMessage message) {
         String title = message.entry().getTitle().get();
         StringBuilder result = new StringBuilder();
         for (char ch : title.toCharArray()) {
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityIssue.java b/src/main/java/org/jabref/gui/integrity/IntegrityIssue.java
index 2a28c37b922..59467581d70 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityIssue.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityIssue.java
@@ -8,23 +8,37 @@
 import org.jabref.model.entry.field.StandardField;
 
 public enum IntegrityIssue {
-    CITATION_KEY_DEVIATES_FROM_GENERATED_KEY(InternalField.KEY_FIELD, "citation key deviates from generated key"),
-    BIBTEX_FIELD_ONLY_KEY(InternalField.KEY_FIELD, "bibtex field only"),
-    BIBTEX_FIELD_ONLY_CROSS_REF(StandardField.CROSSREF, "bibtex field only"),
-    INCORRECT_FORMAT(StandardField.ISSN, "incorrect format"),
+    CITATION_KEY_DEVIATES_FROM_GENERATED_KEY(InternalField.KEY_FIELD, "citation key deviates from generated key", "Generate Citation Key"),
+    BIBTEX_FIELD_ONLY_KEY(InternalField.KEY_FIELD, "bibtex field only", "Remove Field"),
+    BIBTEX_FIELD_ONLY_CROSS_REF(StandardField.CROSSREF, "bibtex field only", "Remove Field"),
+    INCORRECT_FORMAT_DATE(StandardField.DATE, "incorrect format"),
+    INCORRECT_FORMAT_ISSN(StandardField.ISSN, "incorrect format"),
+    INCORRECT_CONTROL_DIGIT_ISSN(StandardField.ISSN, "incorrect control digit"),
+    INCORRECT_FORMAT_ISBN(StandardField.ISBN, "incorrect format"),
+    INCORRECT_CONTROL_DIGIT_ISBN(StandardField.ISBN, "incorrect control digit"),
     JOURNAL_NOT_FOUND_IN_ABBREVIATION_LIST(StandardField.JOURNAL, "journal not found in the abbreviation list"),
     NO_INTEGER_AS_VALUE_FOR_EDITION_ALLOWED(StandardField.EDITION, "no integer as value for edition allowed"),
+    SHOULD_CONTAIN_AN_INTEGER_OR_A_LITERAL(StandardField.EDITION, "should contain an integer or a literal"),
+    SHOULD_HAVE_THE_FIRST_LETTER_CAPITALIZED(StandardField.EDITION, "should have the first letter capitalized"),
     REFERENCED_CITATION_KEY_DOES_NOT_EXIST(StandardField.CROSSREF, "referenced citation key does ont exist"),
     NON_ASCII_ENCODED_CHARACTER_FOUND(StandardField.ABSTRACT, "Non-Ascii encoded character found"),
     SHOULD_CONTAIN_A_VALID_PAGE_NUMBER_RANGE(StandardField.PAGES, "should contain a valid page number range"),
-    CAPITAL_LETTER_ARE_NOT_MASKED_USING_CURLY_BRACKETS(StandardField.TITLE, "capital letters are not masked using curly brackets {}");
+    CAPITAL_LETTER_ARE_NOT_MASKED_USING_CURLY_BRACKETS(StandardField.TITLE, "capital letters are not masked using curly brackets {}", "Mask letters");
 
     private final Field field;
     private final String text;
+    private final String fix;
+
+    IntegrityIssue(Field field, String text, String fix) {
+        this.field = field;
+        this.text = text;
+        this.fix = fix;
+    }
 
     IntegrityIssue(Field field, String text) {
         this.field = field;
         this.text = text;
+        this.fix = null;
     }
 
     public Field getField() {
@@ -35,6 +49,10 @@ public String getText() {
         return text;
     }
 
+    public String getFix() {
+        return fix;
+    }
+
     public static Optional<IntegrityIssue> fromField(Field field) {
         return Arrays.stream(IntegrityIssue.values())
                      .filter(symbol -> symbol.getField().equals(field))
diff --git a/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java b/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java
index 4072b35b8b9..28b9cace0ff 100644
--- a/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java
@@ -4,7 +4,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jabref.logic.l10n.Localization;
+import org.jabref.gui.integrity.IntegrityIssue;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
@@ -21,7 +21,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
         for (Map.Entry<Field, String> field : entry.getFieldMap().entrySet()) {
             boolean asciiOnly = CharMatcher.ascii().matchesAllOf(field.getValue());
             if (!asciiOnly) {
-                results.add(new IntegrityMessage(Localization.lang("Non-ASCII encoded character found"), entry,
+                results.add(new IntegrityMessage(IntegrityIssue.NON_ASCII_ENCODED_CHARACTER_FOUND.getText(), entry,
                         field.getKey()));
             }
         }
diff --git a/src/main/java/org/jabref/logic/integrity/DateChecker.java b/src/main/java/org/jabref/logic/integrity/DateChecker.java
index 67f4cdfa518..6581fa180d2 100644
--- a/src/main/java/org/jabref/logic/integrity/DateChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/DateChecker.java
@@ -16,7 +16,7 @@ public Optional<String> checkValue(String value) {
 
         Optional<Date> parsedDate = Date.parse(value);
         if (parsedDate.isEmpty()) {
-            return Optional.of(IntegrityIssue.INCORRECT_FORMAT.getText());
+            return Optional.of(IntegrityIssue.INCORRECT_FORMAT_DATE.getText());
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/EditionChecker.java b/src/main/java/org/jabref/logic/integrity/EditionChecker.java
index 3fb6ec5b89b..81a0d2dc2a0 100644
--- a/src/main/java/org/jabref/logic/integrity/EditionChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/EditionChecker.java
@@ -5,6 +5,7 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
+import org.jabref.gui.integrity.IntegrityIssue;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.strings.StringUtil;
@@ -46,15 +47,15 @@ public Optional<String> checkValue(String value) {
 
         if (bibDatabaseContextEdition.isBiblatexMode()) {
             if (!ONLY_NUMERALS_OR_LITERALS.test(value.trim())) {
-                return Optional.of(Localization.lang("should contain an integer or a literal"));
+                return Optional.of(IntegrityIssue.SHOULD_CONTAIN_AN_INTEGER_OR_A_LITERAL.getText());
             }
         } else {
             if (ONLY_NUMERALS.test(value) && (!allowIntegerEdition)) {
-                return Optional.of(Localization.lang("no integer as values for edition allowed"));
+                return Optional.of(IntegrityIssue.NO_INTEGER_AS_VALUE_FOR_EDITION_ALLOWED.getText());
             }
         }
         if (!isFirstCharDigit(value) && !FIRST_LETTER_CAPITALIZED.test(value.trim())) {
-            return Optional.of(Localization.lang("should have the first letter capitalized"));
+            return Optional.of(IntegrityIssue.SHOULD_HAVE_THE_FIRST_LETTER_CAPITALIZED.getText());
         }
         return Optional.empty();
     }
diff --git a/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java b/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java
index 8827e8a2169..762e9d618b9 100644
--- a/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java
@@ -6,7 +6,7 @@
 import java.util.Objects;
 import java.util.Set;
 
-import org.jabref.logic.l10n.Localization;
+import org.jabref.gui.integrity.IntegrityIssue;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
@@ -29,7 +29,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
                 entry.getEntryLinkList(field.getKey(), database).stream()
                      .filter(parsedEntryLink -> parsedEntryLink.getLinkedEntry().isEmpty())
                      .forEach(parsedEntryLink -> result.add(new IntegrityMessage(
-                             Localization.lang("Referenced citation key '%0' does not exist", parsedEntryLink.getKey()),
+                             IntegrityIssue.REFERENCED_CITATION_KEY_DOES_NOT_EXIST.getText(),
                              entry, field.getKey())));
             }
         }
diff --git a/src/main/java/org/jabref/logic/integrity/ISBNChecker.java b/src/main/java/org/jabref/logic/integrity/ISBNChecker.java
index c774dc9148a..f23b90be034 100644
--- a/src/main/java/org/jabref/logic/integrity/ISBNChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/ISBNChecker.java
@@ -2,7 +2,7 @@
 
 import java.util.Optional;
 
-import org.jabref.logic.l10n.Localization;
+import org.jabref.gui.integrity.IntegrityIssue;
 import org.jabref.model.entry.identifier.ISBN;
 import org.jabref.model.strings.StringUtil;
 
@@ -18,11 +18,11 @@ public Optional<String> checkValue(String value) {
         ISBN isbn = new ISBN(value);
 
         if (!isbn.isValidFormat()) {
-            return Optional.of(Localization.lang("incorrect format"));
+            return Optional.of(IntegrityIssue.INCORRECT_FORMAT_ISBN.getText());
         }
 
         if (!isbn.isValidChecksum()) {
-            return Optional.of(Localization.lang("incorrect control digit"));
+            return Optional.of(IntegrityIssue.INCORRECT_CONTROL_DIGIT_ISBN.getText());
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/ISSNChecker.java b/src/main/java/org/jabref/logic/integrity/ISSNChecker.java
index f7205d195b5..aa2002d3269 100644
--- a/src/main/java/org/jabref/logic/integrity/ISSNChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/ISSNChecker.java
@@ -2,7 +2,7 @@
 
 import java.util.Optional;
 
-import org.jabref.logic.l10n.Localization;
+import org.jabref.gui.integrity.IntegrityIssue;
 import org.jabref.model.entry.identifier.ISSN;
 import org.jabref.model.strings.StringUtil;
 
@@ -19,11 +19,11 @@ public Optional<String> checkValue(String value) {
 
         ISSN issn = new ISSN(issnString);
         if (!issn.isValidFormat()) {
-            return Optional.of(Localization.lang("incorrect format"));
+            return Optional.of(IntegrityIssue.INCORRECT_FORMAT_ISSN.getText());
         }
 
         if (!issn.isValidChecksum()) {
-            return Optional.of(Localization.lang("incorrect control digit"));
+            return Optional.of(IntegrityIssue.INCORRECT_CONTROL_DIGIT_ISSN.getText());
         }
         return Optional.empty();
     }
diff --git a/src/main/java/org/jabref/logic/integrity/PagesChecker.java b/src/main/java/org/jabref/logic/integrity/PagesChecker.java
index d21caa310ff..1d99c0bcdec 100644
--- a/src/main/java/org/jabref/logic/integrity/PagesChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/PagesChecker.java
@@ -5,7 +5,7 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.l10n.Localization;
+import org.jabref.gui.integrity.IntegrityIssue;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.strings.StringUtil;
 
@@ -58,7 +58,7 @@ public Optional<String> checkValue(String value) {
         if (Arrays.stream(value.split(","))
                 .map(String::trim)
                 .anyMatch(pageRange -> !isValidPageNumber.test(pageRange))) {
-            return Optional.of(Localization.lang("should contain a valid page number range"));
+            return Optional.of(IntegrityIssue.SHOULD_CONTAIN_A_VALID_PAGE_NUMBER_RANGE.getText());
         }
         return Optional.empty();
     }
diff --git a/src/main/java/org/jabref/logic/integrity/TitleChecker.java b/src/main/java/org/jabref/logic/integrity/TitleChecker.java
index 824c8673f46..8c50119382f 100644
--- a/src/main/java/org/jabref/logic/integrity/TitleChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/TitleChecker.java
@@ -4,7 +4,7 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.l10n.Localization;
+import org.jabref.gui.integrity.IntegrityIssue;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.strings.StringUtil;
 
@@ -48,7 +48,7 @@ public Optional<String> checkValue(String value) {
             if (!subTitle.isEmpty()) {
                 subTitle = subTitle.substring(1);
                 if (HAS_CAPITAL_LETTERS.test(subTitle)) {
-                    return Optional.of(Localization.lang("capital letters are not masked using curly brackets {}"));
+                    return Optional.of(IntegrityIssue.CAPITAL_LETTER_ARE_NOT_MASKED_USING_CURLY_BRACKETS.getText());
                 }
             }
         }

From 5b389da8636fc4828f2b16141dcdd45dfb726696 Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Thu, 20 Feb 2025 17:11:41 +0530
Subject: [PATCH 10/30] Add keys in Localization.lang

---
 .../jabref/gui/integrity/IntegrityIssue.java  | 33 ++++++++++---------
 .../CitationKeyDeviationChecker.java          |  4 +--
 src/main/resources/l10n/JabRef_en.properties  | 12 +++----
 3 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityIssue.java b/src/main/java/org/jabref/gui/integrity/IntegrityIssue.java
index 59467581d70..8552f71dfd3 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityIssue.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityIssue.java
@@ -3,27 +3,28 @@
 import java.util.Arrays;
 import java.util.Optional;
 
+import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
 
 public enum IntegrityIssue {
-    CITATION_KEY_DEVIATES_FROM_GENERATED_KEY(InternalField.KEY_FIELD, "citation key deviates from generated key", "Generate Citation Key"),
-    BIBTEX_FIELD_ONLY_KEY(InternalField.KEY_FIELD, "bibtex field only", "Remove Field"),
-    BIBTEX_FIELD_ONLY_CROSS_REF(StandardField.CROSSREF, "bibtex field only", "Remove Field"),
-    INCORRECT_FORMAT_DATE(StandardField.DATE, "incorrect format"),
-    INCORRECT_FORMAT_ISSN(StandardField.ISSN, "incorrect format"),
-    INCORRECT_CONTROL_DIGIT_ISSN(StandardField.ISSN, "incorrect control digit"),
-    INCORRECT_FORMAT_ISBN(StandardField.ISBN, "incorrect format"),
-    INCORRECT_CONTROL_DIGIT_ISBN(StandardField.ISBN, "incorrect control digit"),
-    JOURNAL_NOT_FOUND_IN_ABBREVIATION_LIST(StandardField.JOURNAL, "journal not found in the abbreviation list"),
-    NO_INTEGER_AS_VALUE_FOR_EDITION_ALLOWED(StandardField.EDITION, "no integer as value for edition allowed"),
-    SHOULD_CONTAIN_AN_INTEGER_OR_A_LITERAL(StandardField.EDITION, "should contain an integer or a literal"),
-    SHOULD_HAVE_THE_FIRST_LETTER_CAPITALIZED(StandardField.EDITION, "should have the first letter capitalized"),
-    REFERENCED_CITATION_KEY_DOES_NOT_EXIST(StandardField.CROSSREF, "referenced citation key does ont exist"),
-    NON_ASCII_ENCODED_CHARACTER_FOUND(StandardField.ABSTRACT, "Non-Ascii encoded character found"),
-    SHOULD_CONTAIN_A_VALID_PAGE_NUMBER_RANGE(StandardField.PAGES, "should contain a valid page number range"),
-    CAPITAL_LETTER_ARE_NOT_MASKED_USING_CURLY_BRACKETS(StandardField.TITLE, "capital letters are not masked using curly brackets {}", "Mask letters");
+    CITATION_KEY_DEVIATES_FROM_GENERATED_KEY(InternalField.KEY_FIELD, Localization.lang("Citation key deviates from generated key"), Localization.lang("Generate key")),
+    BIBTEX_FIELD_ONLY_KEY(InternalField.KEY_FIELD, Localization.lang("bibtex field only"), Localization.lang("Remove field")),
+    BIBTEX_FIELD_ONLY_CROSS_REF(StandardField.CROSSREF, Localization.lang("bibtex field only"), Localization.lang("Remove field")),
+    INCORRECT_FORMAT_DATE(StandardField.DATE, Localization.lang("incorrect format")),
+    INCORRECT_FORMAT_ISSN(StandardField.ISSN, Localization.lang("incorrect format")),
+    INCORRECT_CONTROL_DIGIT_ISSN(StandardField.ISSN, Localization.lang("incorrect control digit")),
+    INCORRECT_FORMAT_ISBN(StandardField.ISBN, Localization.lang("incorrect format")),
+    INCORRECT_CONTROL_DIGIT_ISBN(StandardField.ISBN, Localization.lang("incorrect control digit")),
+    JOURNAL_NOT_FOUND_IN_ABBREVIATION_LIST(StandardField.JOURNAL, Localization.lang("journal not found in abbreviation list")),
+    NO_INTEGER_AS_VALUE_FOR_EDITION_ALLOWED(StandardField.EDITION, Localization.lang("no integer as values for edition allowed")),
+    SHOULD_CONTAIN_AN_INTEGER_OR_A_LITERAL(StandardField.EDITION, Localization.lang("should contain an integer or a literal")),
+    SHOULD_HAVE_THE_FIRST_LETTER_CAPITALIZED(StandardField.EDITION, Localization.lang("should have the first letter capitalized")),
+    REFERENCED_CITATION_KEY_DOES_NOT_EXIST(StandardField.CROSSREF, Localization.lang("Referenced citation key does not exist")),
+    NON_ASCII_ENCODED_CHARACTER_FOUND(StandardField.ABSTRACT, Localization.lang("Non-ASCII encoded character found")),
+    SHOULD_CONTAIN_A_VALID_PAGE_NUMBER_RANGE(StandardField.PAGES, Localization.lang("should contain a valid page number range")),
+    CAPITAL_LETTER_ARE_NOT_MASKED_USING_CURLY_BRACKETS(StandardField.TITLE, Localization.lang("capital letters are not masked using curly brackets {}"), Localization.lang("Mask letters"));
 
     private final Field field;
     private final String text;
diff --git a/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java b/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java
index 47d7bff811a..f35841b56f6 100644
--- a/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java
@@ -5,9 +5,9 @@
 import java.util.Objects;
 import java.util.Optional;
 
+import org.jabref.gui.integrity.IntegrityIssue;
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.InternalField;
@@ -36,7 +36,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
 
         if (!Objects.equals(key, generatedKey)) {
             return Collections.singletonList(new IntegrityMessage(
-                    Localization.lang("Citation key deviates from generated key"), entry, InternalField.KEY_FIELD));
+                    IntegrityIssue.CITATION_KEY_DEVIATES_FROM_GENERATED_KEY.getText(), entry, InternalField.KEY_FIELD));
         }
 
         return Collections.emptyList();
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index a6daf07fb10..58cb3547eff 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1411,6 +1411,7 @@ unexpected\ opening\ curly\ bracket=unexpected opening curly bracket
 capital\ letters\ are\ not\ masked\ using\ curly\ brackets\ {}=capital letters are not masked using curly brackets {}
 should\ contain\ a\ four\ digit\ number=should contain a four digit number
 should\ contain\ a\ valid\ page\ number\ range=should contain a valid page number range
+Mask\ letters=Mask letters
 
 Unable\ to\ autodetect\ OpenOffice/LibreOffice\ installation.\ Please\ choose\ the\ installation\ directory\ manually.=Unable to autodetect OpenOffice/LibreOffice installation. Please choose the installation directory manually.
 
@@ -1839,7 +1840,7 @@ Entered\ database\ has\ obsolete\ structure\ and\ is\ no\ longer\ supported.=Ent
 However,\ a\ new\ database\ was\ created\ alongside\ the\ pre-3.6\ one.=However, a new database was created alongside the pre-3.6 one.
 Opens\ a\ link\ where\ the\ current\ development\ version\ can\ be\ downloaded=Opens a link where the current development version can be downloaded
 See\ what\ has\ been\ changed\ in\ the\ JabRef\ versions=See what has been changed in the JabRef versions
-Referenced\ citation\ key\ '%0'\ does\ not\ exist=Referenced citation key '%0' does not exist
+Referenced\ citation\ key\ does\ not\ exist=Referenced citation key does not exist
 Full\ text\ document\ for\ entry\ %0\ already\ linked.=Full text document for entry %0 already linked.
 Download\ full\ text\ documents=Download full text documents
 You\ are\ attempting\ to\ download\ full\ text\ documents\ for\ %0\ entries.\nJabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=You are attempting to download full text documents for %0 entries.\nJabRef will send at least one request per entry to a publisher.
@@ -1896,6 +1897,7 @@ Different\ customization,\ current\ settings\ will\ be\ overwritten=Different cu
 %0\ (from\ file)\n%1\ (current\ setting)=%0 (from file)\n%1 (current setting)
 
 Entry\ type\ %0\ is\ only\ defined\ for\ Biblatex\ but\ not\ for\ BibTeX=Entry type %0 is only defined for Biblatex but not for BibTeX
+bibtex\ field\ only=bibtex field only
 
 Copied\ %0\ citations.=Copied %0 citations.
 
@@ -2189,15 +2191,10 @@ Grobid=Grobid
 Citation\ key\ filters=Citation key filters
 Field\ filters=Field filters
 Message\ filters=Message filters
-Fix=Fix
 Fixes=Fixes
 Fix\ all=Fix all
 Fix\ by\ type=Fix by type
-Generate\ Key=Generate Key
-Field\ removed\ successfully!=Field removed successfully!
-Masked\ capital\ letters\ using\ curly\ brackets\ {}=Masked capital letters using curly brackets {}
-Fixed\ successfully!=Fixed successfully!
-No\ fixes\ available!=No fixes available!
+Generate\ key=Generate key
 
 Add\ new\ Field=Add new Field
 Add\ new\ entry\ type=Add new entry type
@@ -2209,6 +2206,7 @@ Optional=Optional
 Required=Required
 Entry\ type\ cannot\ be\ empty.\ Please\ enter\ a\ name.=Entry type cannot be empty. Please enter a name.
 Field\ cannot\ be\ empty.\ Please\ enter\ a\ name.=Field cannot be empty. Please enter a name.
+Remove\ field=Remove field
 
 Capitalize\ current\ word=Capitalize current word
 Delete\ text=Delete text

From 3a0d9a1997cbe8dfb2992e9813e26fccf3920b18 Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Thu, 20 Feb 2025 22:04:35 +0530
Subject: [PATCH 11/30] Refactor the code

---
 .../java/org/jabref/gui/integrity/IntegrityCheckDialog.java   | 3 +++
 src/main/java/org/jabref/logic/integrity/DateChecker.java     | 4 ++--
 src/main/resources/l10n/JabRef_en.properties                  | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
index 8ccef940aac..f79ac62be4e 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.integrity;
 
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -196,10 +197,12 @@ private void removeRowFromTable(IntegrityMessage message) {
 
     private void updateEntryTypeCombo() {
         Set<Field> entryTypes = viewModel.getEntryTypes();
+        Set<String> uniqueTexts = new HashSet<>();
         entryTypeCombo.getItems().clear();
 
         Arrays.stream(IntegrityIssue.values())
               .filter(issue -> entryTypes.contains(issue.getField()))
+              .filter(issue -> uniqueTexts.add(issue.getText()))
               .forEach(issue -> entryTypeCombo.getItems().add(issue.getText()));
 
         if (!entryTypeCombo.getItems().isEmpty()) {
diff --git a/src/main/java/org/jabref/logic/integrity/DateChecker.java b/src/main/java/org/jabref/logic/integrity/DateChecker.java
index 6581fa180d2..a79e37994e8 100644
--- a/src/main/java/org/jabref/logic/integrity/DateChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/DateChecker.java
@@ -2,7 +2,7 @@
 
 import java.util.Optional;
 
-import org.jabref.gui.integrity.IntegrityIssue;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.Date;
 import org.jabref.model.strings.StringUtil;
 
@@ -16,7 +16,7 @@ public Optional<String> checkValue(String value) {
 
         Optional<Date> parsedDate = Date.parse(value);
         if (parsedDate.isEmpty()) {
-            return Optional.of(IntegrityIssue.INCORRECT_FORMAT_DATE.getText());
+            return Optional.of(Localization.lang("incorrect format"));
         }
 
         return Optional.empty();
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 58cb3547eff..53f0eeca65b 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1840,6 +1840,7 @@ Entered\ database\ has\ obsolete\ structure\ and\ is\ no\ longer\ supported.=Ent
 However,\ a\ new\ database\ was\ created\ alongside\ the\ pre-3.6\ one.=However, a new database was created alongside the pre-3.6 one.
 Opens\ a\ link\ where\ the\ current\ development\ version\ can\ be\ downloaded=Opens a link where the current development version can be downloaded
 See\ what\ has\ been\ changed\ in\ the\ JabRef\ versions=See what has been changed in the JabRef versions
+Referenced\ citation\ key\ '%0'\ does\ not\ exist=Referenced citation key '%0' does not exist
 Referenced\ citation\ key\ does\ not\ exist=Referenced citation key does not exist
 Full\ text\ document\ for\ entry\ %0\ already\ linked.=Full text document for entry %0 already linked.
 Download\ full\ text\ documents=Download full text documents

From a04e06adff0e959afffa2fcafcd83c176b135d0e Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Thu, 20 Feb 2025 22:16:00 +0530
Subject: [PATCH 12/30] Remove use of enum

---
 .../org/jabref/logic/integrity/ASCIICharacterChecker.java  | 4 ++--
 .../logic/integrity/CitationKeyDeviationChecker.java       | 4 ++--
 .../java/org/jabref/logic/integrity/EditionChecker.java    | 7 +++----
 .../java/org/jabref/logic/integrity/EntryLinkChecker.java  | 4 ++--
 src/main/java/org/jabref/logic/integrity/ISBNChecker.java  | 6 +++---
 src/main/java/org/jabref/logic/integrity/ISSNChecker.java  | 6 +++---
 src/main/java/org/jabref/logic/integrity/TitleChecker.java | 4 ++--
 7 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java b/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java
index 28b9cace0ff..4072b35b8b9 100644
--- a/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java
@@ -4,7 +4,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jabref.gui.integrity.IntegrityIssue;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
@@ -21,7 +21,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
         for (Map.Entry<Field, String> field : entry.getFieldMap().entrySet()) {
             boolean asciiOnly = CharMatcher.ascii().matchesAllOf(field.getValue());
             if (!asciiOnly) {
-                results.add(new IntegrityMessage(IntegrityIssue.NON_ASCII_ENCODED_CHARACTER_FOUND.getText(), entry,
+                results.add(new IntegrityMessage(Localization.lang("Non-ASCII encoded character found"), entry,
                         field.getKey()));
             }
         }
diff --git a/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java b/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java
index f35841b56f6..47d7bff811a 100644
--- a/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java
@@ -5,9 +5,9 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import org.jabref.gui.integrity.IntegrityIssue;
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.InternalField;
@@ -36,7 +36,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
 
         if (!Objects.equals(key, generatedKey)) {
             return Collections.singletonList(new IntegrityMessage(
-                    IntegrityIssue.CITATION_KEY_DEVIATES_FROM_GENERATED_KEY.getText(), entry, InternalField.KEY_FIELD));
+                    Localization.lang("Citation key deviates from generated key"), entry, InternalField.KEY_FIELD));
         }
 
         return Collections.emptyList();
diff --git a/src/main/java/org/jabref/logic/integrity/EditionChecker.java b/src/main/java/org/jabref/logic/integrity/EditionChecker.java
index 81a0d2dc2a0..3fb6ec5b89b 100644
--- a/src/main/java/org/jabref/logic/integrity/EditionChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/EditionChecker.java
@@ -5,7 +5,6 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import org.jabref.gui.integrity.IntegrityIssue;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.strings.StringUtil;
@@ -47,15 +46,15 @@ public Optional<String> checkValue(String value) {
 
         if (bibDatabaseContextEdition.isBiblatexMode()) {
             if (!ONLY_NUMERALS_OR_LITERALS.test(value.trim())) {
-                return Optional.of(IntegrityIssue.SHOULD_CONTAIN_AN_INTEGER_OR_A_LITERAL.getText());
+                return Optional.of(Localization.lang("should contain an integer or a literal"));
             }
         } else {
             if (ONLY_NUMERALS.test(value) && (!allowIntegerEdition)) {
-                return Optional.of(IntegrityIssue.NO_INTEGER_AS_VALUE_FOR_EDITION_ALLOWED.getText());
+                return Optional.of(Localization.lang("no integer as values for edition allowed"));
             }
         }
         if (!isFirstCharDigit(value) && !FIRST_LETTER_CAPITALIZED.test(value.trim())) {
-            return Optional.of(IntegrityIssue.SHOULD_HAVE_THE_FIRST_LETTER_CAPITALIZED.getText());
+            return Optional.of(Localization.lang("should have the first letter capitalized"));
         }
         return Optional.empty();
     }
diff --git a/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java b/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java
index 762e9d618b9..8827e8a2169 100644
--- a/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java
@@ -6,7 +6,7 @@
 import java.util.Objects;
 import java.util.Set;
 
-import org.jabref.gui.integrity.IntegrityIssue;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
@@ -29,7 +29,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
                 entry.getEntryLinkList(field.getKey(), database).stream()
                      .filter(parsedEntryLink -> parsedEntryLink.getLinkedEntry().isEmpty())
                      .forEach(parsedEntryLink -> result.add(new IntegrityMessage(
-                             IntegrityIssue.REFERENCED_CITATION_KEY_DOES_NOT_EXIST.getText(),
+                             Localization.lang("Referenced citation key '%0' does not exist", parsedEntryLink.getKey()),
                              entry, field.getKey())));
             }
         }
diff --git a/src/main/java/org/jabref/logic/integrity/ISBNChecker.java b/src/main/java/org/jabref/logic/integrity/ISBNChecker.java
index f23b90be034..c774dc9148a 100644
--- a/src/main/java/org/jabref/logic/integrity/ISBNChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/ISBNChecker.java
@@ -2,7 +2,7 @@
 
 import java.util.Optional;
 
-import org.jabref.gui.integrity.IntegrityIssue;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.identifier.ISBN;
 import org.jabref.model.strings.StringUtil;
 
@@ -18,11 +18,11 @@ public Optional<String> checkValue(String value) {
         ISBN isbn = new ISBN(value);
 
         if (!isbn.isValidFormat()) {
-            return Optional.of(IntegrityIssue.INCORRECT_FORMAT_ISBN.getText());
+            return Optional.of(Localization.lang("incorrect format"));
         }
 
         if (!isbn.isValidChecksum()) {
-            return Optional.of(IntegrityIssue.INCORRECT_CONTROL_DIGIT_ISBN.getText());
+            return Optional.of(Localization.lang("incorrect control digit"));
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/ISSNChecker.java b/src/main/java/org/jabref/logic/integrity/ISSNChecker.java
index aa2002d3269..f7205d195b5 100644
--- a/src/main/java/org/jabref/logic/integrity/ISSNChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/ISSNChecker.java
@@ -2,7 +2,7 @@
 
 import java.util.Optional;
 
-import org.jabref.gui.integrity.IntegrityIssue;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.identifier.ISSN;
 import org.jabref.model.strings.StringUtil;
 
@@ -19,11 +19,11 @@ public Optional<String> checkValue(String value) {
 
         ISSN issn = new ISSN(issnString);
         if (!issn.isValidFormat()) {
-            return Optional.of(IntegrityIssue.INCORRECT_FORMAT_ISSN.getText());
+            return Optional.of(Localization.lang("incorrect format"));
         }
 
         if (!issn.isValidChecksum()) {
-            return Optional.of(IntegrityIssue.INCORRECT_CONTROL_DIGIT_ISSN.getText());
+            return Optional.of(Localization.lang("incorrect control digit"));
         }
         return Optional.empty();
     }
diff --git a/src/main/java/org/jabref/logic/integrity/TitleChecker.java b/src/main/java/org/jabref/logic/integrity/TitleChecker.java
index 8c50119382f..824c8673f46 100644
--- a/src/main/java/org/jabref/logic/integrity/TitleChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/TitleChecker.java
@@ -4,7 +4,7 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import org.jabref.gui.integrity.IntegrityIssue;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.strings.StringUtil;
 
@@ -48,7 +48,7 @@ public Optional<String> checkValue(String value) {
             if (!subTitle.isEmpty()) {
                 subTitle = subTitle.substring(1);
                 if (HAS_CAPITAL_LETTERS.test(subTitle)) {
-                    return Optional.of(IntegrityIssue.CAPITAL_LETTER_ARE_NOT_MASKED_USING_CURLY_BRACKETS.getText());
+                    return Optional.of(Localization.lang("capital letters are not masked using curly brackets {}"));
                 }
             }
         }

From 8e9341a19c289d49d90668f880eba5ef81f0623c Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Thu, 20 Feb 2025 22:17:27 +0530
Subject: [PATCH 13/30] Remove use of enum from PageChecker class

---
 src/main/java/org/jabref/logic/integrity/PagesChecker.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/logic/integrity/PagesChecker.java b/src/main/java/org/jabref/logic/integrity/PagesChecker.java
index 1d99c0bcdec..d21caa310ff 100644
--- a/src/main/java/org/jabref/logic/integrity/PagesChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/PagesChecker.java
@@ -5,7 +5,7 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import org.jabref.gui.integrity.IntegrityIssue;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.strings.StringUtil;
 
@@ -58,7 +58,7 @@ public Optional<String> checkValue(String value) {
         if (Arrays.stream(value.split(","))
                 .map(String::trim)
                 .anyMatch(pageRange -> !isValidPageNumber.test(pageRange))) {
-            return Optional.of(IntegrityIssue.SHOULD_CONTAIN_A_VALID_PAGE_NUMBER_RANGE.getText());
+            return Optional.of(Localization.lang("should contain a valid page number range"));
         }
         return Optional.empty();
     }

From 235c74f14f35e8c4103468f0ffac0c0aec6db5ea Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Thu, 20 Feb 2025 22:29:48 +0530
Subject: [PATCH 14/30] Add fixAll method

---
 .../gui/integrity/IntegrityCheckDialog.fxml     |  2 +-
 .../gui/integrity/IntegrityCheckDialog.java     | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml
index 00364c979c5..bc7b4fc9aed 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml
@@ -31,7 +31,7 @@
                 <MenuButton fx:id="messageFilterButton" prefHeight="30.0" maxHeight="30.0" text="%Message filters"/>
             </HBox>
             <HBox maxHeight="30" spacing="4.0" alignment="CENTER">
-                <Button prefHeight="20.0" text="%Fix all"/>
+                <Button onAction="#fixAll" prefHeight="20.0" text="%Fix all"/>
                 <Region HBox.hgrow="ALWAYS" />
                 <ComboBox fx:id="entryTypeCombo" maxWidth="400"  />
                 <Button onAction="#fixByType" alignment="CENTER_RIGHT" prefHeight="20.0" text="%Fix by type"/>
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
index f79ac62be4e..040f1b67b7a 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -227,4 +227,21 @@ private void fixByType() {
         }
         updateEntryTypeCombo();
     }
+
+    @FXML
+    private void fixAll() {
+        List<IntegrityIssue> fixableIssues = Arrays.stream(IntegrityIssue.values())
+                                                   .filter(issue -> issue.getFix() != null)
+                                                   .toList();
+        for (IntegrityIssue issue : fixableIssues) {
+            for (IntegrityMessage message : messages) {
+                if (message.field().equals(issue.getField())) {
+                    viewModel.fix(issue, message);
+                    removeRowFromTable(message);
+                    viewModel.removeFromEntryTypes(message.field().getDisplayName());
+                }
+            }
+        }
+        updateEntryTypeCombo();
+    }
 }

From 9839137fa27cf8f2039d7411d7eab4d3d69fb8e3 Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Thu, 20 Feb 2025 23:12:13 +0530
Subject: [PATCH 15/30] Add a check for fixAll and fixByType method

---
 .../gui/integrity/IntegrityCheckDialog.java   | 42 ++++++++++---------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
index 040f1b67b7a..c698eb9568f 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -210,38 +210,42 @@ private void updateEntryTypeCombo() {
         }
     }
 
+    private boolean hasFix(IntegrityMessage message) {
+        return message != null && message.field() != null && IntegrityIssue.fromField(message.field())
+                                                                           .map(issue -> issue.getFix() != null)
+                                                                           .orElse(false);
+    }
+
     @FXML
     private void fixByType() {
         String selectedType = entryTypeCombo.getSelectionModel().getSelectedItem();
         Optional<IntegrityIssue> selectedIssue = Arrays.stream(IntegrityIssue.values())
                                                        .filter(issue -> issue.getText().equals(selectedType))
                                                        .findFirst();
-        if (selectedIssue.isPresent()) {
-            for (IntegrityMessage message : messages) {
-                if (message.field().equals(selectedIssue.get().getField())) {
-                    viewModel.fix(selectedIssue.get(), message);
-                    removeRowFromTable(message);
-                    viewModel.removeFromEntryTypes(message.field().getDisplayName());
-                }
-            }
-        }
+
+        selectedIssue.ifPresent(issue -> {
+            messages.stream()
+                    .filter(message -> message.field().equals(issue.getField()) && hasFix(message))
+                    .forEach(message -> {
+                        viewModel.fix(issue, message);
+                        removeRowFromTable(message);
+                        viewModel.removeFromEntryTypes(message.field().getDisplayName());
+                    });
+        });
+
         updateEntryTypeCombo();
     }
 
     @FXML
     private void fixAll() {
-        List<IntegrityIssue> fixableIssues = Arrays.stream(IntegrityIssue.values())
-                                                   .filter(issue -> issue.getFix() != null)
-                                                   .toList();
-        for (IntegrityIssue issue : fixableIssues) {
-            for (IntegrityMessage message : messages) {
-                if (message.field().equals(issue.getField())) {
+        messages.stream()
+                .filter(this::hasFix)
+                .forEach(message -> IntegrityIssue.fromField(message.field()).ifPresent(issue -> {
                     viewModel.fix(issue, message);
-                    removeRowFromTable(message);
                     viewModel.removeFromEntryTypes(message.field().getDisplayName());
-                }
-            }
-        }
+                    removeRowFromTable(message);
+                }));
+
         updateEntryTypeCombo();
     }
 }

From 5754680672b498c5f6f88e1df7a30eeaa4f96737 Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Thu, 20 Feb 2025 23:29:36 +0530
Subject: [PATCH 16/30] Fix a bug

---
 .../java/org/jabref/gui/integrity/IntegrityCheckDialog.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
index c698eb9568f..e7666029c4f 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -224,7 +224,7 @@ private void fixByType() {
                                                        .findFirst();
 
         selectedIssue.ifPresent(issue -> {
-            messages.stream()
+            messagesTable.getItems().stream()
                     .filter(message -> message.field().equals(issue.getField()) && hasFix(message))
                     .forEach(message -> {
                         viewModel.fix(issue, message);
@@ -238,7 +238,7 @@ private void fixByType() {
 
     @FXML
     private void fixAll() {
-        messages.stream()
+        messagesTable.getItems().stream()
                 .filter(this::hasFix)
                 .forEach(message -> IntegrityIssue.fromField(message.field()).ifPresent(issue -> {
                     viewModel.fix(issue, message);

From 8f7bdc2e38ffba05610b3449b37a93ce71b8d5b1 Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Sun, 23 Feb 2025 01:09:06 +0530
Subject: [PATCH 17/30] Use dialogService.notify() to notify

---
 .../java/org/jabref/gui/frame/MainMenu.java   |   2 +-
 .../gui/integrity/IntegrityCheckAction.java   |  11 +-
 .../gui/integrity/IntegrityCheckDialog.java   |  31 ++---
 .../IntegrityCheckDialogViewModel.java        | 112 ++++++++++++------
 .../jabref/gui/integrity/IntegrityIssue.java  |   2 +-
 src/main/resources/l10n/JabRef_en.properties  |   5 +-
 6 files changed, 94 insertions(+), 69 deletions(-)

diff --git a/src/main/java/org/jabref/gui/frame/MainMenu.java b/src/main/java/org/jabref/gui/frame/MainMenu.java
index a07028b2500..a320bdd6348 100644
--- a/src/main/java/org/jabref/gui/frame/MainMenu.java
+++ b/src/main/java/org/jabref/gui/frame/MainMenu.java
@@ -250,7 +250,7 @@ private void createMenu() {
         quality.getItems().addAll(
                 factory.createMenuItem(StandardActions.FIND_DUPLICATES, new DuplicateSearch(frame::getCurrentLibraryTab, dialogService, stateManager, preferences, entryTypesManager, taskExecutor)),
                 factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(dialogService, stateManager, undoManager, preferences)),
-                factory.createMenuItem(StandardActions.CHECK_INTEGRITY, new IntegrityCheckAction(frame::getCurrentLibraryTab, preferences, dialogService, stateManager, (UiTaskExecutor) taskExecutor, preferences, undoManager, abbreviationRepository)),
+                factory.createMenuItem(StandardActions.CHECK_INTEGRITY, new IntegrityCheckAction(frame::getCurrentLibraryTab, preferences, dialogService, stateManager, (UiTaskExecutor) taskExecutor, abbreviationRepository)),
                 factory.createMenuItem(StandardActions.CHECK_CONSISTENCY, new ConsistencyCheckAction(frame::getCurrentLibraryTab, dialogService, stateManager, preferences, entryTypesManager, (UiTaskExecutor) taskExecutor)),
                 factory.createMenuItem(StandardActions.CLEANUP_ENTRIES, new CleanupAction(frame::getCurrentLibraryTab, preferences, dialogService, stateManager, taskExecutor, undoManager)),
 
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
index 008a706d678..37bd22a041c 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
@@ -4,8 +4,6 @@
 import java.util.List;
 import java.util.function.Supplier;
 
-import javax.swing.undo.UndoManager;
-
 import javafx.collections.ObservableList;
 import javafx.concurrent.Task;
 
@@ -19,7 +17,6 @@
 import org.jabref.logic.integrity.IntegrityMessage;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
@@ -32,8 +29,6 @@ public class IntegrityCheckAction extends SimpleCommand {
     private final Supplier<LibraryTab> tabSupplier;
     private final GuiPreferences preferences;
     private final StateManager stateManager;
-    private final CliPreferences cliPreferences;
-    private final UndoManager undoManager;
     private final JournalAbbreviationRepository abbreviationRepository;
 
     public IntegrityCheckAction(Supplier<LibraryTab> tabSupplier,
@@ -41,16 +36,12 @@ public IntegrityCheckAction(Supplier<LibraryTab> tabSupplier,
                                 DialogService dialogService,
                                 StateManager stateManager,
                                 UiTaskExecutor taskExecutor,
-                                CliPreferences cliPreferences,
-                                UndoManager undoManager,
                                 JournalAbbreviationRepository abbreviationRepository) {
         this.tabSupplier = tabSupplier;
         this.stateManager = stateManager;
         this.taskExecutor = taskExecutor;
         this.preferences = preferences;
         this.dialogService = dialogService;
-        this.cliPreferences = cliPreferences;
-        this.undoManager = undoManager;
         this.abbreviationRepository = abbreviationRepository;
         this.executable.bind(needsDatabase(this.stateManager));
     }
@@ -87,7 +78,7 @@ protected List<IntegrityMessage> call() {
             if (messages.isEmpty()) {
                 dialogService.notify(Localization.lang("No problems found."));
             } else {
-                dialogService.showCustomDialogAndWait(new IntegrityCheckDialog(messages, tabSupplier, dialogService, stateManager, taskExecutor, cliPreferences, undoManager));
+                dialogService.showCustomDialogAndWait(new IntegrityCheckDialog(messages, tabSupplier, 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 e7666029c4f..6943a97a3a6 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -5,11 +5,10 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
@@ -27,14 +26,11 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
-import org.jabref.gui.StateManager;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ValueTableCellFactory;
 import org.jabref.logic.integrity.IntegrityMessage;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.preferences.CliPreferences;
-import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.field.Field;
 
 import com.airhacks.afterburner.views.ViewLoader;
@@ -58,28 +54,16 @@ public class IntegrityCheckDialog extends BaseDialog<Void> {
     private final List<IntegrityMessage> messages;
     private final Supplier<LibraryTab> tabSupplier;
     private final DialogService dialogService;
-    private final StateManager stateManager;
-    private final TaskExecutor taskExecutor;
-    private final CliPreferences preferences;
-    private final UndoManager undoManager;
 
     private IntegrityCheckDialogViewModel viewModel;
     private TableFilter<IntegrityMessage> tableFilter;
 
     public IntegrityCheckDialog(List<IntegrityMessage> messages,
                                 Supplier<LibraryTab> tabSupplier,
-                                DialogService dialogService,
-                                StateManager stateManager,
-                                TaskExecutor taskExecutor,
-                                CliPreferences preferences,
-                                UndoManager undoManager) {
+                                DialogService dialogService) {
         this.messages = messages;
         this.tabSupplier = tabSupplier;
         this.dialogService = dialogService;
-        this.stateManager = stateManager;
-        this.taskExecutor = taskExecutor;
-        this.preferences = preferences;
-        this.undoManager = undoManager;
 
         this.setTitle(Localization.lang("Check integrity"));
         this.initModality(Modality.NONE);
@@ -104,7 +88,7 @@ public IntegrityCheckDialogViewModel getViewModel() {
 
     @FXML
     private void initialize() {
-        viewModel = new IntegrityCheckDialogViewModel(messages, tabSupplier, dialogService, stateManager, taskExecutor, preferences, undoManager);
+        viewModel = new IntegrityCheckDialogViewModel(messages);
 
         messagesTable.getSelectionModel().getSelectedItems().addListener(this::onSelectionChanged);
         messagesTable.setItems(viewModel.getMessages());
@@ -218,6 +202,8 @@ private boolean hasFix(IntegrityMessage message) {
 
     @FXML
     private void fixByType() {
+        AtomicBoolean fixed = new AtomicBoolean(false);
+
         String selectedType = entryTypeCombo.getSelectionModel().getSelectedItem();
         Optional<IntegrityIssue> selectedIssue = Arrays.stream(IntegrityIssue.values())
                                                        .filter(issue -> issue.getText().equals(selectedType))
@@ -230,10 +216,17 @@ private void fixByType() {
                         viewModel.fix(issue, message);
                         removeRowFromTable(message);
                         viewModel.removeFromEntryTypes(message.field().getDisplayName());
+                        fixed.set(true);
                     });
         });
 
         updateEntryTypeCombo();
+
+        if (fixed.get()) {
+            dialogService.notify(Localization.lang("Fixed successfully!"));
+        } else {
+            dialogService.notify(Localization.lang("No fixes available!"));
+        }
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
index a649c3e3375..a55b20ec19d 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
@@ -4,52 +4,24 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import javax.swing.undo.UndoManager;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.collections.ObservableSet;
 
 import org.jabref.gui.AbstractViewModel;
-import org.jabref.gui.DialogService;
-import org.jabref.gui.LibraryTab;
-import org.jabref.gui.StateManager;
-import org.jabref.gui.citationkeypattern.GenerateCitationKeyAction;
 import org.jabref.logic.integrity.IntegrityMessage;
-import org.jabref.logic.preferences.CliPreferences;
-import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 
 public class IntegrityCheckDialogViewModel extends AbstractViewModel {
 
-    private final Supplier<LibraryTab> tabSupplier;
-    private final DialogService dialogService;
-    private final StateManager stateManager;
-    private final TaskExecutor taskExecutor;
-    private final CliPreferences preferences;
-    private final UndoManager undoManager;
-
     private final ObservableList<IntegrityMessage> messages;
     private final ObservableSet<Field> entryTypes;
 
-    public IntegrityCheckDialogViewModel(List<IntegrityMessage> messages,
-                                         Supplier<LibraryTab> tabSupplier,
-                                         DialogService dialogService,
-                                         StateManager stateManager,
-                                         TaskExecutor taskExecutor,
-                                         CliPreferences preferences,
-                                         UndoManager undoManager) {
+    public IntegrityCheckDialogViewModel(List<IntegrityMessage> messages) {
         this.messages = FXCollections.observableArrayList(messages);
-        this.tabSupplier = tabSupplier;
-        this.dialogService = dialogService;
-        this.stateManager = stateManager;
-        this.taskExecutor = taskExecutor;
-        this.preferences = preferences;
-        this.undoManager = undoManager;
 
         Set<Field> types = messages.stream()
                                     .map(IntegrityMessage::field)
@@ -72,16 +44,31 @@ public void removeFromEntryTypes(String entry) {
     public void fix(IntegrityIssue issue, IntegrityMessage message) {
         switch (issue) {
             case CAPITAL_LETTER_ARE_NOT_MASKED_USING_CURLY_BRACKETS:
-                if (issue.getField().equals(StandardField.TITLE)) {
-                    maskTitle(message);
-                    return;
-                }
+                maskTitle(message);
                 break;
             case BIBTEX_FIELD_ONLY_KEY, BIBTEX_FIELD_ONLY_CROSS_REF:
                 removeField(message, issue.getField());
                 break;
-            case CITATION_KEY_DEVIATES_FROM_GENERATED_KEY:
-                new GenerateCitationKeyAction(tabSupplier, dialogService, stateManager, taskExecutor, preferences, undoManager).execute();
+            case INCORRECT_FORMAT_DATE:
+                correctDateFormat(message);
+                break;
+            case NO_INTEGER_AS_VALUE_FOR_EDITION_ALLOWED:
+                removeNonIntegerEdition(message);
+                break;
+            case SHOULD_CONTAIN_AN_INTEGER_OR_A_LITERAL:
+                ensureValidEdition(message);
+                break;
+            case SHOULD_HAVE_THE_FIRST_LETTER_CAPITALIZED:
+                capitalizeFirstLetter(message, StandardField.EDITION);
+                break;
+            case REFERENCED_CITATION_KEY_DOES_NOT_EXIST:
+                handleMissingCitationKey(message);
+                break;
+            case NON_ASCII_ENCODED_CHARACTER_FOUND:
+                replaceNonASCIICharacters(message, StandardField.ABSTRACT);
+                break;
+            case SHOULD_CONTAIN_A_VALID_PAGE_NUMBER_RANGE:
+                formatPageNumberRange(message);
                 break;
             default:
                 break;
@@ -103,10 +90,61 @@ public void maskTitle(IntegrityMessage message) {
         message.entry().setField(fields);
     }
 
-    public void removeField(IntegrityMessage message, Field
-        field) {
+    public void removeField(IntegrityMessage message, Field field) {
         Map<Field, String> fields = new HashMap<>();
         fields.put(field, "");
         message.entry().setField(fields);
     }
+
+    public void correctDateFormat(IntegrityMessage message) {
+        String date = message.entry().getField(StandardField.DATE).orElse("");
+        if (!date.matches("\\d{4}-\\d{2}-\\d{2}")) {
+            updateField(message, StandardField.DATE, "YYYY-MM-DD");
+        }
+    }
+
+    public void formatPageNumberRange(IntegrityMessage message) {
+        String pages = message.entry().getField(StandardField.PAGES).orElse("");
+        if (!pages.matches("\\d+(-\\d+)?")) {
+            updateField(message, StandardField.PAGES, "1-10");
+        }
+    }
+
+    public void replaceNonASCIICharacters(IntegrityMessage message, Field field) {
+        String value = message.entry().getField(field).orElse("");
+        String normalized = value.replaceAll("[^\\x00-\\x7F]", "");
+        updateField(message, field, normalized);
+    }
+
+    public void handleMissingCitationKey(IntegrityMessage message) {
+        updateField(message, StandardField.CROSSREF, "UnknownKey");
+    }
+
+    public void capitalizeFirstLetter(IntegrityMessage message, Field field) {
+        String value = message.entry().getField(field).orElse("");
+        if (!value.isEmpty()) {
+            String capitalized = value.substring(0, 1).toUpperCase() + value.substring(1).toLowerCase();
+            updateField(message, field, capitalized);
+        }
+    }
+
+    public void ensureValidEdition(IntegrityMessage message) {
+        String edition = message.entry().getField(StandardField.EDITION).orElse("");
+        if (!edition.matches("\\d+|First|Second|Third")) {
+            updateField(message, StandardField.EDITION, "First");
+        }
+    }
+
+    public void removeNonIntegerEdition(IntegrityMessage message) {
+        String edition = message.entry().getField(StandardField.EDITION).orElse("");
+        if (!edition.matches("\\d+")) {
+            updateField(message, StandardField.EDITION, "");
+        }
+    }
+
+    public void updateField(IntegrityMessage message, Field field, String newValue) {
+        Map<Field, String> fields = new HashMap<>();
+        fields.put(field, newValue);
+        message.entry().setField(fields);
+    }
 }
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityIssue.java b/src/main/java/org/jabref/gui/integrity/IntegrityIssue.java
index 8552f71dfd3..4937113b3e9 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityIssue.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityIssue.java
@@ -9,7 +9,7 @@
 import org.jabref.model.entry.field.StandardField;
 
 public enum IntegrityIssue {
-    CITATION_KEY_DEVIATES_FROM_GENERATED_KEY(InternalField.KEY_FIELD, Localization.lang("Citation key deviates from generated key"), Localization.lang("Generate key")),
+    CITATION_KEY_DEVIATES_FROM_GENERATED_KEY(InternalField.KEY_FIELD, Localization.lang("Citation key deviates from generated key")),
     BIBTEX_FIELD_ONLY_KEY(InternalField.KEY_FIELD, Localization.lang("bibtex field only"), Localization.lang("Remove field")),
     BIBTEX_FIELD_ONLY_CROSS_REF(StandardField.CROSSREF, Localization.lang("bibtex field only"), Localization.lang("Remove field")),
     INCORRECT_FORMAT_DATE(StandardField.DATE, Localization.lang("incorrect format")),
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 53f0eeca65b..7d6f178b409 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2195,7 +2195,8 @@ Message\ filters=Message filters
 Fixes=Fixes
 Fix\ all=Fix all
 Fix\ by\ type=Fix by type
-Generate\ key=Generate key
+Fixed\ successfully!=Fixed successfully!
+No\ fixes\ available!=No fixes available!
 
 Add\ new\ Field=Add new Field
 Add\ new\ entry\ type=Add new entry type
@@ -2861,3 +2862,5 @@ Include=Include
 Exclude=Exclude
 Include\ or\ exclude\ cross-referenced\ entries=Include or exclude cross-referenced entries
 Would\ you\ like\ to\ include\ cross-reference\ entries\ in\ the\ current\ operation?=Would you like to include cross-reference entries in the current operation?
+
+

From f57719c7cc58339f92eca56c2ff055f0288e8e04 Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Sun, 23 Feb 2025 01:14:36 +0530
Subject: [PATCH 18/30] Remove unused imports

---
 .../org/jabref/gui/integrity/IntegrityCheckAction.java   | 2 +-
 .../org/jabref/gui/integrity/IntegrityCheckDialog.java   | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
index 37bd22a041c..170bcf25325 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
@@ -78,7 +78,7 @@ protected List<IntegrityMessage> call() {
             if (messages.isEmpty()) {
                 dialogService.notify(Localization.lang("No problems found."));
             } else {
-                dialogService.showCustomDialogAndWait(new IntegrityCheckDialog(messages, tabSupplier, dialogService));
+                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 6943a97a3a6..c54b3b47eb2 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -7,7 +7,6 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
-import java.util.function.Supplier;
 
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.collections.FXCollections;
@@ -52,17 +51,17 @@ public class IntegrityCheckDialog extends BaseDialog<Void> {
     @Inject private ThemeManager themeManager;
 
     private final List<IntegrityMessage> messages;
-    private final Supplier<LibraryTab> tabSupplier;
+    private final LibraryTab libraryTab;
     private final DialogService dialogService;
 
     private IntegrityCheckDialogViewModel viewModel;
     private TableFilter<IntegrityMessage> tableFilter;
 
     public IntegrityCheckDialog(List<IntegrityMessage> messages,
-                                Supplier<LibraryTab> tabSupplier,
+                                LibraryTab libraryTab,
                                 DialogService dialogService) {
         this.messages = messages;
-        this.tabSupplier = tabSupplier;
+        this.libraryTab = libraryTab;
         this.dialogService = dialogService;
 
         this.setTitle(Localization.lang("Check integrity"));
@@ -78,7 +77,7 @@ public IntegrityCheckDialog(List<IntegrityMessage> messages,
     private void onSelectionChanged(ListChangeListener.Change<? extends IntegrityMessage> change) {
         if (change.next()) {
             change.getAddedSubList().stream().findFirst().ifPresent(message ->
-                    tabSupplier.get().editEntryAndFocusField(message.entry(), message.field()));
+                    libraryTab.editEntryAndFocusField(message.entry(), message.field()));
         }
     }
 

From 139777eb16dce31d8ffc1fb18bf3e08b44ef531d Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Tue, 25 Feb 2025 19:00:52 +0530
Subject: [PATCH 19/30] Add tests for methods

---
 .../IntegrityCheckDialogViewModel.java        |  24 +++-
 .../IntegrityDialogViewModelTest.java         | 104 ++++++++++++++++++
 2 files changed, 122 insertions(+), 6 deletions(-)
 create mode 100644 src/test/java/org/jabref/gui/integrity/IntegrityDialogViewModelTest.java

diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
index a55b20ec19d..c35403d7998 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
@@ -1,5 +1,8 @@
 package org.jabref.gui.integrity;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -65,7 +68,7 @@ public void fix(IntegrityIssue issue, IntegrityMessage message) {
                 handleMissingCitationKey(message);
                 break;
             case NON_ASCII_ENCODED_CHARACTER_FOUND:
-                replaceNonASCIICharacters(message, StandardField.ABSTRACT);
+                replaceNonASCIICharacters(message);
                 break;
             case SHOULD_CONTAIN_A_VALID_PAGE_NUMBER_RANGE:
                 formatPageNumberRange(message);
@@ -77,6 +80,9 @@ public void fix(IntegrityIssue issue, IntegrityMessage message) {
 
     public void maskTitle(IntegrityMessage message) {
         String title = message.entry().getTitle().get();
+        if (title.isEmpty()) {
+            return;
+        }
         StringBuilder result = new StringBuilder();
         for (char ch : title.toCharArray()) {
             if (Character.isUpperCase(ch)) {
@@ -98,8 +104,14 @@ public void removeField(IntegrityMessage message, Field field) {
 
     public void correctDateFormat(IntegrityMessage message) {
         String date = message.entry().getField(StandardField.DATE).orElse("");
-        if (!date.matches("\\d{4}-\\d{2}-\\d{2}")) {
-            updateField(message, StandardField.DATE, "YYYY-MM-DD");
+        DateTimeFormatter inputFormat = DateTimeFormatter.ofPattern("dd-MM-yyyy");
+        DateTimeFormatter targetFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+        try {
+            LocalDate parsedDate = LocalDate.parse(date, inputFormat);
+            updateField(message, StandardField.DATE, parsedDate.format(targetFormat));
+        } catch (DateTimeParseException e) {
+            System.err.println("Invalid date format: " + date);
         }
     }
 
@@ -110,10 +122,10 @@ public void formatPageNumberRange(IntegrityMessage message) {
         }
     }
 
-    public void replaceNonASCIICharacters(IntegrityMessage message, Field field) {
-        String value = message.entry().getField(field).orElse("");
+    public void replaceNonASCIICharacters(IntegrityMessage message) {
+        String value = message.entry().getField(StandardField.ABSTRACT).orElse("");
         String normalized = value.replaceAll("[^\\x00-\\x7F]", "");
-        updateField(message, field, normalized);
+        updateField(message, StandardField.ABSTRACT, normalized);
     }
 
     public void handleMissingCitationKey(IntegrityMessage message) {
diff --git a/src/test/java/org/jabref/gui/integrity/IntegrityDialogViewModelTest.java b/src/test/java/org/jabref/gui/integrity/IntegrityDialogViewModelTest.java
new file mode 100644
index 00000000000..df1a129378a
--- /dev/null
+++ b/src/test/java/org/jabref/gui/integrity/IntegrityDialogViewModelTest.java
@@ -0,0 +1,104 @@
+package org.jabref.gui.integrity;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Optional;
+
+import org.jabref.logic.integrity.IntegrityMessage;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class IntegrityCheckDialogViewModelTest {
+
+    private BibEntry entry;
+    private IntegrityMessage message;
+    private IntegrityCheckDialogViewModel viewModel;
+
+    @BeforeEach
+    void setUp() {
+        entry = Mockito.mock(BibEntry.class);
+        message = Mockito.mock(IntegrityMessage.class);
+        viewModel = new IntegrityCheckDialogViewModel(Collections.emptyList());
+
+        when(message.entry()).thenReturn(entry);
+    }
+
+    @Test
+    void testMaskTitle() {
+        when(entry.getTitle()).thenReturn(Optional.of("Proceedings of the 40th International Conference on Machine Learning"));
+        viewModel.maskTitle(message);
+        verify(entry).setField(Map.of(StandardField.TITLE, "{P}roceedings of the 40th {I}nternational {C}onference on {M}achine {L}earning"));
+    }
+
+    @Test
+    void testRemoveField() {
+        viewModel.removeField(message, StandardField.AUTHOR);
+        verify(entry).setField(Map.of(StandardField.AUTHOR, ""));
+    }
+
+    @Test
+    void testCorrectDateFormat() {
+        when(message.entry()).thenReturn(entry);
+        when(entry.getField(StandardField.DATE)).thenReturn(Optional.of("25-02-2025"));
+        viewModel.correctDateFormat(message);
+        verify(entry).setField(Map.of(StandardField.DATE, "2025-02-25"));
+    }
+
+    @Test
+    void testFormatPageNumberRange() {
+        when(entry.getField(StandardField.PAGES)).thenReturn(Optional.of("abc"));
+        viewModel.formatPageNumberRange(message);
+        verify(entry).setField(Map.of(StandardField.PAGES, "1-10"));
+    }
+
+    @Test
+    void ttestReplaceNonASCIICharacters() {
+        when(entry.getField(StandardField.ABSTRACT)).thenReturn(Optional.of("Thé abstract"));
+        viewModel.replaceNonASCIICharacters(message);
+        verify(entry).setField(Map.of(StandardField.ABSTRACT, "Th abstract"));
+    }
+
+    @Test
+    void testReplaceNonASCIICharacters() {
+        when(message.entry()).thenReturn(entry);
+        when(entry.getField(StandardField.ABSTRACT)).thenReturn(Optional.of("Thé abstract"));
+        viewModel.replaceNonASCIICharacters(message);
+        verify(entry).setField(Map.of(StandardField.ABSTRACT, "Th abstract"));
+    }
+
+    @Test
+    void testHandleMissingCitationKey() {
+        viewModel.handleMissingCitationKey(message);
+        verify(entry).setField(Map.of(StandardField.CROSSREF, "UnknownKey"));
+    }
+
+    @Test
+    void testCapitalizeFirstLetter() {
+        Field field = StandardField.AUTHOR;
+        when(entry.getField(field)).thenReturn(Optional.of("john doe"));
+        viewModel.capitalizeFirstLetter(message, field);
+        verify(entry).setField(Map.of(field, "John doe"));
+    }
+
+    @Test
+    void testEnsureValidEdition() {
+        when(entry.getField(StandardField.EDITION)).thenReturn(Optional.of("Fourth"));
+        viewModel.ensureValidEdition(message);
+        verify(entry).setField(Map.of(StandardField.EDITION, "First"));
+    }
+
+    @Test
+    void testRemoveNonIntegerEdition() {
+        when(entry.getField(StandardField.EDITION)).thenReturn(Optional.of("First"));
+        viewModel.removeNonIntegerEdition(message);
+        verify(entry).setField(Map.of(StandardField.EDITION, ""));
+    }
+}

From 39dbfd15bbb25a21f7f3b27f969dcbdab7b30ac5 Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Thu, 27 Feb 2025 01:22:31 +0530
Subject: [PATCH 20/30] Fix the check and updates based on review

---
 .../gui/integrity/IntegrityCheckDialog.java    | 18 +++++++-----------
 .../IntegrityCheckDialogViewModel.java         | 16 +++++++++++++++-
 .../IntegrityDialogViewModelTest.java          | 18 +++++++++---------
 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
index c54b3b47eb2..d7bb76eaf33 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -3,15 +3,15 @@
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
 
+import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyStringWrapper;
-import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ComboBox;
@@ -115,7 +115,7 @@ private void configureAction(IntegrityMessage message) {
                 if (issue.isPresent() && issue.get().getFix() != null) {
                     configureButton(issue.get().getFix(), () -> {
                         viewModel.fix(issue.get(), message);
-                        removeRowFromTable(message);
+                        viewModel.removeFromEntryTypes(message.field().getDisplayName());
                     });
                     setGraphic(button);
                     return;
@@ -141,6 +141,8 @@ private void configureButton(String text, Runnable action) {
         addMessageColumnFilter(keyColumn, keyFilterButton);
         addMessageColumnFilter(fieldColumn, fieldFilterButton);
         addMessageColumnFilter(messageColumn, messageFilterButton);
+
+       messagesTable.itemsProperty().bind(viewModel.columnsListProperty());
     }
 
     private void addMessageColumnFilter(TableColumn<IntegrityMessage, String> messageColumn, MenuButton messageFilterButton) {
@@ -172,12 +174,6 @@ public void clearFilters() {
         }
     }
 
-    private void removeRowFromTable(IntegrityMessage message) {
-        ObservableList<IntegrityMessage> mutableMessages = FXCollections.observableArrayList(messagesTable.getItems());
-        mutableMessages.remove(message);
-        messagesTable.setItems(mutableMessages);
-    }
-
     private void updateEntryTypeCombo() {
         Set<Field> entryTypes = viewModel.getEntryTypes();
         Set<String> uniqueTexts = new HashSet<>();
@@ -213,8 +209,8 @@ private void fixByType() {
                     .filter(message -> message.field().equals(issue.getField()) && hasFix(message))
                     .forEach(message -> {
                         viewModel.fix(issue, message);
-                        removeRowFromTable(message);
                         viewModel.removeFromEntryTypes(message.field().getDisplayName());
+                        Platform.runLater(() -> viewModel.columnsListProperty().getValue().removeIf(column -> Objects.equals(column.message(), message.message())));
                         fixed.set(true);
                     });
         });
@@ -235,7 +231,7 @@ private void fixAll() {
                 .forEach(message -> IntegrityIssue.fromField(message.field()).ifPresent(issue -> {
                     viewModel.fix(issue, message);
                     viewModel.removeFromEntryTypes(message.field().getDisplayName());
-                    removeRowFromTable(message);
+                    Platform.runLater(() -> viewModel.columnsListProperty().getValue().removeIf(column -> Objects.equals(column.message(), message.message())));
                 }));
 
         updateEntryTypeCombo();
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
index c35403d7998..a5d37d7a410 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
@@ -9,6 +9,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.collections.ObservableSet;
@@ -18,8 +20,14 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class IntegrityCheckDialogViewModel extends AbstractViewModel {
 
+    private final Logger LOGGER = LoggerFactory.getLogger(IntegrityCheckDialogViewModel.class);
+
+    private final ListProperty<IntegrityMessage> columnsListProperty;
     private final ObservableList<IntegrityMessage> messages;
     private final ObservableSet<Field> entryTypes;
 
@@ -30,6 +38,12 @@ public IntegrityCheckDialogViewModel(List<IntegrityMessage> messages) {
                                     .map(IntegrityMessage::field)
                                     .collect(Collectors.toSet());
         this.entryTypes = FXCollections.observableSet(types);
+
+        this.columnsListProperty = new SimpleListProperty<>(FXCollections.observableArrayList(messages));
+    }
+
+    public ListProperty<IntegrityMessage> columnsListProperty() {
+        return this.columnsListProperty;
     }
 
     public ObservableList<IntegrityMessage> getMessages() {
@@ -111,7 +125,7 @@ public void correctDateFormat(IntegrityMessage message) {
             LocalDate parsedDate = LocalDate.parse(date, inputFormat);
             updateField(message, StandardField.DATE, parsedDate.format(targetFormat));
         } catch (DateTimeParseException e) {
-            System.err.println("Invalid date format: " + date);
+            LOGGER.error("Invalid date format: {}", date);
         }
     }
 
diff --git a/src/test/java/org/jabref/gui/integrity/IntegrityDialogViewModelTest.java b/src/test/java/org/jabref/gui/integrity/IntegrityDialogViewModelTest.java
index df1a129378a..b4669e11630 100644
--- a/src/test/java/org/jabref/gui/integrity/IntegrityDialogViewModelTest.java
+++ b/src/test/java/org/jabref/gui/integrity/IntegrityDialogViewModelTest.java
@@ -32,20 +32,20 @@ void setUp() {
     }
 
     @Test
-    void testMaskTitle() {
+    void maskTitle() {
         when(entry.getTitle()).thenReturn(Optional.of("Proceedings of the 40th International Conference on Machine Learning"));
         viewModel.maskTitle(message);
         verify(entry).setField(Map.of(StandardField.TITLE, "{P}roceedings of the 40th {I}nternational {C}onference on {M}achine {L}earning"));
     }
 
     @Test
-    void testRemoveField() {
+    void removeField() {
         viewModel.removeField(message, StandardField.AUTHOR);
         verify(entry).setField(Map.of(StandardField.AUTHOR, ""));
     }
 
     @Test
-    void testCorrectDateFormat() {
+    void correctDateFormat() {
         when(message.entry()).thenReturn(entry);
         when(entry.getField(StandardField.DATE)).thenReturn(Optional.of("25-02-2025"));
         viewModel.correctDateFormat(message);
@@ -53,7 +53,7 @@ void testCorrectDateFormat() {
     }
 
     @Test
-    void testFormatPageNumberRange() {
+    void formatPageNumberRange() {
         when(entry.getField(StandardField.PAGES)).thenReturn(Optional.of("abc"));
         viewModel.formatPageNumberRange(message);
         verify(entry).setField(Map.of(StandardField.PAGES, "1-10"));
@@ -67,7 +67,7 @@ void ttestReplaceNonASCIICharacters() {
     }
 
     @Test
-    void testReplaceNonASCIICharacters() {
+    void replaceNonASCIICharacters() {
         when(message.entry()).thenReturn(entry);
         when(entry.getField(StandardField.ABSTRACT)).thenReturn(Optional.of("Thé abstract"));
         viewModel.replaceNonASCIICharacters(message);
@@ -75,13 +75,13 @@ void testReplaceNonASCIICharacters() {
     }
 
     @Test
-    void testHandleMissingCitationKey() {
+    void handleMissingCitationKey() {
         viewModel.handleMissingCitationKey(message);
         verify(entry).setField(Map.of(StandardField.CROSSREF, "UnknownKey"));
     }
 
     @Test
-    void testCapitalizeFirstLetter() {
+    void capitalizeFirstLetter() {
         Field field = StandardField.AUTHOR;
         when(entry.getField(field)).thenReturn(Optional.of("john doe"));
         viewModel.capitalizeFirstLetter(message, field);
@@ -89,14 +89,14 @@ void testCapitalizeFirstLetter() {
     }
 
     @Test
-    void testEnsureValidEdition() {
+    void ensureValidEdition() {
         when(entry.getField(StandardField.EDITION)).thenReturn(Optional.of("Fourth"));
         viewModel.ensureValidEdition(message);
         verify(entry).setField(Map.of(StandardField.EDITION, "First"));
     }
 
     @Test
-    void testRemoveNonIntegerEdition() {
+    void removeNonIntegerEdition() {
         when(entry.getField(StandardField.EDITION)).thenReturn(Optional.of("First"));
         viewModel.removeNonIntegerEdition(message);
         verify(entry).setField(Map.of(StandardField.EDITION, ""));

From 16e9817d711e4ce4650122c0c50531b71a51562e Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Fri, 28 Feb 2025 06:24:00 +0530
Subject: [PATCH 21/30] Use enum for passing issue message

---
 .../gui/integrity/IntegrityCheckDialog.java   | 14 ++---
 .../IntegrityCheckDialogViewModel.java        | 13 ++--
 .../jabref/gui/integrity/IntegrityIssue.java  | 62 -------------------
 .../integrity/ASCIICharacterChecker.java      |  3 +-
 .../logic/integrity/AbbreviationChecker.java  |  3 +-
 .../logic/integrity/BibStringChecker.java     |  3 +-
 .../integrity/BibTeXEntryTypeChecker.java     |  3 +-
 .../logic/integrity/BooktitleChecker.java     |  3 +-
 .../logic/integrity/BracketChecker.java       |  5 +-
 .../CitationKeyDeviationChecker.java          |  3 +-
 .../CitationKeyDuplicationChecker.java        |  3 +-
 .../jabref/logic/integrity/DateChecker.java   |  3 +-
 .../integrity/DoiDuplicationChecker.java      |  3 +-
 .../logic/integrity/DoiValidityChecker.java   |  3 +-
 .../logic/integrity/EditionChecker.java       |  6 +-
 .../logic/integrity/EntryLinkChecker.java     |  3 +-
 .../jabref/logic/integrity/FileChecker.java   |  3 +-
 .../logic/integrity/HTMLCharacterChecker.java |  3 +-
 .../logic/integrity/HowPublishedChecker.java  |  3 +-
 .../jabref/logic/integrity/ISBNChecker.java   |  5 +-
 .../jabref/logic/integrity/ISSNChecker.java   |  5 +-
 .../logic/integrity/IntegrityIssue.java       | 61 ++++++++++++++++++
 .../JournalInAbbreviationListChecker.java     |  3 +-
 .../jabref/logic/integrity/PagesChecker.java  |  2 +-
 .../jabref/logic/integrity/TitleChecker.java  |  3 +-
 src/main/resources/l10n/JabRef_en.properties  |  3 +-
 26 files changed, 102 insertions(+), 122 deletions(-)
 delete mode 100644 src/main/java/org/jabref/gui/integrity/IntegrityIssue.java
 create mode 100644 src/main/java/org/jabref/logic/integrity/IntegrityIssue.java

diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
index d7bb76eaf33..8a9a3d3d556 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -28,9 +28,9 @@
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ValueTableCellFactory;
+import org.jabref.logic.integrity.IntegrityIssue;
 import org.jabref.logic.integrity.IntegrityMessage;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.model.entry.field.Field;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import jakarta.inject.Inject;
@@ -111,7 +111,7 @@ protected void updateItem(String item, boolean empty) {
             }
 
             private void configureAction(IntegrityMessage message) {
-                Optional<IntegrityIssue> issue = IntegrityIssue.fromField(message.field());
+                Optional<IntegrityIssue> issue = IntegrityIssue.fromMessage(message);
                 if (issue.isPresent() && issue.get().getFix() != null) {
                     configureButton(issue.get().getFix(), () -> {
                         viewModel.fix(issue.get(), message);
@@ -175,12 +175,12 @@ public void clearFilters() {
     }
 
     private void updateEntryTypeCombo() {
-        Set<Field> entryTypes = viewModel.getEntryTypes();
+        Set<String> entryTypes = viewModel.getEntryTypes();
         Set<String> uniqueTexts = new HashSet<>();
         entryTypeCombo.getItems().clear();
 
         Arrays.stream(IntegrityIssue.values())
-              .filter(issue -> entryTypes.contains(issue.getField()))
+              .filter(issue -> entryTypes.contains(issue.getText()))
               .filter(issue -> uniqueTexts.add(issue.getText()))
               .forEach(issue -> entryTypeCombo.getItems().add(issue.getText()));
 
@@ -190,7 +190,7 @@ private void updateEntryTypeCombo() {
     }
 
     private boolean hasFix(IntegrityMessage message) {
-        return message != null && message.field() != null && IntegrityIssue.fromField(message.field())
+        return message != null && message.field() != null && IntegrityIssue.fromMessage(message)
                                                                            .map(issue -> issue.getFix() != null)
                                                                            .orElse(false);
     }
@@ -206,7 +206,7 @@ private void fixByType() {
 
         selectedIssue.ifPresent(issue -> {
             messagesTable.getItems().stream()
-                    .filter(message -> message.field().equals(issue.getField()) && hasFix(message))
+                    .filter(message -> message.message().equals(issue.getText()) && hasFix(message))
                     .forEach(message -> {
                         viewModel.fix(issue, message);
                         viewModel.removeFromEntryTypes(message.field().getDisplayName());
@@ -228,7 +228,7 @@ private void fixByType() {
     private void fixAll() {
         messagesTable.getItems().stream()
                 .filter(this::hasFix)
-                .forEach(message -> IntegrityIssue.fromField(message.field()).ifPresent(issue -> {
+                .forEach(message -> IntegrityIssue.fromMessage(message).ifPresent(issue -> {
                     viewModel.fix(issue, message);
                     viewModel.removeFromEntryTypes(message.field().getDisplayName());
                     Platform.runLater(() -> viewModel.columnsListProperty().getValue().removeIf(column -> Objects.equals(column.message(), message.message())));
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
index a5d37d7a410..cf2c45d9c95 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
@@ -16,6 +16,7 @@
 import javafx.collections.ObservableSet;
 
 import org.jabref.gui.AbstractViewModel;
+import org.jabref.logic.integrity.IntegrityIssue;
 import org.jabref.logic.integrity.IntegrityMessage;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
@@ -29,13 +30,13 @@ public class IntegrityCheckDialogViewModel extends AbstractViewModel {
 
     private final ListProperty<IntegrityMessage> columnsListProperty;
     private final ObservableList<IntegrityMessage> messages;
-    private final ObservableSet<Field> entryTypes;
+    private final ObservableSet<String> entryTypes;
 
     public IntegrityCheckDialogViewModel(List<IntegrityMessage> messages) {
         this.messages = FXCollections.observableArrayList(messages);
 
-        Set<Field> types = messages.stream()
-                                    .map(IntegrityMessage::field)
+        Set<String> types = messages.stream()
+                                    .map(IntegrityMessage::message)
                                     .collect(Collectors.toSet());
         this.entryTypes = FXCollections.observableSet(types);
 
@@ -50,7 +51,7 @@ public ObservableList<IntegrityMessage> getMessages() {
         return messages;
     }
 
-    public Set<Field> getEntryTypes() {
+    public Set<String> getEntryTypes() {
         return entryTypes;
     }
 
@@ -64,9 +65,9 @@ public void fix(IntegrityIssue issue, IntegrityMessage message) {
                 maskTitle(message);
                 break;
             case BIBTEX_FIELD_ONLY_KEY, BIBTEX_FIELD_ONLY_CROSS_REF:
-                removeField(message, issue.getField());
+                removeField(message, message.field());
                 break;
-            case INCORRECT_FORMAT_DATE:
+            case INCORRECT_FORMAT:
                 correctDateFormat(message);
                 break;
             case NO_INTEGER_AS_VALUE_FOR_EDITION_ALLOWED:
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityIssue.java b/src/main/java/org/jabref/gui/integrity/IntegrityIssue.java
deleted file mode 100644
index 4937113b3e9..00000000000
--- a/src/main/java/org/jabref/gui/integrity/IntegrityIssue.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.jabref.gui.integrity;
-
-import java.util.Arrays;
-import java.util.Optional;
-
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.InternalField;
-import org.jabref.model.entry.field.StandardField;
-
-public enum IntegrityIssue {
-    CITATION_KEY_DEVIATES_FROM_GENERATED_KEY(InternalField.KEY_FIELD, Localization.lang("Citation key deviates from generated key")),
-    BIBTEX_FIELD_ONLY_KEY(InternalField.KEY_FIELD, Localization.lang("bibtex field only"), Localization.lang("Remove field")),
-    BIBTEX_FIELD_ONLY_CROSS_REF(StandardField.CROSSREF, Localization.lang("bibtex field only"), Localization.lang("Remove field")),
-    INCORRECT_FORMAT_DATE(StandardField.DATE, Localization.lang("incorrect format")),
-    INCORRECT_FORMAT_ISSN(StandardField.ISSN, Localization.lang("incorrect format")),
-    INCORRECT_CONTROL_DIGIT_ISSN(StandardField.ISSN, Localization.lang("incorrect control digit")),
-    INCORRECT_FORMAT_ISBN(StandardField.ISBN, Localization.lang("incorrect format")),
-    INCORRECT_CONTROL_DIGIT_ISBN(StandardField.ISBN, Localization.lang("incorrect control digit")),
-    JOURNAL_NOT_FOUND_IN_ABBREVIATION_LIST(StandardField.JOURNAL, Localization.lang("journal not found in abbreviation list")),
-    NO_INTEGER_AS_VALUE_FOR_EDITION_ALLOWED(StandardField.EDITION, Localization.lang("no integer as values for edition allowed")),
-    SHOULD_CONTAIN_AN_INTEGER_OR_A_LITERAL(StandardField.EDITION, Localization.lang("should contain an integer or a literal")),
-    SHOULD_HAVE_THE_FIRST_LETTER_CAPITALIZED(StandardField.EDITION, Localization.lang("should have the first letter capitalized")),
-    REFERENCED_CITATION_KEY_DOES_NOT_EXIST(StandardField.CROSSREF, Localization.lang("Referenced citation key does not exist")),
-    NON_ASCII_ENCODED_CHARACTER_FOUND(StandardField.ABSTRACT, Localization.lang("Non-ASCII encoded character found")),
-    SHOULD_CONTAIN_A_VALID_PAGE_NUMBER_RANGE(StandardField.PAGES, Localization.lang("should contain a valid page number range")),
-    CAPITAL_LETTER_ARE_NOT_MASKED_USING_CURLY_BRACKETS(StandardField.TITLE, Localization.lang("capital letters are not masked using curly brackets {}"), Localization.lang("Mask letters"));
-
-    private final Field field;
-    private final String text;
-    private final String fix;
-
-    IntegrityIssue(Field field, String text, String fix) {
-        this.field = field;
-        this.text = text;
-        this.fix = fix;
-    }
-
-    IntegrityIssue(Field field, String text) {
-        this.field = field;
-        this.text = text;
-        this.fix = null;
-    }
-
-    public Field getField() {
-        return field;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public String getFix() {
-        return fix;
-    }
-
-    public static Optional<IntegrityIssue> fromField(Field field) {
-        return Arrays.stream(IntegrityIssue.values())
-                     .filter(symbol -> symbol.getField().equals(field))
-                     .findFirst();
-    }
-}
diff --git a/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java b/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java
index 4072b35b8b9..472cc67740f 100644
--- a/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
@@ -21,7 +20,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
         for (Map.Entry<Field, String> field : entry.getFieldMap().entrySet()) {
             boolean asciiOnly = CharMatcher.ascii().matchesAllOf(field.getValue());
             if (!asciiOnly) {
-                results.add(new IntegrityMessage(Localization.lang("Non-ASCII encoded character found"), entry,
+                results.add(new IntegrityMessage(IntegrityIssue.NON_ASCII_ENCODED_CHARACTER_FOUND.getText(), entry,
                         field.getKey()));
             }
         }
diff --git a/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java b/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java
index 0c456ad5ba9..39bf1591600 100644
--- a/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java
@@ -6,7 +6,6 @@
 import java.util.Set;
 
 import org.jabref.logic.journals.JournalAbbreviationRepository;
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
@@ -26,7 +25,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
         for (Field field : fields) {
             Optional<String> value = entry.getFieldLatexFree(field);
             value.filter(abbreviationRepository::isAbbreviatedName)
-                 .ifPresent(val -> messages.add(new IntegrityMessage(Localization.lang("abbreviation detected"), entry, field)));
+                 .ifPresent(val -> messages.add(new IntegrityMessage(IntegrityIssue.ABBREVIATION_DETECTED.getText(), entry, field)));
         }
         return messages;
     }
diff --git a/src/main/java/org/jabref/logic/integrity/BibStringChecker.java b/src/main/java/org/jabref/logic/integrity/BibStringChecker.java
index 6581e929658..f955910bcf2 100644
--- a/src/main/java/org/jabref/logic/integrity/BibStringChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/BibStringChecker.java
@@ -7,7 +7,6 @@
 import java.util.regex.Pattern;
 
 import org.jabref.logic.bibtex.FieldWriter;
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
@@ -35,7 +34,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
                 }
                 if ((hashCount & 1) == 1) { // Check if odd
                     // # is FieldWriter.BIBTEX_STRING_START_END_SYMBOL
-                    results.add(new IntegrityMessage(Localization.lang("odd number of unescaped '#'"), entry,
+                    results.add(new IntegrityMessage(IntegrityIssue.ODD_NUMBER_OF_UNESCAPED.getText(), entry,
                             field.getKey()));
                 }
             }
diff --git a/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java b/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java
index b83e3039e93..05f9b474a64 100644
--- a/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java
@@ -3,7 +3,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.types.EntryTypeFactory;
@@ -20,7 +19,7 @@ public class BibTeXEntryTypeChecker implements EntryChecker {
     public List<IntegrityMessage> check(BibEntry entry) {
         if (EntryTypeFactory.isExclusiveBiblatex(entry.getType())) {
             return Collections.singletonList(
-                    new IntegrityMessage(Localization.lang("Entry type %0 is only defined for Biblatex but not for BibTeX", entry.getType().getDisplayName()), entry, InternalField.KEY_FIELD)
+                    new IntegrityMessage(IntegrityIssue.ENTRY_TYPE_IS_ONLY_DEFINED_FOR_BIBLATEX_BUT_NOT_FOR_BIBTEX.getText(), entry, InternalField.KEY_FIELD)
             );
         }
         return Collections.emptyList();
diff --git a/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java b/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java
index 3ed8b36a6e7..ff4106b93f9 100644
--- a/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java
@@ -3,7 +3,6 @@
 import java.util.Locale;
 import java.util.Optional;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
 
 public class BooktitleChecker implements ValueChecker {
@@ -15,7 +14,7 @@ public Optional<String> checkValue(String value) {
         }
 
         if (value.toLowerCase(Locale.ENGLISH).endsWith("conference on")) {
-            return Optional.of(Localization.lang("booktitle ends with 'conference on'"));
+            return Optional.of(IntegrityIssue.BOOKTITLE_ENDS_WITH_CONFERENCE_ON.getText());
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/BracketChecker.java b/src/main/java/org/jabref/logic/integrity/BracketChecker.java
index bff56b03770..cf1df000c44 100644
--- a/src/main/java/org/jabref/logic/integrity/BracketChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/BracketChecker.java
@@ -2,7 +2,6 @@
 
 import java.util.Optional;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
 
 public class BracketChecker implements ValueChecker {
@@ -20,7 +19,7 @@ public Optional<String> checkValue(String value) {
                 counter++;
             } else if (a == '}') {
                 if (counter == 0) {
-                    return Optional.of(Localization.lang("unexpected closing curly bracket"));
+                    return Optional.of(IntegrityIssue.UNEXPECTED_CLOSING_CURLY_BRACKET.getText());
                 } else {
                     counter--;
                 }
@@ -28,7 +27,7 @@ public Optional<String> checkValue(String value) {
         }
 
         if (counter > 0) {
-            return Optional.of(Localization.lang("unexpected opening curly bracket"));
+            return Optional.of(IntegrityIssue.UNEXPECTED_OPENING_CURLY_BRACKET.getText());
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java b/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java
index 47d7bff811a..3f36f090934 100644
--- a/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java
@@ -7,7 +7,6 @@
 
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.InternalField;
@@ -36,7 +35,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
 
         if (!Objects.equals(key, generatedKey)) {
             return Collections.singletonList(new IntegrityMessage(
-                    Localization.lang("Citation key deviates from generated key"), entry, InternalField.KEY_FIELD));
+                    IntegrityIssue.CITATION_KEY_DEVIATES_FROM_GENERATED_KEY.getText(), entry, InternalField.KEY_FIELD));
         }
 
         return Collections.emptyList();
diff --git a/src/main/java/org/jabref/logic/integrity/CitationKeyDuplicationChecker.java b/src/main/java/org/jabref/logic/integrity/CitationKeyDuplicationChecker.java
index ae222225e26..0cf122f59bf 100644
--- a/src/main/java/org/jabref/logic/integrity/CitationKeyDuplicationChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/CitationKeyDuplicationChecker.java
@@ -5,7 +5,6 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -28,7 +27,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
         boolean isDuplicate = database.isDuplicateCitationKeyExisting(citeKey.get());
         if (isDuplicate) {
             return Collections.singletonList(
-                    new IntegrityMessage(Localization.lang("Duplicate citation key"), entry, StandardField.KEY));
+                    new IntegrityMessage(IntegrityIssue.DUPLICATE_CITATION_KEY.getText(), entry, StandardField.KEY));
         }
         return Collections.emptyList();
     }
diff --git a/src/main/java/org/jabref/logic/integrity/DateChecker.java b/src/main/java/org/jabref/logic/integrity/DateChecker.java
index a79e37994e8..f0319a7ebc7 100644
--- a/src/main/java/org/jabref/logic/integrity/DateChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/DateChecker.java
@@ -2,7 +2,6 @@
 
 import java.util.Optional;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.Date;
 import org.jabref.model.strings.StringUtil;
 
@@ -16,7 +15,7 @@ public Optional<String> checkValue(String value) {
 
         Optional<Date> parsedDate = Date.parse(value);
         if (parsedDate.isEmpty()) {
-            return Optional.of(Localization.lang("incorrect format"));
+            return Optional.of(IntegrityIssue.INCORRECT_FORMAT.getText());
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/DoiDuplicationChecker.java b/src/main/java/org/jabref/logic/integrity/DoiDuplicationChecker.java
index a59c07c2905..65fc5d2a250 100644
--- a/src/main/java/org/jabref/logic/integrity/DoiDuplicationChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/DoiDuplicationChecker.java
@@ -7,7 +7,6 @@
 
 import javafx.collections.ObservableList;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -30,7 +29,7 @@ public List<IntegrityMessage> check(BibDatabase database) {
         return duplicateMap.inverse().keySet().stream()
                            .filter(list -> list.size() > 1)
                            .flatMap(Collection::stream)
-                           .map(item -> new IntegrityMessage(Localization.lang("Same DOI used in multiple entries"), item, StandardField.DOI))
+                           .map(item -> new IntegrityMessage(IntegrityIssue.SAME_DOI_USED_IN_MULTIPLE_ENTRIES.getText(), item, StandardField.DOI))
                            .collect(Collectors.toList());
     }
 }
diff --git a/src/main/java/org/jabref/logic/integrity/DoiValidityChecker.java b/src/main/java/org/jabref/logic/integrity/DoiValidityChecker.java
index a78c8b4d0ea..74400370365 100644
--- a/src/main/java/org/jabref/logic/integrity/DoiValidityChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/DoiValidityChecker.java
@@ -2,7 +2,6 @@
 
 import java.util.Optional;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.strings.StringUtil;
 
@@ -16,7 +15,7 @@ public Optional<String> checkValue(String value) {
         if (DOI.isValid(value)) {
             return Optional.empty();
         } else {
-            return Optional.of(Localization.lang("DOI %0 is invalid", value));
+            return Optional.of(IntegrityIssue.DOI_IS_INVALID.getText());
         }
     }
 }
diff --git a/src/main/java/org/jabref/logic/integrity/EditionChecker.java b/src/main/java/org/jabref/logic/integrity/EditionChecker.java
index 3fb6ec5b89b..f073aa7d4e9 100644
--- a/src/main/java/org/jabref/logic/integrity/EditionChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/EditionChecker.java
@@ -46,15 +46,15 @@ public Optional<String> checkValue(String value) {
 
         if (bibDatabaseContextEdition.isBiblatexMode()) {
             if (!ONLY_NUMERALS_OR_LITERALS.test(value.trim())) {
-                return Optional.of(Localization.lang("should contain an integer or a literal"));
+                return Optional.of(IntegrityIssue.SHOULD_CONTAIN_AN_INTEGER_OR_A_LITERAL.getText());
             }
         } else {
             if (ONLY_NUMERALS.test(value) && (!allowIntegerEdition)) {
-                return Optional.of(Localization.lang("no integer as values for edition allowed"));
+                return Optional.of(IntegrityIssue.NO_INTEGER_AS_VALUE_FOR_EDITION_ALLOWED.getText());
             }
         }
         if (!isFirstCharDigit(value) && !FIRST_LETTER_CAPITALIZED.test(value.trim())) {
-            return Optional.of(Localization.lang("should have the first letter capitalized"));
+            return Optional.of(IntegrityIssue.SHOULD_HAVE_THE_FIRST_LETTER_CAPITALIZED.getText());
         }
         return Optional.empty();
     }
diff --git a/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java b/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java
index 8827e8a2169..344944e427c 100644
--- a/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java
@@ -6,7 +6,6 @@
 import java.util.Objects;
 import java.util.Set;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
@@ -29,7 +28,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
                 entry.getEntryLinkList(field.getKey(), database).stream()
                      .filter(parsedEntryLink -> parsedEntryLink.getLinkedEntry().isEmpty())
                      .forEach(parsedEntryLink -> result.add(new IntegrityMessage(
-                             Localization.lang("Referenced citation key '%0' does not exist", parsedEntryLink.getKey()),
+                             IntegrityIssue.REFERENCED_CITATION_KEY_DOES_NOT_EXIST.getText(),
                              entry, field.getKey())));
             }
         }
diff --git a/src/main/java/org/jabref/logic/integrity/FileChecker.java b/src/main/java/org/jabref/logic/integrity/FileChecker.java
index d59e3c5d1ea..646c0a790a0 100644
--- a/src/main/java/org/jabref/logic/integrity/FileChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/FileChecker.java
@@ -8,7 +8,6 @@
 
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.importer.util.FileFieldParser;
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.strings.StringUtil;
@@ -37,7 +36,7 @@ public Optional<String> checkValue(String value) {
         for (LinkedFile file : linkedFiles) {
             Optional<Path> linkedFile = file.findIn(context, filePreferences);
             if ((linkedFile.isEmpty()) || !Files.exists(linkedFile.get())) {
-                return Optional.of(Localization.lang("link should refer to a correct file path"));
+                return Optional.of(IntegrityIssue.LINK_SHOULD_REFER_TO_A_CORRECT_FILE_PATH.getText());
             }
         }
 
diff --git a/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java b/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java
index b987a1f541a..c30c4074ffa 100644
--- a/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java
@@ -3,7 +3,6 @@
 import java.util.List;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.FieldProperty;
 
@@ -19,7 +18,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
         return entry.getFieldMap().entrySet().stream()
                     .filter(field -> !field.getKey().getProperties().contains(FieldProperty.VERBATIM))
                     .filter(field -> HTML_CHARACTER_PATTERN.matcher(field.getValue()).find())
-                    .map(field -> new IntegrityMessage(Localization.lang("HTML encoded character found"), entry, field.getKey()))
+                    .map(field -> new IntegrityMessage(IntegrityIssue.HTML_ENCODED_CHARACTER_FOUND.getText(), entry, field.getKey()))
                     .toList();
     }
 }
diff --git a/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java b/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java
index 75e358732fa..52ed340d4cf 100644
--- a/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java
@@ -5,7 +5,6 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.strings.StringUtil;
 
@@ -33,7 +32,7 @@ public Optional<String> checkValue(String value) {
 
         // BibTeX
         if (!databaseContext.isBiblatexMode() && !FIRST_LETTER_CAPITALIZED.test(value.trim())) {
-            return Optional.of(Localization.lang("should have the first letter capitalized"));
+            return Optional.of(IntegrityIssue.SHOULD_HAVE_THE_FIRST_CHARACTER_CAPITALIZED.getText());
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/ISBNChecker.java b/src/main/java/org/jabref/logic/integrity/ISBNChecker.java
index c774dc9148a..f1876dfb812 100644
--- a/src/main/java/org/jabref/logic/integrity/ISBNChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/ISBNChecker.java
@@ -2,7 +2,6 @@
 
 import java.util.Optional;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.identifier.ISBN;
 import org.jabref.model.strings.StringUtil;
 
@@ -18,11 +17,11 @@ public Optional<String> checkValue(String value) {
         ISBN isbn = new ISBN(value);
 
         if (!isbn.isValidFormat()) {
-            return Optional.of(Localization.lang("incorrect format"));
+            return Optional.of(IntegrityIssue.INCORRECT_FORMAT.getText());
         }
 
         if (!isbn.isValidChecksum()) {
-            return Optional.of(Localization.lang("incorrect control digit"));
+            return Optional.of(IntegrityIssue.INCORRECT_CONTROL_DIGIT.getText());
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/ISSNChecker.java b/src/main/java/org/jabref/logic/integrity/ISSNChecker.java
index f7205d195b5..0ed73369bb8 100644
--- a/src/main/java/org/jabref/logic/integrity/ISSNChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/ISSNChecker.java
@@ -2,7 +2,6 @@
 
 import java.util.Optional;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.identifier.ISSN;
 import org.jabref.model.strings.StringUtil;
 
@@ -19,11 +18,11 @@ public Optional<String> checkValue(String value) {
 
         ISSN issn = new ISSN(issnString);
         if (!issn.isValidFormat()) {
-            return Optional.of(Localization.lang("incorrect format"));
+            return Optional.of(IntegrityIssue.INCORRECT_FORMAT.getText());
         }
 
         if (!issn.isValidChecksum()) {
-            return Optional.of(Localization.lang("incorrect control digit"));
+            return Optional.of(IntegrityIssue.INCORRECT_CONTROL_DIGIT.getText());
         }
         return Optional.empty();
     }
diff --git a/src/main/java/org/jabref/logic/integrity/IntegrityIssue.java b/src/main/java/org/jabref/logic/integrity/IntegrityIssue.java
new file mode 100644
index 00000000000..e6248e726fd
--- /dev/null
+++ b/src/main/java/org/jabref/logic/integrity/IntegrityIssue.java
@@ -0,0 +1,61 @@
+package org.jabref.logic.integrity;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+import org.jabref.logic.l10n.Localization;
+
+public enum IntegrityIssue {
+    CITATION_KEY_DEVIATES_FROM_GENERATED_KEY(Localization.lang("Citation key deviates from generated key")),
+    BIBTEX_FIELD_ONLY_KEY(Localization.lang("bibtex field only"), Localization.lang("Remove field")),
+    BIBTEX_FIELD_ONLY_CROSS_REF(Localization.lang("bibtex field only"), Localization.lang("Remove field")),
+    JOURNAL_NOT_FOUND_IN_ABBREVIATION_LIST(Localization.lang("journal not found in abbreviation list")),
+    NO_INTEGER_AS_VALUE_FOR_EDITION_ALLOWED(Localization.lang("no integer as values for edition allowed")),
+    SHOULD_CONTAIN_AN_INTEGER_OR_A_LITERAL(Localization.lang("should contain an integer or a literal")),
+    SHOULD_HAVE_THE_FIRST_LETTER_CAPITALIZED(Localization.lang("should have the first letter capitalized")),
+    REFERENCED_CITATION_KEY_DOES_NOT_EXIST(Localization.lang("Referenced citation key does not exist")),
+    NON_ASCII_ENCODED_CHARACTER_FOUND(Localization.lang("Non-ASCII encoded character found")),
+    SHOULD_CONTAIN_A_VALID_PAGE_NUMBER_RANGE(Localization.lang("should contain a valid page number range")),
+    CAPITAL_LETTER_ARE_NOT_MASKED_USING_CURLY_BRACKETS(Localization.lang("capital letters are not masked using curly brackets {}"), Localization.lang("Mask letters")),
+    BOOKTITLE_ENDS_WITH_CONFERENCE_ON(Localization.lang("booktitle ends with 'conference on'")),
+    INCORRECT_FORMAT(Localization.lang("incorrect format")),
+    INCORRECT_CONTROL_DIGIT(Localization.lang("incorrect control digit")),
+    ABBREVIATION_DETECTED(Localization.lang("abbreviation detected")),
+    ODD_NUMBER_OF_UNESCAPED(Localization.lang("odd number of unescaped '#'")),
+    ENTRY_TYPE_IS_ONLY_DEFINED_FOR_BIBLATEX_BUT_NOT_FOR_BIBTEX(Localization.lang("Entry type %0 is only defined for Biblatex but not for BibTeX")),
+    UNEXPECTED_OPENING_CURLY_BRACKET(Localization.lang("unexpected opening curly bracket")),
+    UNEXPECTED_CLOSING_CURLY_BRACKET(Localization.lang("unexpected closing curly bracket")),
+    DUPLICATE_CITATION_KEY(Localization.lang("Duplicate citation key")),
+    SAME_DOI_USED_IN_MULTIPLE_ENTRIES(Localization.lang("Same DOI used in multiple entries")),
+    DOI_IS_INVALID(Localization.lang("DOI is invalid")),
+    LINK_SHOULD_REFER_TO_A_CORRECT_FILE_PATH(Localization.lang("link should refer to a correct file path")),
+    SHOULD_HAVE_THE_FIRST_CHARACTER_CAPITALIZED(Localization.lang("should have the first letter capitalized")),
+    HTML_ENCODED_CHARACTER_FOUND(Localization.lang("HTML encoded character found"));
+
+    private final String text;
+    private final String fix;
+
+    IntegrityIssue(String text, String fix) {
+        this.text = text;
+        this.fix = fix;
+    }
+
+    IntegrityIssue(String text) {
+        this.text = text;
+        this.fix = null;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public String getFix() {
+        return fix;
+    }
+
+    public static Optional<IntegrityIssue> fromMessage(IntegrityMessage message) {
+        return Arrays.stream(IntegrityIssue.values())
+                     .filter(symbol -> symbol.getText().equals(message.message()))
+                     .findFirst();
+    }
+}
diff --git a/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java b/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java
index 88269b27dd7..2b7f76b71cf 100644
--- a/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java
@@ -6,7 +6,6 @@
 import java.util.Optional;
 
 import org.jabref.logic.journals.JournalAbbreviationRepository;
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
@@ -29,7 +28,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
 
         final String journal = value.get();
         if (!abbreviationRepository.isKnownName(journal)) {
-            return Collections.singletonList(new IntegrityMessage(Localization.lang("journal not found in abbreviation list"), entry, field));
+            return Collections.singletonList(new IntegrityMessage(IntegrityIssue.JOURNAL_NOT_FOUND_IN_ABBREVIATION_LIST.getText(), entry, field));
         }
 
         return Collections.emptyList();
diff --git a/src/main/java/org/jabref/logic/integrity/PagesChecker.java b/src/main/java/org/jabref/logic/integrity/PagesChecker.java
index d21caa310ff..b2e4752f32c 100644
--- a/src/main/java/org/jabref/logic/integrity/PagesChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/PagesChecker.java
@@ -58,7 +58,7 @@ public Optional<String> checkValue(String value) {
         if (Arrays.stream(value.split(","))
                 .map(String::trim)
                 .anyMatch(pageRange -> !isValidPageNumber.test(pageRange))) {
-            return Optional.of(Localization.lang("should contain a valid page number range"));
+            return Optional.of(IntegrityIssue.SHOULD_CONTAIN_A_VALID_PAGE_NUMBER_RANGE.getText());
         }
         return Optional.empty();
     }
diff --git a/src/main/java/org/jabref/logic/integrity/TitleChecker.java b/src/main/java/org/jabref/logic/integrity/TitleChecker.java
index 824c8673f46..afd23dc91c2 100644
--- a/src/main/java/org/jabref/logic/integrity/TitleChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/TitleChecker.java
@@ -4,7 +4,6 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.strings.StringUtil;
 
@@ -48,7 +47,7 @@ public Optional<String> checkValue(String value) {
             if (!subTitle.isEmpty()) {
                 subTitle = subTitle.substring(1);
                 if (HAS_CAPITAL_LETTERS.test(subTitle)) {
-                    return Optional.of(Localization.lang("capital letters are not masked using curly brackets {}"));
+                    return Optional.of(IntegrityIssue.CAPITAL_LETTER_ARE_NOT_MASKED_USING_CURLY_BRACKETS.getText());
                 }
             }
         }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index ba0b44ad063..555abd18aa3 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1412,6 +1412,7 @@ capital\ letters\ are\ not\ masked\ using\ curly\ brackets\ {}=capital letters a
 should\ contain\ a\ four\ digit\ number=should contain a four digit number
 should\ contain\ a\ valid\ page\ number\ range=should contain a valid page number range
 Mask\ letters=Mask letters
+DOI\ is\ invalid=DOI is invalid
 
 Unable\ to\ autodetect\ OpenOffice/LibreOffice\ installation.\ Please\ choose\ the\ installation\ directory\ manually.=Unable to autodetect OpenOffice/LibreOffice installation. Please choose the installation directory manually.
 
@@ -1840,7 +1841,6 @@ Entered\ database\ has\ obsolete\ structure\ and\ is\ no\ longer\ supported.=Ent
 However,\ a\ new\ database\ was\ created\ alongside\ the\ pre-3.6\ one.=However, a new database was created alongside the pre-3.6 one.
 Opens\ a\ link\ where\ the\ current\ development\ version\ can\ be\ downloaded=Opens a link where the current development version can be downloaded
 See\ what\ has\ been\ changed\ in\ the\ JabRef\ versions=See what has been changed in the JabRef versions
-Referenced\ citation\ key\ '%0'\ does\ not\ exist=Referenced citation key '%0' does not exist
 Referenced\ citation\ key\ does\ not\ exist=Referenced citation key does not exist
 Full\ text\ document\ for\ entry\ %0\ already\ linked.=Full text document for entry %0 already linked.
 Download\ full\ text\ documents=Download full text documents
@@ -1891,7 +1891,6 @@ Update\ with\ bibliographic\ information\ from\ the\ web=Update with bibliograph
 
 Could\ not\ find\ any\ bibliographic\ information.=Could not find any bibliographic information.
 Citation\ key\ deviates\ from\ generated\ key=Citation key deviates from generated key
-DOI\ %0\ is\ invalid=DOI %0 is invalid
 
 Select\ all\ customized\ types\ to\ be\ stored\ in\ local\ preferences\:=Select all customized types to be stored in local preferences\:
 Different\ customization,\ current\ settings\ will\ be\ overwritten=Different customization, current settings will be overwritten

From 102e7894f0ccd3a8ffb4a2a86ad8de5610d65b66 Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Fri, 28 Feb 2025 06:34:37 +0530
Subject: [PATCH 22/30] Fix the checkstyle check

---
 src/main/java/org/jabref/logic/integrity/PagesChecker.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/jabref/logic/integrity/PagesChecker.java b/src/main/java/org/jabref/logic/integrity/PagesChecker.java
index b2e4752f32c..6d50b3074bf 100644
--- a/src/main/java/org/jabref/logic/integrity/PagesChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/PagesChecker.java
@@ -5,7 +5,6 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.strings.StringUtil;
 

From 2d1a5a47e57fdd90994707b1b64dd5fb6f120232 Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Fri, 28 Feb 2025 06:49:05 +0530
Subject: [PATCH 23/30] Use enum in remaining checkers

---
 .../org/jabref/logic/integrity/AmpersandChecker.java   |  3 +--
 .../org/jabref/logic/integrity/IntegrityIssue.java     | 10 +++++++++-
 .../java/org/jabref/logic/integrity/MonthChecker.java  |  5 ++---
 .../jabref/logic/integrity/NoBibtexFieldChecker.java   |  3 +--
 .../java/org/jabref/logic/integrity/NoteChecker.java   |  3 +--
 .../logic/integrity/ValidCitationKeyChecker.java       |  5 ++---
 .../java/org/jabref/logic/integrity/YearChecker.java   |  5 ++---
 src/main/resources/l10n/JabRef_en.properties           |  2 +-
 8 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/jabref/logic/integrity/AmpersandChecker.java b/src/main/java/org/jabref/logic/integrity/AmpersandChecker.java
index 43098173dfa..27465770e27 100644
--- a/src/main/java/org/jabref/logic/integrity/AmpersandChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/AmpersandChecker.java
@@ -8,7 +8,6 @@
 
 import javafx.util.Pair;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
@@ -31,7 +30,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
                     .filter(field -> FieldFactory.isLatexField(field.getKey()))
                     // We use "flatMap" instead of filtering later, because we assume there won't be that much error messages - and construction of Stream.empty() is faster than construction of a new Tuple2 (including lifting long to Long)
                     .flatMap(AmpersandChecker::getUnescapedAmpersandsWithCount)
-                    .map(pair -> new IntegrityMessage(Localization.lang("Found %0 unescaped '&'", pair.getValue()), entry, pair.getKey()))
+                    .map(pair -> new IntegrityMessage(IntegrityIssue.FOUND_UNESCAPED_AMPERSAND.getText(), entry, pair.getKey()))
                     .toList();
     }
 
diff --git a/src/main/java/org/jabref/logic/integrity/IntegrityIssue.java b/src/main/java/org/jabref/logic/integrity/IntegrityIssue.java
index e6248e726fd..c46d1cd806c 100644
--- a/src/main/java/org/jabref/logic/integrity/IntegrityIssue.java
+++ b/src/main/java/org/jabref/logic/integrity/IntegrityIssue.java
@@ -30,7 +30,15 @@ public enum IntegrityIssue {
     DOI_IS_INVALID(Localization.lang("DOI is invalid")),
     LINK_SHOULD_REFER_TO_A_CORRECT_FILE_PATH(Localization.lang("link should refer to a correct file path")),
     SHOULD_HAVE_THE_FIRST_CHARACTER_CAPITALIZED(Localization.lang("should have the first letter capitalized")),
-    HTML_ENCODED_CHARACTER_FOUND(Localization.lang("HTML encoded character found"));
+    HTML_ENCODED_CHARACTER_FOUND(Localization.lang("HTML encoded character found")),
+    FOUND_UNESCAPED_AMPERSAND(Localization.lang("Found unescaped '&'")),
+    LAST_FOUR_NONPUNCTUATION_CHARACTERS_SHOULD_BE_NUMERALS(Localization.lang("last four nonpunctuation characters should be numerals")),
+    SHOULD_CONTAIN_A_FOUR_DIGIT_NUMBER(Localization.lang("should contain a four digit number")),
+    EMPTY_CITATION_KEY("empty citation key"),
+    INVALID_CITATION_KEY("Invalid citation key"),
+    SHOULD_BE_NORMALIZED("should be normalized"),
+    SHOULD_BE_AN_INTEGER_OR_NORMALIZED("should be an integer or normalized"),
+
 
     private final String text;
     private final String fix;
diff --git a/src/main/java/org/jabref/logic/integrity/MonthChecker.java b/src/main/java/org/jabref/logic/integrity/MonthChecker.java
index f3b34b8f901..0a00bd135b6 100644
--- a/src/main/java/org/jabref/logic/integrity/MonthChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/MonthChecker.java
@@ -5,7 +5,6 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.strings.StringUtil;
 
@@ -40,12 +39,12 @@ public Optional<String> checkValue(String value) {
         // biblatex
         if (bibDatabaseContextMonth.isBiblatexMode()
                 && !(ONLY_AN_INTEGER.test(value.trim()) || MONTH_NORMALIZED.test(value.trim()))) {
-            return Optional.of(Localization.lang("should be an integer or normalized"));
+            return Optional.of(IntegrityIssue.SHOULD_BE_AN_INTEGER_OR_NORMALIZED.getText());
         }
 
         // BibTeX
         if (!bibDatabaseContextMonth.isBiblatexMode() && !MONTH_NORMALIZED.test(value.trim())) {
-            return Optional.of(Localization.lang("should be normalized"));
+            return Optional.of(IntegrityIssue.SHOULD_BE_NORMALIZED.getText());
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java b/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
index feb29ad750d..723b4e60698 100644
--- a/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
@@ -4,7 +4,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.BibField;
 import org.jabref.model.entry.field.Field;
@@ -36,6 +35,6 @@ public List<IntegrityMessage> check(BibEntry entry) {
         final Set<Field> allBiblatexOnlyFields = getAllBiblatexOnlyFields();
         return entry.getFields().stream()
                     .filter(allBiblatexOnlyFields::contains)
-                    .map(name -> new IntegrityMessage(Localization.lang("biblatex field only"), entry, name)).collect(Collectors.toList());
+                    .map(name -> new IntegrityMessage(IntegrityIssue.BIBTEX_FIELD_ONLY_KEY.getText(), entry, name)).collect(Collectors.toList());
     }
 }
diff --git a/src/main/java/org/jabref/logic/integrity/NoteChecker.java b/src/main/java/org/jabref/logic/integrity/NoteChecker.java
index db80442d1e9..25289d88705 100644
--- a/src/main/java/org/jabref/logic/integrity/NoteChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/NoteChecker.java
@@ -5,7 +5,6 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.strings.StringUtil;
 
@@ -33,7 +32,7 @@ public Optional<String> checkValue(String value) {
 
         // BibTeX
         if (!bibDatabaseContextEdition.isBiblatexMode() && !FIRST_LETTER_CAPITALIZED.test(value.trim())) {
-            return Optional.of(Localization.lang("should have the first letter capitalized"));
+            return Optional.of(IntegrityIssue.SHOULD_HAVE_THE_FIRST_CHARACTER_CAPITALIZED.getText());
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/ValidCitationKeyChecker.java b/src/main/java/org/jabref/logic/integrity/ValidCitationKeyChecker.java
index e23fcb2b41e..2dc870fd7eb 100644
--- a/src/main/java/org/jabref/logic/integrity/ValidCitationKeyChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/ValidCitationKeyChecker.java
@@ -3,7 +3,6 @@
 import java.util.Optional;
 
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
 
 /**
@@ -14,7 +13,7 @@ public class ValidCitationKeyChecker implements ValueChecker {
     @Override
     public Optional<String> checkValue(String value) {
         if (StringUtil.isNullOrEmpty(value)) {
-            return Optional.of(Localization.lang("empty citation key"));
+            return Optional.of(IntegrityIssue.EMPTY_CITATION_KEY.getText());
         }
 
         String cleaned = CitationKeyGenerator.cleanKey(value, "");
@@ -22,7 +21,7 @@ public Optional<String> checkValue(String value) {
         if (cleaned.equals(value)) {
             return Optional.empty();
         } else {
-            return Optional.of(Localization.lang("Invalid citation key"));
+            return Optional.of(IntegrityIssue.INVALID_CITATION_KEY.getText());
         }
     }
 }
diff --git a/src/main/java/org/jabref/logic/integrity/YearChecker.java b/src/main/java/org/jabref/logic/integrity/YearChecker.java
index 3dc98f75d2d..3a6b2501992 100644
--- a/src/main/java/org/jabref/logic/integrity/YearChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/YearChecker.java
@@ -4,7 +4,6 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
 
 public class YearChecker implements ValueChecker {
@@ -28,11 +27,11 @@ public Optional<String> checkValue(String value) {
         }
 
         if (!CONTAINS_FOUR_DIGIT.test(value.trim())) {
-            return Optional.of(Localization.lang("should contain a four digit number"));
+            return Optional.of(IntegrityIssue.SHOULD_CONTAIN_A_FOUR_DIGIT_NUMBER.getText());
         }
 
         if (!ENDS_WITH_FOUR_DIGIT.test(value.replaceAll(PUNCTUATION_MARKS, ""))) {
-            return Optional.of(Localization.lang("last four nonpunctuation characters should be numerals"));
+            return Optional.of(IntegrityIssue.LAST_FOUR_NONPUNCTUATION_CHARACTERS_SHOULD_BE_NUMERALS.getText());
         }
 
         return Optional.empty();
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 555abd18aa3..2c4f09a7163 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1617,7 +1617,7 @@ Verse=Verse
 change\ entries\ of\ group=change entries of group
 odd\ number\ of\ unescaped\ '\#'=odd number of unescaped '#'
 
-Found\ %0\ unescaped\ '\&'=Found %0 unescaped '&'
+Found\ unescaped\ '\&'=Found unescaped '&'
 
 Show\ diff=Show diff
 Copy\ Version=Copy Version

From 361765b768ae4a636a2ca804d571627397c8f194 Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Fri, 28 Feb 2025 07:24:49 +0530
Subject: [PATCH 24/30] Fix the check

---
 .../integrity/IntegrityCheckDialogViewModel.java    |  2 +-
 .../org/jabref/logic/integrity/IntegrityIssue.java  | 13 ++++++-------
 .../logic/integrity/NoBibtexFieldChecker.java       |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
index cf2c45d9c95..861cdb93293 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
@@ -64,7 +64,7 @@ public void fix(IntegrityIssue issue, IntegrityMessage message) {
             case CAPITAL_LETTER_ARE_NOT_MASKED_USING_CURLY_BRACKETS:
                 maskTitle(message);
                 break;
-            case BIBTEX_FIELD_ONLY_KEY, BIBTEX_FIELD_ONLY_CROSS_REF:
+            case BIBTEX_FIELD_ONLY:
                 removeField(message, message.field());
                 break;
             case INCORRECT_FORMAT:
diff --git a/src/main/java/org/jabref/logic/integrity/IntegrityIssue.java b/src/main/java/org/jabref/logic/integrity/IntegrityIssue.java
index c46d1cd806c..0ba83603416 100644
--- a/src/main/java/org/jabref/logic/integrity/IntegrityIssue.java
+++ b/src/main/java/org/jabref/logic/integrity/IntegrityIssue.java
@@ -7,8 +7,8 @@
 
 public enum IntegrityIssue {
     CITATION_KEY_DEVIATES_FROM_GENERATED_KEY(Localization.lang("Citation key deviates from generated key")),
-    BIBTEX_FIELD_ONLY_KEY(Localization.lang("bibtex field only"), Localization.lang("Remove field")),
-    BIBTEX_FIELD_ONLY_CROSS_REF(Localization.lang("bibtex field only"), Localization.lang("Remove field")),
+    BIBTEX_FIELD_ONLY(Localization.lang("bibtex field only"), Localization.lang("Remove field")),
+    BIBLATEX_FIELD_ONLY(Localization.lang("biblatex field only"), Localization.lang("Remove field")),
     JOURNAL_NOT_FOUND_IN_ABBREVIATION_LIST(Localization.lang("journal not found in abbreviation list")),
     NO_INTEGER_AS_VALUE_FOR_EDITION_ALLOWED(Localization.lang("no integer as values for edition allowed")),
     SHOULD_CONTAIN_AN_INTEGER_OR_A_LITERAL(Localization.lang("should contain an integer or a literal")),
@@ -34,11 +34,10 @@ public enum IntegrityIssue {
     FOUND_UNESCAPED_AMPERSAND(Localization.lang("Found unescaped '&'")),
     LAST_FOUR_NONPUNCTUATION_CHARACTERS_SHOULD_BE_NUMERALS(Localization.lang("last four nonpunctuation characters should be numerals")),
     SHOULD_CONTAIN_A_FOUR_DIGIT_NUMBER(Localization.lang("should contain a four digit number")),
-    EMPTY_CITATION_KEY("empty citation key"),
-    INVALID_CITATION_KEY("Invalid citation key"),
-    SHOULD_BE_NORMALIZED("should be normalized"),
-    SHOULD_BE_AN_INTEGER_OR_NORMALIZED("should be an integer or normalized"),
-
+    EMPTY_CITATION_KEY(Localization.lang("empty citation key")),
+    INVALID_CITATION_KEY(Localization.lang("Invalid citation key")),
+    SHOULD_BE_NORMALIZED(Localization.lang("should be normalized")),
+    SHOULD_BE_AN_INTEGER_OR_NORMALIZED(Localization.lang("should be an integer or normalized"));
 
     private final String text;
     private final String fix;
diff --git a/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java b/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
index 723b4e60698..38e9edfd5c3 100644
--- a/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
@@ -35,6 +35,6 @@ public List<IntegrityMessage> check(BibEntry entry) {
         final Set<Field> allBiblatexOnlyFields = getAllBiblatexOnlyFields();
         return entry.getFields().stream()
                     .filter(allBiblatexOnlyFields::contains)
-                    .map(name -> new IntegrityMessage(IntegrityIssue.BIBTEX_FIELD_ONLY_KEY.getText(), entry, name)).collect(Collectors.toList());
+                    .map(name -> new IntegrityMessage(IntegrityIssue.BIBTEX_FIELD_ONLY.getText(), entry, name)).collect(Collectors.toList());
     }
 }

From 19a78811287c5f6ba258c0cf72318b3b5d3458b0 Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Fri, 28 Feb 2025 07:46:19 +0530
Subject: [PATCH 25/30] Revert "Fix the checkstyle check"

This reverts commit 102e7894f0ccd3a8ffb4a2a86ad8de5610d65b66.
---
 src/main/java/org/jabref/logic/integrity/PagesChecker.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/jabref/logic/integrity/PagesChecker.java b/src/main/java/org/jabref/logic/integrity/PagesChecker.java
index 6d50b3074bf..b2e4752f32c 100644
--- a/src/main/java/org/jabref/logic/integrity/PagesChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/PagesChecker.java
@@ -5,6 +5,7 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
+import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.strings.StringUtil;
 

From 6a5da7a598bcc07f91d9eea64cd16df2e5044626 Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Fri, 28 Feb 2025 07:57:14 +0530
Subject: [PATCH 26/30] Fix the check

---
 .../java/org/jabref/logic/integrity/NoBibtexFieldChecker.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java b/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
index 38e9edfd5c3..68b0e1e5eb4 100644
--- a/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
@@ -35,6 +35,6 @@ public List<IntegrityMessage> check(BibEntry entry) {
         final Set<Field> allBiblatexOnlyFields = getAllBiblatexOnlyFields();
         return entry.getFields().stream()
                     .filter(allBiblatexOnlyFields::contains)
-                    .map(name -> new IntegrityMessage(IntegrityIssue.BIBTEX_FIELD_ONLY.getText(), entry, name)).collect(Collectors.toList());
+                    .map(name -> new IntegrityMessage(IntegrityIssue.BIBLATEX_FIELD_ONLY.getText(), entry, name)).collect(Collectors.toList());
     }
 }

From 1bfd407ee9488ca64875bf2c98ae2ed9f5105327 Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Fri, 28 Feb 2025 07:57:55 +0530
Subject: [PATCH 27/30] Fix the check

---
 src/main/java/org/jabref/logic/integrity/PagesChecker.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/jabref/logic/integrity/PagesChecker.java b/src/main/java/org/jabref/logic/integrity/PagesChecker.java
index b2e4752f32c..6d50b3074bf 100644
--- a/src/main/java/org/jabref/logic/integrity/PagesChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/PagesChecker.java
@@ -5,7 +5,6 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.strings.StringUtil;
 

From fd0045fa26e900faf3cc56c283ed847e33c5a983 Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Fri, 28 Feb 2025 08:08:25 +0530
Subject: [PATCH 28/30] Fix the check

---
 src/main/java/org/jabref/logic/integrity/AmpersandChecker.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/logic/integrity/AmpersandChecker.java b/src/main/java/org/jabref/logic/integrity/AmpersandChecker.java
index 27465770e27..43098173dfa 100644
--- a/src/main/java/org/jabref/logic/integrity/AmpersandChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/AmpersandChecker.java
@@ -8,6 +8,7 @@
 
 import javafx.util.Pair;
 
+import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
@@ -30,7 +31,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
                     .filter(field -> FieldFactory.isLatexField(field.getKey()))
                     // We use "flatMap" instead of filtering later, because we assume there won't be that much error messages - and construction of Stream.empty() is faster than construction of a new Tuple2 (including lifting long to Long)
                     .flatMap(AmpersandChecker::getUnescapedAmpersandsWithCount)
-                    .map(pair -> new IntegrityMessage(IntegrityIssue.FOUND_UNESCAPED_AMPERSAND.getText(), entry, pair.getKey()))
+                    .map(pair -> new IntegrityMessage(Localization.lang("Found %0 unescaped '&'", pair.getValue()), entry, pair.getKey()))
                     .toList();
     }
 

From 9dfed1a42970dace23f83cfd21209c3d6acabd46 Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Fri, 28 Feb 2025 08:18:10 +0530
Subject: [PATCH 29/30] Fix the check

---
 src/main/java/org/jabref/logic/integrity/IntegrityIssue.java | 1 -
 src/main/resources/l10n/JabRef_en.properties                 | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/logic/integrity/IntegrityIssue.java b/src/main/java/org/jabref/logic/integrity/IntegrityIssue.java
index 0ba83603416..d1fd4045393 100644
--- a/src/main/java/org/jabref/logic/integrity/IntegrityIssue.java
+++ b/src/main/java/org/jabref/logic/integrity/IntegrityIssue.java
@@ -31,7 +31,6 @@ public enum IntegrityIssue {
     LINK_SHOULD_REFER_TO_A_CORRECT_FILE_PATH(Localization.lang("link should refer to a correct file path")),
     SHOULD_HAVE_THE_FIRST_CHARACTER_CAPITALIZED(Localization.lang("should have the first letter capitalized")),
     HTML_ENCODED_CHARACTER_FOUND(Localization.lang("HTML encoded character found")),
-    FOUND_UNESCAPED_AMPERSAND(Localization.lang("Found unescaped '&'")),
     LAST_FOUR_NONPUNCTUATION_CHARACTERS_SHOULD_BE_NUMERALS(Localization.lang("last four nonpunctuation characters should be numerals")),
     SHOULD_CONTAIN_A_FOUR_DIGIT_NUMBER(Localization.lang("should contain a four digit number")),
     EMPTY_CITATION_KEY(Localization.lang("empty citation key")),
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 2c4f09a7163..555abd18aa3 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1617,7 +1617,7 @@ Verse=Verse
 change\ entries\ of\ group=change entries of group
 odd\ number\ of\ unescaped\ '\#'=odd number of unescaped '#'
 
-Found\ unescaped\ '\&'=Found unescaped '&'
+Found\ %0\ unescaped\ '\&'=Found %0 unescaped '&'
 
 Show\ diff=Show diff
 Copy\ Version=Copy Version

From 7a45ddd4e8d109246e5058df0f0306822acda0ba Mon Sep 17 00:00:00 2001
From: Priyanshu Gupta <priyanshu16095@gmail.com>
Date: Fri, 28 Feb 2025 08:56:55 +0530
Subject: [PATCH 30/30] Add JavaDoc comments

---
 .../gui/integrity/IntegrityCheckDialog.java   | 25 +++++++++++++++++--
 .../logic/integrity/IntegrityIssue.java       |  5 ++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
index 8a9a3d3d556..48e1965c51d 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -110,6 +110,12 @@ protected void updateItem(String item, boolean empty) {
                 configureAction(rowData);
             }
 
+            /**
+             * Configures the action for the button based on the provided {@link IntegrityMessage}.
+             * If a fix is available for the message, the button is configured to apply the fix when clicked.
+             *
+             * @param message the {@link IntegrityMessage} to check for available fixes
+             */
             private void configureAction(IntegrityMessage message) {
                 Optional<IntegrityIssue> issue = IntegrityIssue.fromMessage(message);
                 if (issue.isPresent() && issue.get().getFix() != null) {
@@ -189,12 +195,23 @@ private void updateEntryTypeCombo() {
         }
     }
 
+    /**
+     * Checks if a given {@link IntegrityMessage} has a fix available.
+     *
+     * @param message the {@link IntegrityMessage} to check
+     * @return {@code true} if a fix is available, {@code false} otherwise
+     */
     private boolean hasFix(IntegrityMessage message) {
         return message != null && message.field() != null && IntegrityIssue.fromMessage(message)
                                                                            .map(issue -> issue.getFix() != null)
                                                                            .orElse(false);
     }
 
+    /**
+     * Attempts to fix all {@link IntegrityMessage} objects of the selected type.
+     * If fixes are available, they are applied, and the fixed messages are removed.
+     * A notification is shown to indicate success or failure.
+     */
     @FXML
     private void fixByType() {
         AtomicBoolean fixed = new AtomicBoolean(false);
@@ -206,7 +223,7 @@ private void fixByType() {
 
         selectedIssue.ifPresent(issue -> {
             messagesTable.getItems().stream()
-                    .filter(message -> message.message().equals(issue.getText()) && hasFix(message))
+                    .filter(message -> message.message().equals(issue.getText()) && hasFix(message)) // Filter messages matching the selected issue type and have a fix
                     .forEach(message -> {
                         viewModel.fix(issue, message);
                         viewModel.removeFromEntryTypes(message.field().getDisplayName());
@@ -224,10 +241,14 @@ private void fixByType() {
         }
     }
 
+    /**
+     * Attempts to fix all {@link IntegrityMessage} objects that have a fix available.
+     * Messages with applicable fixes are processed, and the corresponding UI elements are updated.
+     */
     @FXML
     private void fixAll() {
         messagesTable.getItems().stream()
-                .filter(this::hasFix)
+                .filter(this::hasFix)   // Filter all messages that have a fix
                 .forEach(message -> IntegrityIssue.fromMessage(message).ifPresent(issue -> {
                     viewModel.fix(issue, message);
                     viewModel.removeFromEntryTypes(message.field().getDisplayName());
diff --git a/src/main/java/org/jabref/logic/integrity/IntegrityIssue.java b/src/main/java/org/jabref/logic/integrity/IntegrityIssue.java
index d1fd4045393..808b6fab2b1 100644
--- a/src/main/java/org/jabref/logic/integrity/IntegrityIssue.java
+++ b/src/main/java/org/jabref/logic/integrity/IntegrityIssue.java
@@ -5,6 +5,11 @@
 
 import org.jabref.logic.l10n.Localization;
 
+/**
+ * Represents various integrity issues that can occur in a bibliography entry.
+ * Each issue has an associated message describing the problem, and some may provide
+ * a suggested fix.
+ */
 public enum IntegrityIssue {
     CITATION_KEY_DEVIATES_FROM_GENERATED_KEY(Localization.lang("Citation key deviates from generated key")),
     BIBTEX_FIELD_ONLY(Localization.lang("bibtex field only"), Localization.lang("Remove field")),