fix: cleanup MergeBibFilesIntoCurrentBib

- Replace 'bib files' to standardized 'BibTeX' in StandardActions
- Remove redundant Javadoc in MergeBibFilesIntoCurrentBibAction
- Rename boolean getters
- Delete obsolete test comments
- Correct Changelog issue link

Author: GuilhermeRibeiroPereira

CHANGELOG.md

@@ -35,7 +35,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We added a new `jabkit` command `pseudonymize` to pseudonymize the library. [#13109](https://github.com/JabRef/jabref/issues/13109)
 - We added functionality to focus running instance when trying to start a second instance. [#13129](https://github.com/JabRef/jabref/issues/13129)
 - We added a new setting in the 'Entry Editor' preferences to hide the 'File Annotations' tab when no annotations are available. [#13143](https://github.com/JabRef/jabref/issues/13143)
-- We added functionality to merge bib files in a given directory to the current bib and added a 'Merge other bib files into current bib' tab in the Preferences menu [#12290](https://github.com/JabRef/jabref/issues/12290#issuecomment-2909781975)
+- We added functionality to merge bib files in a given directory to the current bib and added a 'Merge other bib files into current bib' tab in the Preferences menu [#12290](https://github.com/JabRef/jabref/issues/12290)
 
 ### Changed
 

jabgui/src/main/java/org/jabref/gui/actions/StandardActions.java

@@ -87,7 +87,7 @@ public enum StandardActions implements Action {
     REPLACE_ALL(Localization.lang("Find and replace"), KeyBinding.REPLACE_STRING),
     MANAGE_KEYWORDS(Localization.lang("Manage keywords")),
     MASS_SET_FIELDS(Localization.lang("Manage field names & content")),
-    MERGE_BIB_FILES_INTO_CURRENT_BIB(Localization.lang("Merge other bib files into current library...")),
+    MERGE_BIB_FILES_INTO_CURRENT_BIB(Localization.lang("Merge other BibTeX files into current library...")),
 
     AUTOMATIC_FIELD_EDITOR(Localization.lang("Automatic field editor")),
     TOGGLE_GROUPS(Localization.lang("Groups"), IconTheme.JabRefIcons.TOGGLE_GROUPS, KeyBinding.TOGGLE_GROUPS_INTERFACE),

jabgui/src/main/java/org/jabref/gui/mergebibfilesintocurrentbib/MergeBibFilesIntoCurrentBibAction.java

@@ -47,9 +47,6 @@
 
 import static org.jabref.gui.actions.ActionHelper.needsDatabase;
 
-/**
- * Perform a merge libraries (.bib files) in folder into current library action
- */
 public class MergeBibFilesIntoCurrentBibAction extends SimpleCommand {
     private static final Logger LOGGER = LoggerFactory.getLogger(MergeBibFilesIntoCurrentBibAction.class);
 
@@ -98,8 +95,8 @@ public void execute() {
 
         MergeBibFilesIntoCurrentBibPreferences mergeBibFilesIntoCurrentBibPreferences = preferences.getMergeBibFilesIntoCurrentBibPreferences();
 
-        shouldMergeSameKeyEntries = mergeBibFilesIntoCurrentBibPreferences.getShouldMergeSameKeyEntries();
-        shouldMergeDuplicateEntries = mergeBibFilesIntoCurrentBibPreferences.getShouldMergeDuplicateEntries();
+        shouldMergeSameKeyEntries = mergeBibFilesIntoCurrentBibPreferences.shouldMergeSameKeyEntries();
+        shouldMergeDuplicateEntries = mergeBibFilesIntoCurrentBibPreferences.shouldMergeDuplicateEntries();
 
         if (selectedDirectory.isPresent() && context.isPresent()) {
             mergeBibFilesIntoCurrentBib(selectedDirectory.get(), context.get());

jabgui/src/main/java/org/jabref/gui/mergebibfilesintocurrentbib/MergeBibFilesIntoCurrentBibPreferences.java

@@ -12,7 +12,7 @@ public MergeBibFilesIntoCurrentBibPreferences(boolean shouldMergeSameKeyEntries,
         this.shouldMergeDuplicateEntries.set(shouldMergeDuplicateEntries);
     }
 
-    public boolean getShouldMergeSameKeyEntries() {
+    public boolean shouldMergeSameKeyEntries() {
         return this.shouldMergeSameKeyEntries.get();
     }
 
@@ -24,7 +24,7 @@ public BooleanProperty shouldMergeSameKeyEntriesProperty() {
         return this.shouldMergeSameKeyEntries;
     }
 
-    public boolean getShouldMergeDuplicateEntries() {
+    public boolean shouldMergeDuplicateEntries() {
         return this.shouldMergeDuplicateEntries.get();
     }
 

jabgui/src/main/java/org/jabref/gui/preferences/mergebibfilesintocurrentbib/MergeBibFilesIntoCurrentBibTabViewModel.java

@@ -15,13 +15,13 @@ public class MergeBibFilesIntoCurrentBibTabViewModel implements PreferenceTabVie
     private final MergeBibFilesIntoCurrentBibPreferences mergeBibFilesIntoCurrentBibPreferences;
 
     public MergeBibFilesIntoCurrentBibTabViewModel(GuiPreferences preferences) {
-        this.mergeBibFilesIntoCurrentBibPreferences = preferences.getMergeBibFilesIntoCurrentBibPreferences();
+        mergeBibFilesIntoCurrentBibPreferences = preferences.getMergeBibFilesIntoCurrentBibPreferences();
     }
 
     @Override
     public void setValues() {
-        mergeSameKeyEntriesProperty.setValue(mergeBibFilesIntoCurrentBibPreferences.getShouldMergeSameKeyEntries());
-        mergeDuplicateEntriesProperty.setValue(mergeBibFilesIntoCurrentBibPreferences.getShouldMergeDuplicateEntries());
+        mergeSameKeyEntriesProperty.setValue(mergeBibFilesIntoCurrentBibPreferences.shouldMergeSameKeyEntries());
+        mergeDuplicateEntriesProperty.setValue(mergeBibFilesIntoCurrentBibPreferences.shouldMergeDuplicateEntries());
     }
 
     @Override

jabgui/src/test/java/org/jabref/gui/mergebibfilesintocurrentbib/MergeBibFilesIntoCurrentBibTest.java

@@ -123,8 +123,8 @@ void setUp() throws IOException {
 
         when(stateManager.activeDatabaseProperty()).thenReturn(OptionalObjectProperty.empty());
 
-        when(mergeBibFilesIntoCurrentBibPreferences.getShouldMergeSameKeyEntries()).thenReturn(true);
-        when(mergeBibFilesIntoCurrentBibPreferences.getShouldMergeDuplicateEntries()).thenReturn(true);
+        when(mergeBibFilesIntoCurrentBibPreferences.shouldMergeSameKeyEntries()).thenReturn(true);
+        when(mergeBibFilesIntoCurrentBibPreferences.shouldMergeDuplicateEntries()).thenReturn(true);
         when(preferences.getMergeBibFilesIntoCurrentBibPreferences()).thenReturn(mergeBibFilesIntoCurrentBibPreferences);
     }
 
@@ -236,8 +236,8 @@ public void sameCitationKeyMergeTest() {
 
     @Test
     public void sameCitationKeyNoMergePreferenceTest() {
-        when(mergeBibFilesIntoCurrentBibPreferences.getShouldMergeSameKeyEntries()).thenReturn(false);
-        when(mergeBibFilesIntoCurrentBibPreferences.getShouldMergeDuplicateEntries()).thenReturn(false);
+        when(mergeBibFilesIntoCurrentBibPreferences.shouldMergeSameKeyEntries()).thenReturn(false);
+        when(mergeBibFilesIntoCurrentBibPreferences.shouldMergeDuplicateEntries()).thenReturn(false);
         BibEntry currentEntry = new BibEntry(StandardEntryType.Article)
                 .withCitationKey("test1")
                 .withField(StandardField.AUTHOR, "Different Author")
@@ -287,7 +287,6 @@ public void duplicateMergeTest() {
                 .withField(StandardField.JOURNAL, "International Journal of Something")
                 .withField(StandardField.YEAR, "2023");
 
-        // DuplicateCheck.compareEntriesStrictly allows for different CommentsBeforeEntry
         currentEntry.setCommentsBeforeEntry("%% Very important paper.\n");
 
         BibDatabase currentDatabase = new BibDatabase();
@@ -320,16 +319,15 @@ public void duplicateMergeTest() {
 
     @Test
     public void duplicateNoMergePreferenceTest() {
-        when(mergeBibFilesIntoCurrentBibPreferences.getShouldMergeSameKeyEntries()).thenReturn(false);
-        when(mergeBibFilesIntoCurrentBibPreferences.getShouldMergeDuplicateEntries()).thenReturn(false);
+        when(mergeBibFilesIntoCurrentBibPreferences.shouldMergeSameKeyEntries()).thenReturn(false);
+        when(mergeBibFilesIntoCurrentBibPreferences.shouldMergeDuplicateEntries()).thenReturn(false);
         BibEntry currentEntry = new BibEntry(StandardEntryType.Article)
                 .withCitationKey("DIFFERENTCITATIONKEY")
                 .withField(StandardField.AUTHOR, "Foo Bar")
                 .withField(StandardField.TITLE, "First Article")
                 .withField(StandardField.JOURNAL, "International Journal of Something")
                 .withField(StandardField.YEAR, "2023");
 
-        // DuplicateCheck.compareEntriesStrictly allows for different CommentsBeforeEntry
         currentEntry.setCommentsBeforeEntry("%% Very important paper.\n");
 
         BibDatabase currentDatabase = new BibDatabase();