Skip to content

Commit

Permalink
6777156: GTK L&F: JFileChooser can jump beyond root directory in comb…
Browse files Browse the repository at this point in the history
…obox and selection textarea.

Reviewed-by: jdv, tr, psadhukhan
  • Loading branch information
kumarabhi006 authored and jayathirthrao committed Oct 11, 2022
1 parent 3ebe5ad commit 9d0009e
Show file tree
Hide file tree
Showing 2 changed files with 98 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 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
Expand Down Expand Up @@ -980,6 +980,26 @@ protected void sort(Vector<? extends File> v) {
v.sort(Comparator.comparing(fsv::getSystemDisplayName));
}
}

@Override
public Vector<File> getDirectories() {
Vector<File> files = super.getDirectories();

/*
* Delete the "/.." file entry from file chooser directory list in
* GTK LAF if current directory is root and files vector contains
* "/.." entry.
*
* It is not possible to go beyond root directory.
*/
File crntDir = getFileChooser().getCurrentDirectory();
FileSystemView fsv = getFileChooser().getFileSystemView();
if (crntDir != null && fsv.isFileSystemRoot(crntDir) &&
files.contains(new File("/.."))) {
files.removeElementAt(0);
}
return files;
}
}

@SuppressWarnings("serial") // Superclass is not serializable across versions
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
/*
* 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.
*/

/*
* @test
* @bug 6777156
* @library /java/awt/regtesthelpers
* @build PassFailJFrame
* @requires (os.family == "linux")
* @summary Verifies if user is not able to select "../" beyond
* root file system.
* @run main/manual TestFileChooserDirectorySelection
*/

import javax.swing.JFileChooser;
import javax.swing.JFrame;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;

public class TestFileChooserDirectorySelection {
private static JFrame frame;
private static final String INSTRUCTIONS =
"Double click on the \"../\" entry from directory list.\n\n" +
"Repeat the same process till the current directory is root " +
"i.e \" / \" .\n\n" +
"If \" ../ \" option is not available at root directory" +
", press Pass else Fail.";

public static void main(String[] args) throws Exception {
UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
PassFailJFrame passFailJFrame = new PassFailJFrame(
"JFileChooser Test Instructions", INSTRUCTIONS, 5, 8, 35);
try {
SwingUtilities.invokeAndWait(
TestFileChooserDirectorySelection::createAndShowUI);
passFailJFrame.awaitAndCheck();
} finally {
SwingUtilities.invokeAndWait(() -> {
if (frame != null) {
frame.dispose();
}
});
}
}
private static void createAndShowUI() {
frame = new JFrame("Test File Chooser Directory Selection");
JFileChooser fileChooser = new JFileChooser();
fileChooser.setControlButtonsAreShown(false);
PassFailJFrame.addTestWindow(frame);
PassFailJFrame.positionTestWindow(
frame, PassFailJFrame.Position.HORIZONTAL);
frame.add(fileChooser);
frame.setSize(500, 500);
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
frame.setVisible(true);
}
}

1 comment on commit 9d0009e

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.