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

*** 1,7 ****
  /*
!  * Copyright (c) 2003, 2019, 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.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2003, 2020, 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.  Oracle designates this
*** 51,64 ****
--- 51,66 ----
  import sun.util.logging.PlatformLogger;
  
  import static sun.awt.shell.Win32ShellFolder2.DESKTOP;
  import static sun.awt.shell.Win32ShellFolder2.DRIVES;
  import static sun.awt.shell.Win32ShellFolder2.Invoker;
+ import static sun.awt.shell.Win32ShellFolder2.LARGE_ICON_SIZE;
  import static sun.awt.shell.Win32ShellFolder2.MultiResolutionIconImage;
  import static sun.awt.shell.Win32ShellFolder2.NETWORK;
  import static sun.awt.shell.Win32ShellFolder2.PERSONAL;
  import static sun.awt.shell.Win32ShellFolder2.RECENT;
+ import static sun.awt.shell.Win32ShellFolder2.SMALL_ICON_SIZE;
  // NOTE: This class supersedes Win32ShellFolderManager, which was removed
  //       from distribution after version 1.4.2.
  
  /**
   * @author Michael Martak
*** 142,154 ****
              final int size = (int) Math.sqrt(iconBits.length);
              final BufferedImage img =
                      new BufferedImage(size, size, BufferedImage.TYPE_INT_ARGB);
              img.setRGB(0, 0, size, size, iconBits, 0, size);
  
!             STANDARD_VIEW_BUTTONS[iconIndex] = (size == 16)
                      ? img
!                     : new MultiResolutionIconImage(16, img);
          }
  
          return STANDARD_VIEW_BUTTONS[iconIndex];
      }
  
--- 144,156 ----
              final int size = (int) Math.sqrt(iconBits.length);
              final BufferedImage img =
                      new BufferedImage(size, size, BufferedImage.TYPE_INT_ARGB);
              img.setRGB(0, 0, size, size, iconBits, 0, size);
  
!             STANDARD_VIEW_BUTTONS[iconIndex] = (size == SMALL_ICON_SIZE)
                      ? img
!                     : new MultiResolutionIconImage(SMALL_ICON_SIZE, img);
          }
  
          return STANDARD_VIEW_BUTTONS[iconIndex];
      }
  
*** 406,416 ****
          } else if (key.startsWith("shell32Icon ") || key.startsWith("shell32LargeIcon ")) {
              String name = key.substring(key.indexOf(" ") + 1);
              try {
                  int i = Integer.parseInt(name);
                  if (i >= 0) {
!                     return Win32ShellFolder2.getShell32Icon(i, key.startsWith("shell32LargeIcon "));
                  }
              } catch (NumberFormatException ex) {
              }
          }
          return null;
--- 408,419 ----
          } else if (key.startsWith("shell32Icon ") || key.startsWith("shell32LargeIcon ")) {
              String name = key.substring(key.indexOf(" ") + 1);
              try {
                  int i = Integer.parseInt(name);
                  if (i >= 0) {
!                     return Win32ShellFolder2.getShell32Icon(i,
!                          key.startsWith("shell32LargeIcon ")?LARGE_ICON_SIZE : SMALL_ICON_SIZE);
                  }
              } catch (NumberFormatException ex) {
              }
          }
          return null;