Skip to content

Add method signatures and preprocessor to select multiple files #276

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
ctrueden merged 3 commits into from
Jul 31, 2017
Merged

Add method signatures and preprocessor to select multiple files #276

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1495881
Add method signatures and preprocessor to select multiple files
imagejan Jun 30, 2017
de98dcf
Fix NullPointerException when chooseFiles returns null
ctrueden Jul 19, 2017
baaaa55
Add note about storing persisted values for list and array inputs
ctrueden Jul 19, 2017
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
Prev Previous commit
Next Next commit
Fix NullPointerException when chooseFiles returns null
  • Loading branch information
@ctrueden @imagejan
ctrueden authored and imagejan committed Jul 21, 2017
commit de98dcf722c347419b3322b06ae329be755862c5
13 changes: 7 additions & 6 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 @@ -193,8 +193,8 @@ default File chooseFile(String title, File file, String style) {
*
* @param files The initial value displayed in the file chooser prompt.
* @param filter A filter allowing to restrict file choice.
* @return The selected {@link File}s chosen by the user, or null if prompt is not
* available
* @return The selected {@link File}s chosen by the user, or null if the
* user cancels the prompt.
*/
default File[] chooseFiles(File[] files, FileFilter filter) {
throw new UnsupportedOperationException();
Expand All @@ -205,12 +205,13 @@ default File[] chooseFiles(File[] files, FileFilter filter) {
*
* @param fileList The initial value displayed in the file chooser prompt.
* @param filter A filter allowing to restrict file choice.
* @return The selected {@link File}s chosen by the user, or null if prompt is not
* available
* @return The selected {@link File}s chosen by the user, or null if the
* user cancels the prompt.
*/
default List<File> chooseFiles(List<File> fileList, FileFilter filter) {
File[] files = fileList.toArray(new File[fileList.size()]);
return Arrays.asList(chooseFiles(files, filter));
final File[] initialFiles = fileList.toArray(new File[fileList.size()]);
final File[] chosenFiles = chooseFiles(initialFiles, filter);
return chosenFiles == null ? null : Arrays.asList(chosenFiles);
}

/**
Expand Down