Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.scijava</groupId>
<artifactId>pom-scijava</artifactId>
<version>28.0.0</version>
<version>29.2.1</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -108,8 +108,7 @@
<jdatepicker.version>1.3.2</jdatepicker.version>
<object-inspector.version>0.1</object-inspector.version>

<miglayout-swing.version>5.2</miglayout-swing.version>
<scijava-ui-awt.version>0.1.7</scijava-ui-awt.version>
<scijava-common.version>2.85.0</scijava-common.version>
</properties>

<repositories>
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/org/scijava/ui/swing/AbstractSwingUI.java
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
import org.scijava.ui.viewer.DisplayViewer;
import org.scijava.widget.FileListWidget;
import org.scijava.widget.FileWidget;
import org.scijava.widget.WidgetStyle;

/**
* Abstract superclass for Swing-based user interfaces.
Expand Down Expand Up @@ -141,11 +142,11 @@ public File chooseFile(final File file, final String style) {
// be a deadlock, particularly on macOS. See scijava/scijava-ui-swing#28.
threadService.invoke(() -> {
final JFileChooser chooser = new JFileChooser(file);
if (FileWidget.DIRECTORY_STYLE.equals(style)) {
if (WidgetStyle.isStyle(style, FileWidget.DIRECTORY_STYLE)) {
chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
}
final int rval;
if (FileWidget.SAVE_STYLE.equals(style)) {
if (WidgetStyle.isStyle(style, FileWidget.SAVE_STYLE)) {
rval = chooser.showSaveDialog(appFrame);
}
else { // default behavior
Expand All @@ -172,10 +173,10 @@ public File[] chooseFiles(final File parent, final File[] files, final FileFilte
threadService.invoke(() -> {
final JFileChooser chooser = new JFileChooser(parent);
chooser.setMultiSelectionEnabled(true);
if (style.equals(FileListWidget.FILES_AND_DIRECTORIES)) {
if (WidgetStyle.isStyle(style, FileListWidget.FILES_AND_DIRECTORIES)) {
chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
}
else if (style.equals(FileListWidget.DIRECTORIES_ONLY)) {
else if (WidgetStyle.isStyle(style, FileListWidget.DIRECTORIES_ONLY)) {
chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
}
else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
import org.scijava.plugin.Parameter;
import org.scijava.plugin.Plugin;
import org.scijava.thread.ThreadService;
import org.scijava.ui.UIService;
import org.scijava.widget.FileListWidget;
import org.scijava.widget.FileWidget;
import org.scijava.widget.InputWidget;
Expand Down