Skip to content

Commit 00512f5

Browse files
committed
Add FileWidget.FILE_AND_DIRECTORY_STYLE
1 parent d4ab47a commit 00512f5

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed

pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,11 @@
134134
<url>https://imagej.net/people/jaywarrick</url>
135135
<properties><id>jaywarrick</id></properties>
136136
</contributor>
137+
<contributor>
138+
<name>Christian Tischer</name>
139+
<url>https://imagej.net/people/tischi</url>
140+
<properties><id>tischi</id></properties>
141+
</contributor>
137142
</contributors>
138143

139144
<mailingLists>

src/main/java/org/scijava/ui/UserInterface.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ default File chooseFile(final File file, final String style) {
163163
// TODO use a utility class for style handling, e.g. StyleUtils.isStyle(style, ...)
164164
if (style == null) title = "Choose a file";
165165
else if (style.toLowerCase().contains(FileWidget.DIRECTORY_STYLE)) title = "Choose a directory";
166+
else if (style.toLowerCase().contains(FileWidget.FILE_AND_DIRECTORY_STYLE )) title = "Choose a file or directory";
166167
else if (style.toLowerCase().contains(FileWidget.OPEN_STYLE)) title = "Open";
167168
else if (style.toLowerCase().contains(FileWidget.SAVE_STYLE)) title = "Save";
168169
else title = "Choose a file";
@@ -180,6 +181,7 @@ default File chooseFile(final File file, final String style) {
180181
* <li>{@link FileWidget#OPEN_STYLE}</li>
181182
* <li>{@link FileWidget#SAVE_STYLE}</li>
182183
* <li>{@link FileWidget#DIRECTORY_STYLE}</li>
184+
* <li>{@link FileWidget#FILE_AND_DIRECTORY_STYLE}</li>
183185
* </ul>
184186
* @return The {@link File} chosen by the user, or null if prompt is not
185187
* available

src/main/java/org/scijava/widget/FileWidget.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,11 @@ public interface FileWidget<U> extends InputWidget<File, U> {
5959
*/
6060
String DIRECTORY_STYLE = "directory";
6161

62+
/**
63+
* Widget style for directory chooser dialogs.
64+
*
65+
* @see org.scijava.plugin.Parameter#style()
66+
*/
67+
String FILE_AND_DIRECTORY_STYLE = "both";
68+
6269
}

0 commit comments

Comments
 (0)