Make attached files relative to the file directory#4212
Merged
Conversation
Fixes #4201 Open files with default OS application if no External file type is present
tobiasdiez
requested changes
Jul 17, 2018
tobiasdiez
left a comment
Member
There was a problem hiding this comment.
I would have preferred if the bug is fixed via refactoring. Other remarks are just minor nitpicking.
| dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(newFile -> { | ||
| LinkedFile newLinkedFile = new LinkedFile("", newFile.toString(), ""); | ||
|
|
||
| Path relativePath = FileUtil.shortenFileName(newFile, panel.getBibDatabaseContext().getFileDirectoriesAsPaths(Globals.prefs.getFileDirectoryPreferences())); |
Member
There was a problem hiding this comment.
In my opinion, this code should be refactored to use the same code as the same action in the entry editor. Otherwise, we will again run into a similar problem where the two actions are different in behavior.
|
|
||
| public LinkedFile getNewLinkedFile() { | ||
| return new LinkedFile(description.getValue(), link.getValue(), selectedExternalFileType.getValue().toString()); | ||
| return new LinkedFile(description.getValue(), link.getValue(), selectedExternalFileType.getValue() == null ? null : selectedExternalFileType.getValue().toString()); |
Member
There was a problem hiding this comment.
As we wanted to get ride of null's, I don't like this change. Maybe we should use a MonadicBinding (optional binding) and use an empty string as file type?
| NATIVE_DESKTOP.openFileWithApplication(filePath, application); | ||
| } | ||
| } else { | ||
| NATIVE_DESKTOP.openFile(filePath, null); |
Member
There was a problem hiding this comment.
Please add a short comment explaining what is done here.
* upstream/master: Update dependencies (#4231) Update to latest release of richtextfx (#4213) Fix fetcher tests (#4216) single line text fields (#4138) Make it easier to rename and move files (#4200) Fix that swing dialogs are hidden behind main window (#4205) Fixed: #4166 add move & rename file (#4217) # Conflicts: # CHANGELOG.md
add monadic binding
Siedlerchr
added a commit
that referenced
this pull request
Jul 26, 2018
* upstream/master: (47 commits) Make attached files relative to the file directory (#4212) execute set visible in swing thread to avoid blocking Fix isbn chimbori test (#4234) Rewrite web search pane in JavaFX (#4203) Update dependencies (#4231) Update to latest release of richtextfx (#4213) Fix fetcher tests (#4216) single line text fields (#4138) Make it easier to rename and move files (#4200) Fix that swing dialogs are hidden behind main window (#4205) Fixed: #4166 add move & rename file (#4217) update gradle plugins and gradlen to 4.9 Update dependencies Remove unnecessary look and feel migration (#4204) Revert threading fix since this sometimes lead to freezes... Update year Fix a few more threading exceptions Refactor Convert CiteSeerX fetcher to new infrastructure (#4185) Make global font size customizable (#4178) ... # Conflicts: # src/main/java/org/jabref/gui/BasePanel.java # src/main/java/org/jabref/gui/JabRefFrame.java # src/main/java/org/jabref/gui/mergeentries/MergeEntries.java # src/main/resources/l10n/JabRef_en.properties
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 #4201