JavaDoc

src/main/java/org/jabref/cli/ArgumentProcessor.java

@@ -462,7 +462,7 @@ private boolean exportMatches(List<ParserResult> loaded) {
         try {
             matches = new DatabaseSearcher(query, databaseContext, preferencesService.getFilePreferences()).getMatches();
         } catch (IOException e) {
-            System.err.println(Localization.lang("Error occurred when searching") + ": " + e.getLocalizedMessage());
+            LOGGER.error("Error occurred when searching", e);
             return false;
         }
 

src/main/java/org/jabref/logic/search/retrieval/LuceneSearcher.java

@@ -134,8 +134,7 @@ private SearchResults getSearchResults(TopDocs topDocs, StoredFields storedField
         return searchResults;
     }
 
-    private static String getFieldContents(Document document, SearchFieldConstants
-        field) {
+    private static String getFieldContents(Document document, SearchFieldConstants field) {
         return Optional.ofNullable(document.get(field.toString())).orElse("");
     }
 

src/main/java/org/jabref/model/database/BibDatabase.java

@@ -22,6 +22,7 @@
 import javafx.collections.ObservableList;
 
 import org.jabref.logic.bibtex.FieldWriter;
+import org.jabref.logic.bibtex.comparator.IdComparator;
 import org.jabref.model.database.event.EntriesAddedEvent;
 import org.jabref.model.database.event.EntriesRemovedEvent;
 import org.jabref.model.entry.BibEntry;
@@ -47,6 +48,7 @@ public class BibDatabase {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(BibDatabase.class);
     private static final Pattern RESOLVE_CONTENT_PATTERN = Pattern.compile(".*#[^#]+#.*");
+    private static final Comparator<BibEntry> ID_COMPARATOR = new IdComparator();
 
     /**
      * State attributes
@@ -638,11 +640,13 @@ public String getNewLineSeparator() {
      * Returns the index of the given entry in the list of entries.
      *
      * @implNote New entries are always added to the end of the list and always get a higher ID.
-     *           See {@link org.jabref.model.entry.BibEntry#BibEntry(org.jabref.model.entry.types.EntryType)}.
+     *           See {@link org.jabref.model.entry.BibEntry#BibEntry(org.jabref.model.entry.types.EntryType) BibEntry},
+     *           {@link org.jabref.model.entry.IdGenerator IdGenerator},
+     *           {@link BibDatabase#insertEntries(List, EntriesEventSource) insertEntries}.
      *           Therefore, using binary search to find the index.
      */
     public int indexOf(BibEntry bibEntry) {
-        int index = Collections.binarySearch(entries, bibEntry, Comparator.comparingInt(entry -> Integer.parseInt(entry.getId())));
+        int index = Collections.binarySearch(entries, bibEntry, ID_COMPARATOR);
         return index >= 0 ? index : -1;
     }
 

src/main/java/org/jabref/model/search/LuceneIndexer.java

@@ -24,5 +24,9 @@ public interface LuceneIndexer {
 
     void close();
 
+    /**
+     * Needed in unit tests where subsequent tests might need to access the same index,
+     * avoiding potential issues with the index being locked.
+     */
     void closeAndWait();
 }

src/main/resources/l10n/JabRef_en.properties

@@ -840,6 +840,7 @@ Search\ for\ unlinked\ local\ files=Search for unlinked local files
 Search\ full\ text\ documents\ online=Search full text documents online
 Hint\:\n\nTo\ search\ all\ fields\ for\ <b>Smith</b>,\ enter\:\n<tt>smith</tt>\n\nTo\ search\ the\ field\ <b>author</b>\ for\ <b>Smith</b>\ and\ the\ field\ <b>title</b>\ for\ <b>electrical</b>,\ enter\:\n<tt>author\:Smith\ AND\ title\:electrical</tt>=Hint:\n\nTo search all fields for <b>Smith</b>, enter:\n<tt>smith</tt>\n\nTo search the field <b>author</b> for <b>Smith</b> and the field <b>title</b> for <b>electrical</b>, enter:\n<tt>author:Smith AND title:electrical</tt>
 Search\ term\ is\ empty.=Search term is empty.
+Invalid\ regular\ expression.=Invalid regular expression.
 Searching\ for\ a\ keyword=Searching for a keyword
 
 Open\ global\ search\ window=Open global search window
@@ -1075,7 +1076,6 @@ Use\ custom\ file\ browser=Use custom file browser
 Use\ custom\ terminal\ emulator=Use custom terminal emulator
 exportFormat=exportFormat
 Output\ file\ missing=Output file missing
-Error\ occurred\ when\ searching=Error occurred when searching
 The\ output\ option\ depends\ on\ a\ valid\ input\ option.=The output option depends on a valid input option.
 Linked\ file\ name\ conventions=Linked file name conventions
 Filename\ format\ pattern=Filename format pattern
@@ -2355,7 +2355,6 @@ Presets=Presets
 Generate\ groups\ from\ keywords\ in\ the\ following\ field=Generate groups from keywords in the following field
 Generate\ groups\ for\ author\ last\ names=Generate groups for author last names
 Regular\ expression=Regular expression
-Invalid\ regular\ expression.=Invalid regular expression.
 
 Error\ importing.\ See\ the\ error\ log\ for\ details.=Error importing. See the error log for details.