Made BibDatabaseContext.getDatabaseFile() return Optional #1830
Conversation
oscargus
added
bug
| @@ -175,13 +175,14 @@ private String getFileDirectoryPath(String directoryName) { | |||
| String dir = directoryName; | |||
| // If this directory is relative, we try to interpret it as relative to | |||
| // the file path of this BIB file: | |||
| if (!new File(dir).isAbsolute() && (getDatabaseFile() != null)) { | |||
| Optional<File> databaseFile = getDatabaseFile(); | |||
| if (!new File(dir).isAbsolute() && databaseFile.isPresent()) { | |||
There was a problem hiding this comment.
I am not quite sure about this one, but if you use the nio Paths methods, you maybe could omit the check for absolute/relative directory.
Edit// Yeah I looked at the whole method here and I think it could be done with Paths.get and getParent
There was a problem hiding this comment.
OK. I have very little (basically no) idea about nio.Paths though, so I prefer to avoid it at this time... If you could spare some time and provide code I can just paste it would be appreciated though.
oscargus
force-pushed
the
optionalgetdatabasefile
branch
from
853f064
to
19c38a6
Compare
| } else { | ||
| if (!uniqPath.equals(file.getName())) { | ||
| if (file.isPresent()) { | ||
| if (!uniqPath.equals(file.get().getName())) { | ||
| // remove filename | ||
| uniqPath = uniqPath.substring(0, uniqPath.lastIndexOf(File.separator)); |
There was a problem hiding this comment.
Just Paths.get().getParent()
|
Just some minor nio related things you could change, too. Apart from that, the optional stuff LGTM 👍 |
|
I'm not confident enough regarding nio.Paths to edit blindly (many other APIs I do that though), nor do I really know how to trigger the code correctly, so I would very much prefer to leave it as is. Even though I conceptually understand at least the last comment and see that makes sense to use it there. |
oscargus
force-pushed
the
optionalgetdatabasefile
branch
from
19c38a6
to
ce215f9
Compare
|
I merge this in and hope @Siedlerchr are helpful at some stage regarding the nio-stuff... |
Plus one (or two, I couldn't confirm the second but I think there will be an NPE if starting JabRef with an already existing file as an argument and an unsaved (untitled) database open) bug fixes.
This also includes #1782 as I messed up a bit...