src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java

rev 13901 : Fixes for 8151385. Contains additional fix for 8149453 (upFolder, newFolder, etc. icons)
rev 13629 : 8138838: docs cleanup for java.desktop
Summary: docs cleanup for java.desktop
Reviewed-by: serb
rev 12334 : 8080405: Exception in thread "AWT-EventQueue-1" java.security.AccessControlException
Reviewed-by: prr, chegar, art
rev 12260 : 8017487: filechooser in Windows-Libraries folder: columns are mixed up
Reviewed-by: serb, ant
rev 11779 : 8027771: Enhance thread contexts
Reviewed-by: anthony, serb
rev 11290 : 8062561: Test bug8055304 fails if file system default directory has read access
Reviewed-by: serb
rev 11280 : 8055304: More boxing for DirectoryComboBoxModel
Reviewed-by: serb, prr, skoivu
rev 10444 : 8054834: Modular Source Code
Reviewed-by: alanb, chegar, ihse, mduigou
Contributed-by: alan.bateman@oracle.com, alex.buckley@oracle.com, chris.hegarty@oracle.com, erik.joelsson@oracle.com, jonathan.gibbons@oracle.com, karen.kinnear@oracle.com, magnus.ihse.bursie@oracle.com, mandy.chung@oracle.com, mark.reinhold@oracle.com, paul.sandoz@oracle.com

@@ -25,10 +25,11 @@
 
 package sun.awt.shell;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;
+import java.awt.image.BaseMultiResolutionImage;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.security.AccessController;

@@ -110,21 +111,23 @@
 
     private static final Image[] STANDARD_VIEW_BUTTONS = new Image[12];
 
     private static Image getStandardViewButton(int iconIndex) {
         Image result = STANDARD_VIEW_BUTTONS[iconIndex];
-
         if (result != null) {
             return result;
         }
 
-        BufferedImage img = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
+        BufferedImage imgSmall = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
+        imgSmall.setRGB(0, 0, 16, 16, Win32ShellFolder2.getStandardViewButton0(iconIndex, true), 0, 16);
 
-        img.setRGB(0, 0, 16, 16, Win32ShellFolder2.getStandardViewButton0(iconIndex), 0, 16);
+        BufferedImage imgLarge = new BufferedImage(32, 32, BufferedImage.TYPE_INT_ARGB);
+        imgLarge.setRGB(0, 0, 32, 32, Win32ShellFolder2.getStandardViewButton0(iconIndex, false), 0, 32);
 
-        STANDARD_VIEW_BUTTONS[iconIndex] = img;
+        Image img = new BaseMultiResolutionImage(imgSmall, imgLarge);
 
+        STANDARD_VIEW_BUTTONS[iconIndex] = img;
         return img;
     }
 
     // Special folders
     private static Win32ShellFolder2 desktop;