File Widget: Fix Filechooser being displayed unaware of parent

Author: tferr

src/main/java/org/scijava/ui/swing/AbstractSwingUI.java

@@ -137,6 +137,20 @@ public SystemClipboard getSystemClipboard() {
 
 	@Override
 	public File chooseFile(final File file, final String style) {
+		return chooseFile((Component)null, file, style);
+	}
+
+	/**
+	 * Like {@link #chooseFile(File, String)}, but the dialog is shown relative
+	 * to the given component.
+	 *
+	 * @param owner The component to center the dialog on. If {@code null}, the
+	 *          application frame is used.
+	 */
+	public File chooseFile(final Component owner, final File file,
+		final String style)
+	{
+		final Component parent = owner != null ? owner : appFrame;
 		final File[] result = new File[1];
 		try {
 			// NB: We show the JFileChooser on the EDT because otherwise there could
@@ -148,10 +162,10 @@ public File chooseFile(final File file, final String style) {
 				}
 				final int rval;
 				if (FileWidget.SAVE_STYLE.equals(style)) {
-					rval = chooser.showSaveDialog(appFrame);
+					rval = chooser.showSaveDialog(parent);
 				}
 				else { // default behavior
-					rval = chooser.showOpenDialog(appFrame);
+					rval = chooser.showOpenDialog(parent);
 				}
 				if (rval == JFileChooser.APPROVE_OPTION) {
 					result[0] = chooser.getSelectedFile();
@@ -166,6 +180,20 @@ public File chooseFile(final File file, final String style) {
 
 	@Override
 	public File[] chooseFiles(final File parent, final File[] files, final FileFilter filter, final String style) {
+		return chooseFiles(null, parent, files, filter, style);
+	}
+
+	/**
+	 * Like {@link #chooseFiles(File, File[], FileFilter, String)}, but the
+	 * dialog is shown relative to the given component.
+	 *
+	 * @param owner The component to center the dialog on. If {@code null}, the
+	 *          application frame is used.
+	 */
+	public File[] chooseFiles(final Component owner, final File parent,
+		final File[] files, final FileFilter filter, final String style)
+	{
+		final Component dialogParent = owner != null ? owner : appFrame;
 		final File[][] result = new File[1][];
 		try {
 			// NB: We show the JFileChooser on the EDT because otherwise there could
@@ -202,7 +230,7 @@ public boolean accept(File f) {
 					};
 					chooser.setFileFilter(fileFilter);
 				}
-				int rval = chooser.showOpenDialog(appFrame);
+				int rval = chooser.showOpenDialog(dialogParent);
 				if (rval == JFileChooser.APPROVE_OPTION) {
 					result[0] = chooser.getSelectedFiles();
 				}

src/main/java/org/scijava/ui/swing/widget/SwingFileWidget.java

@@ -55,9 +55,7 @@
 import javax.swing.event.DocumentListener;
 
 import com.formdev.flatlaf.FlatClientProperties;
-import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.ui.UIService;
 import org.scijava.widget.FileListWidget;
 import org.scijava.widget.FileWidget;
 import org.scijava.widget.InputWidget;
@@ -73,9 +71,6 @@ public class SwingFileWidget extends SwingInputWidget<File> implements
 	FileWidget<JPanel>, ActionListener, DocumentListener
 {
 
-	@Parameter
-	private UIService uiService;
-
 	private JTextField path;
 	private JButton browse;
 
@@ -108,7 +103,7 @@ public void set(final WidgetModel model) {
 
 		getComponent().add(Box.createHorizontalStrut(3));
 
-		browse = new JButton("Browse");
+		browse = new JButton("Browse...");
 		setToolTip(browse);
 		getComponent().add(browse);
 		browse.addActionListener(this);
@@ -144,7 +139,7 @@ else if (model.isStyle(FileWidget.SAVE_STYLE)) {
 		else {
 			style = FileWidget.OPEN_STYLE;
 		}
-		file = uiService.chooseFile(file, style);
+		file = chooseFile(file, style);
 		if (file == null) return;
 
 		path.setText(file.getAbsolutePath());

src/main/java/org/scijava/ui/swing/widget/SwingInputWidget.java

@@ -30,6 +30,10 @@
 package org.scijava.ui.swing.widget;
 
 import java.awt.Color;
+import java.awt.Window;
+import java.io.File;
+import java.io.FileFilter;
+import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -43,6 +47,7 @@
 
 import org.scijava.ui.AbstractUIInputWidget;
 import org.scijava.ui.UserInterface;
+import org.scijava.ui.swing.AbstractSwingUI;
 import org.scijava.ui.swing.SwingUI;
 import org.scijava.widget.WidgetModel;
 
@@ -98,6 +103,41 @@ protected UserInterface ui() {
 
 	// -- Helper methods --
 
+	/**
+	 * Asks the user for a file, with the dialog shown relative to this widget
+	 * rather than the application frame.
+	 *
+	 * @see org.scijava.ui.UserInterface#chooseFile(File, String)
+	 */
+	protected File chooseFile(final File file, final String style) {
+		final Window parent = SwingUtilities.getWindowAncestor(getComponent());
+		final UserInterface ui = ui();
+		if (ui instanceof AbstractSwingUI) {
+			return ((AbstractSwingUI) ui).chooseFile(parent, file, style);
+		}
+		return ui.chooseFile(file, style);
+	}
+
+	/**
+	 * Asks the user for files, with the dialog shown relative to this widget
+	 * rather than the application frame.
+	 *
+	 * @see org.scijava.ui.UserInterface#chooseFiles(File, List, FileFilter,
+	 *      String)
+	 */
+	protected List<File> chooseFiles(final File start, final List<File> files,
+		final FileFilter filter, final String style)
+	{
+		final Window parent = SwingUtilities.getWindowAncestor(getComponent());
+		final UserInterface ui = ui();
+		if (ui instanceof AbstractSwingUI) {
+			final File[] result = ((AbstractSwingUI) ui).chooseFiles(parent, start,
+				files.toArray(new File[0]), filter, style);
+			return result == null ? null : Arrays.asList(result);
+		}
+		return ui.chooseFiles(start, files, filter, style);
+	}
+
 	/** Assigns the model's description as the given component's tool tip. */
 	protected void setToolTip(final JComponent c) {
 		tooltipped.add(c);