Fixes #6357: File directory #6377
Merged
Conversation
This file contains 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
Bug was introduced in 1b03f03.
tobiasdiez
added
the
status: ready-for-review
Siedlerchr
approved these changes
Apr 30, 2020
calixtus
requested changes
Apr 30, 2020
| return Optional.empty(); | ||
| } else { | ||
| return Optional.of(Paths.get(mainFileDirectory)); |
There was a problem hiding this comment.
JavaDoc indicates, that Paths::get will be deprecated soon. Use Path::of instead.
https://docs.oracle.com/en/java/javase/14/docs/api/java.base/java/nio/file/Paths.html
| fileDirectories); | ||
| void getFileDirectoriesWithEmptyDbParent() { | ||
| BibDatabaseContext database = new BibDatabaseContext(); | ||
| database.setDatabasePath(Paths.get("biblio.bib")); |
Forgiven and forgotten. You owe me one. 😉 |
|
Thanks for the quick reviews! |
Siedlerchr
added a commit
that referenced
this pull request
Apr 30, 2020
…ionCaseInsensitive * upstream/master: New Crowdin translations (#6375) Squashed 'src/main/resources/csl-styles/' changes from 143464e..906cd6d Fixes #6357: File directory (#6377) Disable the generate button if the ID field is empty (#6371) Fix Preferences style value too long (#6372) Fix various Dark theme issues (#6368) Correct label name in dependabot Bump java-diff-utils from 4.5 to 4.7 (#6365) Try with info.plist.template also (#6366) Fix wrong button order (Apply and Cancel) in ManageProtectedTermsDialog. (#6358) Bump flexmark-ext-gfm-strikethrough from 0.61.6 to 0.61.20 (#6361) Bump checkstyle from 8.31 to 8.32 (#6360) Bump flexmark-ext-gfm-tasklist from 0.61.16 to 0.61.20 (#6364) Bump flexmark from 0.61.16 to 0.61.20 (#6359) Bump org.beryx.jlink from 2.17.7 to 2.17.8 (#6362) Bump classgraph from 4.8.71 to 4.8.77 (#6363) Change blue and red colors in Merge entries dialog in Dark theme (#6356) Add Info plist to mac resources (#5986) Backward compatibility for 4.3.1 (#6296)
Siedlerchr
added a commit
that referenced
this pull request
May 2, 2020
* upstream/master: (166 commits) New Crowdin translations (#6382) Update code-howtos.md (#6393) Fix jstyle was invalid with default section at the start (#6386) Correcting file name for groups.uml (#6373) Fix underscore character being omitted from file name in Recent Libraries list (#6389) Rework journal abbreviation caching (#6304) Fix selecting custom export for copy to clipboard with uppercase file ext (#6290) New Crowdin translations (#6375) Squashed 'src/main/resources/csl-styles/' changes from 143464e..906cd6d Fixes #6357: File directory (#6377) Disable the generate button if the ID field is empty (#6371) Fix Preferences style value too long (#6372) Fix various Dark theme issues (#6368) Correct label name in dependabot Bump java-diff-utils from 4.5 to 4.7 (#6365) Try with info.plist.template also (#6366) Fix wrong button order (Apply and Cancel) in ManageProtectedTermsDialog. (#6358) Bump flexmark-ext-gfm-strikethrough from 0.61.6 to 0.61.20 (#6361) Bump checkstyle from 8.31 to 8.32 (#6360) Bump flexmark-ext-gfm-tasklist from 0.61.16 to 0.61.20 (#6364) ...
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
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.
Bug was introduced in 1b03f03. Sorry @calixtus for suspecting you 👼.
Also a bit of code cleanup is included. For example, I tried to minimize using strings and favored
Paths instead.