From 3a00ec863904abd09ddcdc4b6dcf1147c52e0aae Mon Sep 17 00:00:00 2001 From: Tejesh R Date: Fri, 8 Sep 2023 04:26:14 +0000 Subject: [PATCH] 8312075: FileChooser.win32.newFolder is not updated when changing Locale Reviewed-by: aivanov, abhiscxk --- .../swing/filechooser/FileSystemView.java | 25 +++--- .../FileChooserNewFolderLocaleTest.java | 81 +++++++++++++++++++ 2 files changed, 92 insertions(+), 14 deletions(-) create mode 100644 test/jdk/javax/swing/JFileChooser/FileChooserNewFolderLocaleTest.java diff --git a/src/java.desktop/share/classes/javax/swing/filechooser/FileSystemView.java b/src/java.desktop/share/classes/javax/swing/filechooser/FileSystemView.java index 8b0b1190aef..19ad986402a 100644 --- a/src/java.desktop/share/classes/javax/swing/filechooser/FileSystemView.java +++ b/src/java.desktop/share/classes/javax/swing/filechooser/FileSystemView.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2023, 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 @@ -773,11 +773,6 @@ public abstract class FileSystemView { */ class UnixFileSystemView extends FileSystemView { - private static final String newFolderString = - UIManager.getString("FileChooser.other.newFolder"); - private static final String newFolderNextString = - UIManager.getString("FileChooser.other.newFolder.subsequent"); - /** * Creates a new folder with a default folder name. */ @@ -785,6 +780,10 @@ class UnixFileSystemView extends FileSystemView { if(containingDir == null) { throw new IOException("Containing directory is null:"); } + String newFolderString = + UIManager.getString("FileChooser.other.newFolder"); + String newFolderNextString = + UIManager.getString("FileChooser.other.newFolder.subsequent"); File newFolder; // Unix - using OpenWindows' default folder name. Can't find one for Motif/CDE. newFolder = createFileObject(containingDir, newFolderString); @@ -838,11 +837,6 @@ class UnixFileSystemView extends FileSystemView { */ class WindowsFileSystemView extends FileSystemView { - private static final String newFolderString = - UIManager.getString("FileChooser.win32.newFolder"); - private static final String newFolderNextString = - UIManager.getString("FileChooser.win32.newFolder.subsequent"); - public Boolean isTraversable(File f) { return Boolean.valueOf(isFileSystemRoot(f) || isComputerNode(f) || f.isDirectory()); } @@ -899,6 +893,10 @@ class WindowsFileSystemView extends FileSystemView { throw new IOException("Containing directory is null:"); } // Using NT's default folder name + String newFolderString = + UIManager.getString("FileChooser.win32.newFolder"); + String newFolderNextString = + UIManager.getString("FileChooser.win32.newFolder.subsequent"); File newFolder = createFileObject(containingDir, newFolderString); int i = 2; while (newFolder.exists() && i < 100) { @@ -966,9 +964,6 @@ class WindowsFileSystemView extends FileSystemView { */ class GenericFileSystemView extends FileSystemView { - private static final String newFolderString = - UIManager.getString("FileChooser.other.newFolder"); - /** * Creates a new folder with a default folder name. */ @@ -976,6 +971,8 @@ class GenericFileSystemView extends FileSystemView { if(containingDir == null) { throw new IOException("Containing directory is null:"); } + String newFolderString = + UIManager.getString("FileChooser.other.newFolder"); // Using NT's default folder name File newFolder = createFileObject(containingDir, newFolderString); diff --git a/test/jdk/javax/swing/JFileChooser/FileChooserNewFolderLocaleTest.java b/test/jdk/javax/swing/JFileChooser/FileChooserNewFolderLocaleTest.java new file mode 100644 index 00000000000..9a4c6d3ea8e --- /dev/null +++ b/test/jdk/javax/swing/JFileChooser/FileChooserNewFolderLocaleTest.java @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2023, 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 javax.swing.JFileChooser; +import javax.swing.UIManager; +import java.io.File; + +/* + * @test + * @bug 8312075 + * @summary Test to check if created newFolder is updated with + * changing Locale. + * @run main/othervm -Duser.language=en -Duser.country=US FileChooserNewFolderLocaleTest + */ +public class FileChooserNewFolderLocaleTest { + static final String FRENCH_NEW_FOLDER = "Nouveau dossier"; + + public static void main(String[] args) throws Exception { + File newFolderEnglish = null; + File newFolderFrench = null; + String newFolderKey; + + boolean isWindows = + System.getProperty("os.name").toLowerCase().contains("windows"); + if (isWindows) { + newFolderKey = "FileChooser.win32.newFolder"; + } else { + newFolderKey = "FileChooser.other.newFolder"; + } + + String englishNewFolder = UIManager.getString(newFolderKey); + try { + JFileChooser fileChooser = new JFileChooser(); + File currentDir = new File("."); + + newFolderEnglish = + fileChooser.getFileSystemView().createNewFolder(currentDir); + if (!newFolderEnglish.getName().contains(englishNewFolder)) { + throw new RuntimeException("English Locale verification Failed"); + } + + UIManager.put(newFolderKey, FRENCH_NEW_FOLDER); + + newFolderFrench = + fileChooser.getFileSystemView().createNewFolder(currentDir); + if (!newFolderFrench.getName().contains(FRENCH_NEW_FOLDER)) { + throw new RuntimeException("Failed to update to French Locale"); + } + } finally { + deleteFolder(newFolderEnglish); + deleteFolder(newFolderFrench); + } + System.out.println("Test Passed!"); + } + + public static void deleteFolder(File file) { + if (file != null && !(file.delete())) { + System.out.println("Failed to delete file : " + file.getName()); + } + } +}