Fix threading cleanup in performSearch#7672
Merged
Merged
Conversation
tobiasdiez
requested changes
Apr 26, 2021
| // store the complete parser result (to import groups, ... later on) | ||
| this.parserResult = parserResult; | ||
|
|
||
| List<BibEntry> resultEntries = parserResult.getDatabase().getEntries().stream().map(cleanup::doPostCleanup).collect(Collectors.toList()); |
Member
There was a problem hiding this comment.
An idea would be to move this cleanup to the ImportHandler for consistency reasons.
Member
Author
There was a problem hiding this comment.
Is already part of the importHandler for importing external files
jabref/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
Lines 165 to 169 in bb011c9
Member
There was a problem hiding this comment.
Okay, then I don't get why you added it in the dialog. The buildImportHandlerThenImportEntries method uses the import handler to import entries.
Member
Author
There was a problem hiding this comment.
Ah thanks, then it can be removed here. Totally overlooked that this is called.
| private final PreferencesService preferences; | ||
| private final BibEntryTypesManager entryTypesManager; | ||
|
|
||
| private final ImportCleanup cleanup = new ImportCleanup(BibDatabaseMode.BIBTEX); |
Member
There was a problem hiding this comment.
If one uses the user database, then this would immediately take care of #1018 as well, right?
tobiasdiez
approved these changes
Apr 27, 2021
| private final ObservableList<BibEntry> entries; | ||
| private final PreferencesService preferences; | ||
| private final BibEntryTypesManager entryTypesManager; | ||
| private ImportCleanup cleanup; |
Member
There was a problem hiding this comment.
This is no longer required now.
Siedlerchr
added a commit
that referenced
this pull request
Apr 28, 2021
* upstream/main: Fix threading cleanup in performSearch (#7672)
Siedlerchr
added a commit
that referenced
this pull request
May 4, 2021
* upstream/main: (354 commits) Fix ScienceDirect fetcher (#7684) Refactor NoBibTexFieldCheckerTest to increase mutation coverage (#7697) Update Gradle from 6.8.3 to 7.0 (#7619) Fixes Jabref#7305: the RFC fetcher is not compatible with the draftFix for issue 7305 (#7674) Refactoring existing unit tests (#7693) cover boundary cases & add more unit tests (#7694) Bump classgraph from 4.8.104 to 4.8.105 (#7688) Bump java-diff-utils from 4.9 to 4.10 (#7692) Fix arXiv fetcher tests (#7686) Make key for ScienceDirect configurable (#7683) migration of timestamp (#7671) Fix CCSB and DOAJ (#7426) [Bot] Update CSL styles (#7680) MS Office XML: Export month name (#7677) linkfix (#7678) readd fix (#7675) Fix threading cleanup in performSearch (#7672) add missing changelog delete bug fix (#7580) Add more unit tests to three gui classes (#7636) ... # Conflicts: # build.gradle
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #7606
Fixes #1018
CHANGELOG.mddescribed in a way that is understandable for the average user (if applicable)