diff --git a/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java b/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java index 58a0f28bb02..d552bc5c9f2 100644 --- a/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java +++ b/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java @@ -92,7 +92,6 @@ import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; import sun.awt.AWTAccessor; -import sun.awt.AppContext; import sun.awt.SunToolkit; import sun.font.FontDesignMetrics; import sun.font.FontUtilities; @@ -1241,7 +1240,7 @@ public class SwingUtilities2 { return null; } - private static final Object APP_CONTEXT_FRC_CACHE_KEY = new Object(); + private static final Map cache = new HashMap<>(); private static FontRenderContext getFRCFromCache(AffineTransform tx, Object aaHint) { @@ -1249,15 +1248,6 @@ public class SwingUtilities2 { return null; } - @SuppressWarnings("unchecked") - Map cache = (Map) - AppContext.getAppContext().get(APP_CONTEXT_FRC_CACHE_KEY); - - if (cache == null) { - cache = new HashMap<>(); - AppContext.getAppContext().put(APP_CONTEXT_FRC_CACHE_KEY, cache); - } - Object key = (tx == null) ? aaHint : (aaHint == null ? tx : new KeyPair(tx, aaHint));