infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-25 14:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

8377192: Remove AppContext from MenuSelectionManager

Browse Source 
Reviewed-by: dnguyen, psadhukhan, serb
This commit is contained in:
Phil Race 2026-02-17 18:34:22 +00:00
parent 7489f75dbd
commit caaebf358c
2 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/java.desktop/share/classes/javax/swing/MenuSelectionManager.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2026, 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
@ -29,7 +29,6 @@ import java.util.*;
import java.awt.event.*;
import javax.swing.event.*;
import sun.awt.AppContext;
import sun.awt.AWTAccessor;
import sun.awt.AWTAccessor.MouseEventAccessor;
import sun.swing.SwingUtilities2;
@ -48,8 +47,7 @@ public class MenuSelectionManager {
private static final boolean VERBOSE = false; // show reuse hits/misses
private static final boolean DEBUG = false; // show bad params, misc.
private static final StringBuilder MENU_SELECTION_MANAGER_KEY =
new StringBuilder("javax.swing.MenuSelectionManager");
private static final MenuSelectionManager DEFAULT_MSM = new MenuSelectionManager();
/**
* Constructs a {@code MenuSelectionManager}.
@ -62,23 +60,7 @@ public class MenuSelectionManager {
* @return a MenuSelectionManager object
*/
public static MenuSelectionManager defaultManager() {
synchronized (MENU_SELECTION_MANAGER_KEY) {
AppContext context = AppContext.getAppContext();
MenuSelectionManager msm = (MenuSelectionManager)context.get(
MENU_SELECTION_MANAGER_KEY);
if (msm == null) {
msm = new MenuSelectionManager();
context.put(MENU_SELECTION_MANAGER_KEY, msm);
// installing additional listener if found in the AppContext
Object o = context.get(SwingUtilities2.MENU_SELECTION_MANAGER_LISTENER_KEY);
if (o instanceof ChangeListener listener) {
msm.addChangeListener(listener);
}
}
return msm;
}
return DEFAULT_MSM;
}
/**

3
src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
View File

@ -121,9 +121,6 @@ import static java.awt.geom.AffineTransform.TYPE_TRANSLATION;
*/
public class SwingUtilities2 {
public static final Object MENU_SELECTION_MANAGER_LISTENER_KEY =
new StringBuffer("MenuSelectionManager listener key");
// Maintain a cache of CACHE_SIZE fonts and the left side bearing
// of the characters falling into the range MIN_CHAR_INDEX to
// MAX_CHAR_INDEX. The values in fontCache are created as needed.