4834298: JFileChooser.getSelectedFiles() failed with multi-selection and double-click

Reviewed-by: jdv

src/java.desktop/share/classes/sun/swing/FilePane.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1751,11 +1751,12 @@ public class FilePane extends JPanel implements PropertyChangeListener {
     }
 
     private void doMultiSelectionChanged(PropertyChangeEvent e) {
+        clearSelection();
         if (getFileChooser().isMultiSelectionEnabled()) {
             listSelectionModel.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+            getFileChooser().setSelectedFile(null);
         } else {
             listSelectionModel.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-            clearSelection();
             getFileChooser().setSelectedFiles(null);
         }
     }

test/jdk/javax/swing/JFileChooser/MultiSelectionEnabledSelectedFilesTest.java

@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Color;
+import java.io.File;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
+
+/*
+ * @test
+ * @bug 4834298
+ * @key headful
+ * @requires (os.family == "windows" | os.family == "linux")
+ * @summary Test to check if the getSelectedFiles of JFilesChooser
+ *          returns selectedFiles when Multi-Selection is enabled.
+ * @run main/manual MultiSelectionEnabledSelectedFilesTest
+ */
+public class MultiSelectionEnabledSelectedFilesTest {
+    private static JFrame frame;
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(new Runnable() {
+            public void run() {
+                try {
+                    runTest();
+                } finally {
+                    frame.dispose();
+                }
+            }
+        });
+        System.out.println("Test Pass!");
+    }
+
+    static void runTest() {
+        //Initialize the components
+        String INSTRUCTIONS
+                = "Instructions to Test:"+
+                "\n1. Select a valid file using mouse double-click on first "+
+                "dialog."+
+                "\n2. After Selection, first dialog will close and second " +
+                "dialog opens with multi-Selection enabled."+
+                "\n3. Select the same file using mouse double-click without " +
+                "moving mouse position or selection."+
+                "\n4. If the selected file is updated then getSelectedFiles "+
+                "returns the file selected and test will PASS otherwise test "+
+                "will FAIL";
+
+        JFileChooser chooser = new JFileChooser();
+        JTextArea textArea = new JTextArea();
+        frame = new JFrame("Test Instructions");
+
+        textArea.setText(INSTRUCTIONS);
+        textArea.setEnabled(false);
+        textArea.setDisabledTextColor(Color.black);
+        textArea.setBackground(Color.white);
+
+        frame.add(textArea);
+        frame.pack();
+        frame.setVisible(true);
+
+        chooser.showOpenDialog(null);
+        chooser.setMultiSelectionEnabled(true);
+        chooser.showOpenDialog(null);
+        File[] files = chooser.getSelectedFiles();
+
+        if (files.length == 0) {
+            throw new RuntimeException("Test Failed since selected files are empty!!");
+        }
+    }
+}