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

@@ -532,25 +532,36 @@
     @Override
     public int getMenuShortcutKeyMask() {
         return Event.META_MASK;
     }
 
+    private boolean loadImageWithScheme;
+
+    @Override
+    public Image getImageUsingNamingSchemes(String path,
+            MediaResolutionNamingScheme... namingSchemes) {
+        try {
+            loadImageWithScheme = true;
+            return super.getImageUsingNamingSchemes(path, namingSchemes);
+        } finally {
+            loadImageWithScheme = false;
+        }
+    }
+
     @Override
     public Image getImage(final String filename) {
         final Image nsImage = checkForNSImage(filename);
         if (nsImage != null) {
             return nsImage;
         }
 
-        if (imageCached(filename)) {
+        if (loadImageWithScheme) {
             return super.getImage(filename);
         }
 
-        String filename2x = getScaledImageName(filename);
-        return (imageExists(filename2x))
-                ? getImageWithResolutionVariant(filename, filename2x)
-                : super.getImage(filename);
+        return getImageUsingNamingSchemes(filename,
+                new MediaResolutionNamingScheme("@2x", 2));
     }
 
     @Override
     public Image getImage(URL url) {