From edcbc8ed2f54bf7c712524ec0b380ad3b48dcf24 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Tue, 19 Aug 2025 23:52:11 +0200 Subject: [PATCH 1/3] Fix filename --- .../{BibtexDatabaseWriterTest.java => BibDatabaseWriterTest.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename jablib/src/test/java/org/jabref/logic/exporter/{BibtexDatabaseWriterTest.java => BibDatabaseWriterTest.java} (100%) diff --git a/jablib/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java b/jablib/src/test/java/org/jabref/logic/exporter/BibDatabaseWriterTest.java similarity index 100% rename from jablib/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java rename to jablib/src/test/java/org/jabref/logic/exporter/BibDatabaseWriterTest.java From b5339e832d29024cd285b2114e7090d68a41313b Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Tue, 19 Aug 2025 23:50:22 +0200 Subject: [PATCH 2/3] Remove empty JavaDoc --- .../org/jabref/logic/importer/fileformat/MrDLibImporter.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/jablib/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java b/jablib/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java index d1fefa8bc43..7d84cfccf1b 100644 --- a/jablib/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java +++ b/jablib/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java @@ -1,6 +1,3 @@ -/** - * - */ package org.jabref.logic.importer.fileformat; import java.io.BufferedReader; From 6dc1cdc607cdc5d707a71c365e981b64a856c63e Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Tue, 19 Aug 2025 23:55:18 +0200 Subject: [PATCH 3/3] Use explicit if --- .../openoffice/style/JStyleGetCitationMarker.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/jablib/src/main/java/org/jabref/logic/openoffice/style/JStyleGetCitationMarker.java b/jablib/src/main/java/org/jabref/logic/openoffice/style/JStyleGetCitationMarker.java index 3e0cf0374c2..8553e0c6fff 100644 --- a/jablib/src/main/java/org/jabref/logic/openoffice/style/JStyleGetCitationMarker.java +++ b/jablib/src/main/java/org/jabref/logic/openoffice/style/JStyleGetCitationMarker.java @@ -141,11 +141,13 @@ private static String formatAuthorList(JStyle style, // emitAllAuthors == false means use "et al." boolean emitAllAuthors = (nAuthors <= maxAuthors) || (maxAuthors == -1); - int nAuthorsToEmit = emitAllAuthors - ? nAuthors - // If we use "et al." maxAuthorsBeforeEtAl also limits the - // number of authors emitted. - : Math.min(maxAuthorsBeforeEtAl, nAuthors); + int nAuthorsToEmit; + if (emitAllAuthors) { + nAuthorsToEmit = nAuthors; + } else { + // If we use "et al." maxAuthorsBeforeEtAl also limits the number of authors emitted. + nAuthorsToEmit = Math.min(maxAuthorsBeforeEtAl, nAuthors); + } if (nAuthorsToEmit >= 1) { stringBuilder.append(style.getAuthorsPartMarkupBefore());