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

Reviewed-by: aivanov
  • Loading branch information
Alexander Zuev committed Jul 14, 2021
1 parent 14da658 commit a033866d786507db69ab75643684e617fd1f4ba2
Showing with 10 additions and 3 deletions.
  1. +10 −2 src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolder2.java
  2. +0 −1 test/jdk/ProblemList.txt
@@ -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);
@@ -742,7 +742,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

sanity/client/SwingSet/src/ToolTipDemoTest.java 8225012 windows-all,macosx-all
sanity/client/SwingSet/src/ScrollPaneDemoTest.java 8225013 linux-all

1 comment on commit a033866

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on a033866 Jul 14, 2021

Please sign in to comment.