Skip to content

Commit

Permalink
8312075: FileChooser.win32.newFolder is not updated when changing Locale
Browse files Browse the repository at this point in the history
Reviewed-by: aivanov, abhiscxk
  • Loading branch information
Tejesh R committed Sep 8, 2023
1 parent 806ef08 commit 3a00ec8
Show file tree
Hide file tree
Showing 2 changed files with 92 additions and 14 deletions.
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -773,18 +773,17 @@ public String getName() {
*/
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.
*/
public File createNewFolder(File containingDir) throws IOException {
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);
Expand Down Expand Up @@ -838,11 +837,6 @@ public boolean isComputerNode(File dir) {
*/
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());
}
Expand Down Expand Up @@ -899,6 +893,10 @@ public File createNewFolder(File containingDir) throws IOException {
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) {
Expand Down Expand Up @@ -966,16 +964,15 @@ public boolean exists() {
*/
class GenericFileSystemView extends FileSystemView {

private static final String newFolderString =
UIManager.getString("FileChooser.other.newFolder");

/**
* Creates a new folder with a default folder name.
*/
public File createNewFolder(File containingDir) throws IOException {
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);

Expand Down
Original file line number Diff line number Diff line change
@@ -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());
}
}
}

1 comment on commit 3a00ec8

@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.