Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8269637: javax/swing/JFileChooser/FileSystemView/ fails on windows #4777

wants to merge 1 commit into from
Changes from all commits
File filter
Filter by extension
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -30,6 +30,7 @@
import java.awt.image.AbstractMultiResolutionImage;
import java.awt.image.BufferedImage;
import java.awt.image.ImageObserver;
import java.awt.image.MultiResolutionImage;
@@ -1160,10 +1161,17 @@ public Image getIcon(int width, int height) {
getRelativePIDL(), s, true);
if (hIcon <= 0) {
if (isDirectory()) {
return getShell32Icon(FOLDER_ICON_ID, size);
newIcon = getShell32Icon(FOLDER_ICON_ID, size);
} else {
return getShell32Icon(FILE_ICON_ID, size);
newIcon = getShell32Icon(FILE_ICON_ID, size);
if (newIcon == null) {
return null;
if (!(newIcon instanceof MultiResolutionImage)) {
newIcon = new MultiResolutionIconImage(size, newIcon);
return newIcon;
newIcon = makeIcon(hIcon);
@@ -742,7 +742,6 @@ javax/swing/Popup/ 8065097 macosx-all,linux-all
javax/swing/JEditorPane/6917744/ 8213124 macosx-all
javax/swing/JRootPane/4670486/ 8042381 macosx-all
javax/swing/JPopupMenu/4634626/ 8017175 macosx-all
javax/swing/JFileChooser/FileSystemView/ 8268280 windows-x64

sanity/client/SwingSet/src/ 8225012 windows-all,macosx-all
sanity/client/SwingSet/src/ 8225013 linux-all