src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java

*** 533,570 ****
      public int getMenuShortcutKeyMask() {
          return Event.META_MASK;
      }
  
      @Override
!     public Image getImage(final String filename) {
          final Image nsImage = checkForNSImage(filename);
          if (nsImage != null) {
              return nsImage;
          }
  
-         if (imageCached(filename)) {
              return super.getImage(filename);
          }
  
-         String filename2x = getScaledImageName(filename);
-         return (imageExists(filename2x))
-                 ? getImageWithResolutionVariant(filename, filename2x)
-                 : super.getImage(filename);
-     }
- 
-     @Override
-     public Image getImage(URL url) {
- 
-         if (imageCached(url)) {
-             return super.getImage(url);
-         }
- 
-         URL url2x = getScaledImageURL(url);
-         return (imageExists(url2x))
-                 ? getImageWithResolutionVariant(url, url2x) : super.getImage(url);
-     }
- 
      private static final String nsImagePrefix = "NSImage://";
      private Image checkForNSImage(final String imageName) {
          if (imageName == null) return null;
          if (!imageName.startsWith(nsImagePrefix)) return null;
          return CImage.getCreator().createImageFromName(imageName.substring(nsImagePrefix.length()));
--- 533,551 ----
      public int getMenuShortcutKeyMask() {
          return Event.META_MASK;
      }
  
      @Override
!     public Image getImage(String filename) {
          final Image nsImage = checkForNSImage(filename);
          if (nsImage != null) {
              return nsImage;
          }
  
          return super.getImage(filename);
      }
  
      private static final String nsImagePrefix = "NSImage://";
      private Image checkForNSImage(final String imageName) {
          if (imageName == null) return null;
          if (!imageName.startsWith(nsImagePrefix)) return null;
          return CImage.getCreator().createImageFromName(imageName.substring(nsImagePrefix.length()));
*** 894,938 ****
      @Override
      public boolean enableInputMethodsForTextComponent() {
          return true;
      }
  
-     private static URL getScaledImageURL(URL url) {
-         try {
-             String scaledImagePath = getScaledImageName(url.getPath());
-             return scaledImagePath == null ? null : new URL(url.getProtocol(),
-                     url.getHost(), url.getPort(), scaledImagePath);
-         } catch (MalformedURLException e) {
-             return null;
-         }
-     }
- 
-     private static String getScaledImageName(String path) {
-         if (!isValidPath(path)) {
-             return null;
-         }
- 
-         int slash = path.lastIndexOf('/');
-         String name = (slash < 0) ? path : path.substring(slash + 1);
- 
-         if (name.contains("@2x")) {
-             return null;
-         }
- 
-         int dot = name.lastIndexOf('.');
-         String name2x = (dot < 0) ? name + "@2x"
-                 : name.substring(0, dot) + "@2x" + name.substring(dot);
-         return (slash < 0) ? name2x : path.substring(0, slash + 1) + name2x;
-     }
- 
-     private static boolean isValidPath(String path) {
-         return path != null &&
-                 !path.isEmpty() &&
-                 !path.endsWith("/") &&
-                 !path.endsWith(".");
-     }
- 
      @Override
      protected PlatformWindow getPlatformWindowUnderMouse() {
          return CPlatformWindow.nativeGetTopmostPlatformWindowUnderMouse();
      }
  }
--- 875,884 ----