mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2026-01-09 10:01:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

8352970: Remove unnecessary Windows version check in Win32ShellFolderManager2

Browse Source 
Reviewed-by: prr, serb
This commit is contained in:
Daniel Gredler
2025-03-28 17:22:33 +00:00
committed by Sergey Bylokhov
parent c70ad6a053
commit 3d2c3cd40e
2 changed files with 59 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2025, 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
@@ -43,7 +43,6 @@ import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import sun.awt.OSInfo;
import sun.awt.util.ThreadGroupUtils;
import sun.util.logging.PlatformLogger;
@@ -291,7 +290,7 @@ final class Win32ShellFolderManager2 extends ShellFolderManager {
Win32ShellFolder2 drives = getDrives();
Win32ShellFolder2 recentFolder = getRecent();
if (recentFolder != null && OSInfo.getWindowsVersion().compareTo(OSInfo.WINDOWS_2000) >= 0) {
if (recentFolder != null) {
folders.add(recentFolder);
}

57
test/jdk/java/awt/FileDialog/FileSystemViewFilesTest.java Normal file
View File

@@ -0,0 +1,57 @@
/*
* Copyright (c) 2025, 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 8352970
@requires (os.family == "windows")
@summary Basic sanity test for FileSystemView.getChooserComboBoxFiles().
*/
import java.io.File;
import java.util.Arrays;
import javax.swing.filechooser.FileSystemView;
public class FileSystemViewFilesTest {
public static void main(String[] args) throws Exception {
FileSystemView fsv = FileSystemView.getFileSystemView();
File[] roots = fsv.getRoots();
File desktop = Arrays.asList(roots).stream()
.filter(f -> f.getName().equals("Desktop"))
.findFirst()
.orElse(null);
if (desktop == null) {
System.out.println("No desktop available in " + roots.length + " roots");
return;
}
File[] chooserFiles = fsv.getChooserComboBoxFiles();
boolean found = Arrays.asList(chooserFiles).stream()
.anyMatch(f -> f.equals(desktop));
if (!found) {
throw new RuntimeException("Desktop not included in chooser combo box files.");
}
}
}