Skip to content
Permalink
Browse files
8269637: javax/swing/JFileChooser/FileSystemView/SystemIconTest.java …
…fails on windows

Backport-of: a033866d786507db69ab75643684e617fd1f4ba2
  • Loading branch information
akashche committed Nov 5, 2021
1 parent 9f3c840 commit 00fed20ff453ed0aedf5b5e143cb1738ad6f5b6a
Showing 2 changed files with 10 additions and 3 deletions.
@@ -30,6 +30,7 @@
import java.awt.image.AbstractMultiResolutionImage;
import java.awt.image.BufferedImage;
import java.awt.image.ImageObserver;
import java.awt.image.MultiResolutionImage;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -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);
@@ -743,7 +743,6 @@ javax/swing/Popup/TaskbarPositionTest.java 8065097 macosx-all,linux-all
javax/swing/JEditorPane/6917744/bug6917744.java 8213124 macosx-all
javax/swing/JRootPane/4670486/bug4670486.java 8042381 macosx-all
javax/swing/JPopupMenu/4634626/bug4634626.java 8017175 macosx-all
javax/swing/JFileChooser/FileSystemView/SystemIconTest.java 8268280 windows-x64

javax/swing/JComponent/7154030/bug7154030.java 8268284 macosx-x64

1 comment on commit 00fed20

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on 00fed20 Nov 5, 2021

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.