Skip to content

8378057: CAccessibility roleKey and AWTAccessor.AccessibleBundleAccessor are Redundant #29868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mickleness wants to merge 3 commits into
base: master
Choose a base branch
from
+7 −19
Open

8378057: CAccessibility roleKey and AWTAccessor.AccessibleBundleAccessor are Redundant #29868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c74bfc
8378057: remove CAccessibility.roleKey
mickleness Feb 17, 2026
0f01ea6
8378057: changing null check
mickleness Feb 24, 2026
f79ee5f
8378057: changing null check
mickleness Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,9 @@ public void propertyChange(final PropertyChangeEvent evt) {
if (newValue instanceof Accessible) {
AccessibleContext nvAC = ((Accessible) newValue).getAccessibleContext();
AccessibleRole nvRole = nvAC.getAccessibleRole();
if (!ignoredRoles.contains(roleKey(nvRole))) {
String roleStr = nvRole == null ? null :
AWTAccessor.getAccessibleBundleAccessor().getKey(nvRole);
if (!ignoredRoles.contains(roleStr)) {
Copy link
Member

@mrserb mrserb Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change looks fine, but I’m wondering if we need the same null check here as well.

Copy link
Contributor Author

@mickleness mickleness Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we need it, but I added one just now since you asked about it.

Previously this invocation (at line 119) did not include a null check, and the other invocation (at line 1037) did.

focusChanged();
}
}
Expand Down Expand Up @@ -1034,8 +1036,10 @@ private static void _addChildren(Accessible a, int whichChildren, boolean allowI
// "ignored", and we should skip it and its descendants
if (isShowing(context)) {
final AccessibleRole role = context.getAccessibleRole();
if (role != null && ignoredRoles != null &&
ignoredRoles.contains(roleKey(role))) {
String roleStr = role == null ? null :
AWTAccessor.getAccessibleBundleAccessor().getKey(role);
if (roleStr != null && ignoredRoles != null &&
ignoredRoles.contains(roleStr)) {
// Get the child's unignored children.
_addChildren(child, whichChildren, false,
childrenAndRoles, ChildrenOperations.COMMON);
Expand Down Expand Up @@ -1096,8 +1100,6 @@ private static boolean isShowing(final AccessibleContext context) {
return isShowing(parentContext);
}

private static native String roleKey(AccessibleRole aRole);

public static Object[] getChildren(final Accessible a, final Component c) {
if (a == null) return null;
return invokeAndWait(new Callable<Object[]>() {
Expand Down
14 changes: 0 additions & 14 deletions src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,20 +325,6 @@ static BOOL JavaAccessibilityIsSupportedAttribute(id element, NSString *attribut
return [[element accessibilityAttributeNames] indexOfObject:attribute] != NSNotFound;
}

/*
* Class: sun_lwawt_macosx_CAccessibility
* Method: roleKey
* Signature: (Ljavax/accessibility/AccessibleRole;)Ljava/lang/String;
*/
JNIEXPORT jstring JNICALL Java_sun_lwawt_macosx_CAccessibility_roleKey
(JNIEnv *env, jclass clz, jobject axRole)
{
DECLARE_CLASS_RETURN(sjc_AccessibleRole, "javax/accessibility/AccessibleRole", NULL);
DECLARE_FIELD_RETURN(sjf_key, sjc_AccessibleRole, "key", "Ljava/lang/String;", NULL);
return (*env)->GetObjectField(env, axRole, sjf_key);
}


// errors from NSAccessibilityErrors
void JavaAccessibilityRaiseSetAttributeToIllegalTypeException(const char *functionName, id element, NSString *attribute, id value)
{
Expand Down