Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some OS didn't show directories when a file type was selected in the import dialog #1775

Merged
merged 1 commit into from
Aug 19, 2016
Merged

Conversation

chriba
Copy link
Contributor

@chriba chriba commented Aug 18, 2016

When importing a file (Import into new | current Database) and a file type was selected sometimes the directories weren't shown anymore (we experienced it under win10 and linux).

Furthermore BibTeXml can also be in .xml format.

@stefan-kolb stefan-kolb added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Aug 18, 2016
@@ -43,7 +43,7 @@ public ImportFormat getImportFormat() {

@Override
public boolean accept(File file) {
return filextFilter.accept(file);
return file.isDirectory() || filextFilter.accept(file);
Copy link
Member

@stefan-kolb stefan-kolb Aug 18, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe also add if (file == null) return false;

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@stefan-kolb
Copy link
Member

LGTM 👍

@@ -72,7 +72,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
- Fixed [#1716](https://github.com/JabRef/jabref/issues/1716): `@`-Symbols stored in BibTeX fields no longer break the database
- Fixed [#1499](https://github.com/JabRef/jabref/issues/1499): {} braces are now treated correctly in in author/editor
- Fixed [#1531](https://github.com/JabRef/jabref/issues/1531): `\relax` can be used for abbreviation of author names

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did this show up in the development version (like a few hours ago ;-))? In that case I think we should skip the ChangeLog entry. Great job though!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Must be dev version only, related to the restructuring of the Dialogues which came with #1336

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the ChangeLog entry.

@stefan-kolb stefan-kolb merged commit 39fee47 into JabRef:master Aug 19, 2016
@chriba chriba deleted the fixFileFilter branch August 19, 2016 09:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants