8336654: [lworld] Tests depending on sun.awt.AppContext can fail when run with migrated classes

Reviewed-by: serb, azvegint

Author: prrace

src/java.desktop/macosx/classes/com/apple/laf/AquaUtils.java

@@ -35,8 +35,6 @@
 import javax.swing.border.Border;
 import javax.swing.plaf.UIResource;
 
-import sun.awt.AppContext;
-
 import sun.lwawt.macosx.CPlatformWindow;
 import sun.swing.SwingUtilities2;
 
@@ -150,13 +148,34 @@ T get() {
         protected abstract T create();
     }
 
+    abstract static class LazySingleton<T> {
+        T instance;
+
+         final T get() {
+            if (instance == null) {
+                instance = getInstance();
+            }
+            return instance;
+         }
+
+        abstract T getInstance();
+    }
+
     abstract static class RecyclableSingleton<T> {
-        final T get() {
-            return AppContext.getSoftReferenceValue(this, () -> getInstance());
-        }
 
-        void reset() {
-            AppContext.getAppContext().remove(this);
+        SoftReference<T> ref;
+
+        final T get() {
+            T instance;
+            if (ref != null) {
+                instance = ref.get();
+                if (instance != null) {
+                    return instance;
+                }
+            }
+            instance = getInstance();
+            ref = new SoftReference<>(instance);
+            return instance;
         }
 
         abstract T getInstance();
@@ -197,11 +216,11 @@ V get(final K key) {
         protected abstract V getInstance(K key);
     }
 
-    private static final RecyclableSingleton<Boolean> enableAnimations = new RecyclableSingleton<Boolean>() {
+    private static final LazySingleton<Boolean> enableAnimations = new LazySingleton<Boolean>() {
         @Override
         protected Boolean getInstance() {
-            final String sizeProperty = System.getProperty(ANIMATIONS_PROPERTY);
-            return !"false".equals(sizeProperty); // should be true by default
+            final String animationsProperty = System.getProperty(ANIMATIONS_PROPERTY);
+            return !"false".equals(animationsProperty); // should be true by default
         }
     };
     private static boolean animationsEnabled() {

src/java.desktop/share/classes/sun/awt/AppContext.java

@@ -47,7 +47,6 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Supplier;
 
 /**
  * The AppContext is a table referenced by ThreadGroup which stores
@@ -735,24 +734,6 @@ public synchronized PropertyChangeListener[] getPropertyChangeListeners(
         }
         return changeSupport.getPropertyChangeListeners(propertyName);
     }
-
-    public static <T> T getSoftReferenceValue(Object key,
-            Supplier<T> supplier) {
-
-        final AppContext appContext = AppContext.getAppContext();
-        @SuppressWarnings("unchecked")
-        SoftReference<T> ref = (SoftReference<T>) appContext.get(key);
-        if (ref != null) {
-            final T object = ref.get();
-            if (object != null) {
-                return object;
-            }
-        }
-        final T object = supplier.get();
-        ref = new SoftReference<>(object);
-        appContext.put(key, ref);
-        return object;
-    }
 }
 
 final class MostRecentKeyValue {

src/java.desktop/share/classes/sun/awt/image/ImageCache.java

@@ -29,16 +29,13 @@
 import java.lang.ref.*;
 import java.util.*;
 import java.util.concurrent.locks.*;
-import sun.awt.AppContext;
 
 /**
  * ImageCache - A fixed pixel count sized cache of Images keyed by arbitrary
  * set of arguments. All images are held with SoftReferences so they will be
  * dropped by the GC if heap memory gets tight. When our size hits max pixel
  * count least recently requested images are removed first.
  *
- * The ImageCache must be used from the thread with an AppContext only.
- *
  */
 public final class ImageCache {
 
@@ -56,9 +53,10 @@ public final class ImageCache {
     // Reference queue for tracking lost softreferences to images in the cache
     private final ReferenceQueue<Image> referenceQueue = new ReferenceQueue<>();
 
+    private static final ImageCache instance = new ImageCache();
+
     public static ImageCache getInstance() {
-        return AppContext.getSoftReferenceValue(ImageCache.class,
-                () -> new ImageCache());
+        return instance;
     }
 
     ImageCache(final int maxPixelCount) {