From 33bace404a240c1335ab1f6e95bd6616e22c0ecd Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Tue, 2 Aug 2005 20:12:05 +0000 Subject: 2005-08-02 Andrew John Hughes * Merge of HEAD --> generics-branch for 2005/06/05 - 2005/07/31. See patch on classpath-patches@gnu.org for a full ChangeLog. --- javax/swing/JFileChooser.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'javax/swing/JFileChooser.java') diff --git a/javax/swing/JFileChooser.java b/javax/swing/JFileChooser.java index 07a67a041..17292fa4f 100644 --- a/javax/swing/JFileChooser.java +++ b/javax/swing/JFileChooser.java @@ -15,8 +15,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and @@ -357,7 +357,11 @@ public class JFileChooser extends JComponent implements Accessible */ public File[] getSelectedFiles() { - return selectedFiles; + if (selectedFiles != null) + return selectedFiles; + if (selectedFile != null) + return new File[] { selectedFile }; + return null; } /** -- cgit v1.2.1