Skip to content

Safeguard against null style arg in UserInterface#chooseFile #354

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
May 16, 2019
Merged

Safeguard against null style arg in UserInterface#chooseFile #354

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/main/java/org/scijava/ui/UserInterface.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,12 @@ DialogPrompt dialogPrompt(String message, String title,
*/
default File chooseFile(final File file, final String style) {
final String title;
if (style.equals(FileWidget.DIRECTORY_STYLE)) title = "Choose a directory";
else if (style.equals(FileWidget.OPEN_STYLE)) title = "Open";
else if (style.equals(FileWidget.SAVE_STYLE)) title = "Save";
// style can be a string with multiple comma-separated keywords
// TODO use a utility class for style handling, e.g. StyleUtils.isStyle(style, ...)
if (style == null) title = "Choose a file";
else if (style.toLowerCase().contains(FileWidget.DIRECTORY_STYLE)) title = "Choose a directory";
else if (style.toLowerCase().contains(FileWidget.OPEN_STYLE)) title = "Open";
else if (style.toLowerCase().contains(FileWidget.SAVE_STYLE)) title = "Save";
else title = "Choose a file";

return chooseFile(title, file, style);
Expand Down