Skip to content
Permalink
Browse files
8259585: Accessible actions do not work on mac os x
Reviewed-by: serb
  • Loading branch information
Alexander Zuev committed Jan 12, 2021
1 parent 022bc9f commit b6d51e15549e11be583625d908192d9f7f049489
Showing with 4 additions and 3 deletions.
  1. +4 −3 src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityAction.m
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2021, 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
@@ -60,7 +60,8 @@ - (NSString *)getDescription
{
JNIEnv* env = [ThreadUtilities getJNIEnv];
DECLARE_CLASS_RETURN(sjc_CAccessibility, "sun/lwawt/macosx/CAccessibility", nil);
DECLARE_METHOD_RETURN(jm_getAccessibleActionDescription, sjc_CAccessibility, "getAccessibleActionDescription",
DECLARE_STATIC_METHOD_RETURN(jm_getAccessibleActionDescription, sjc_CAccessibility,
"getAccessibleActionDescription",
"(Ljavax/accessibility/AccessibleAction;ILjava/awt/Component;)Ljava/lang/String;", nil);

jobject fCompLocal = (*env)->NewLocalRef(env, fComponent);
@@ -86,7 +87,7 @@ - (void)perform
{
JNIEnv* env = [ThreadUtilities getJNIEnv];
DECLARE_CLASS(sjc_CAccessibility, "sun/lwawt/macosx/CAccessibility");
DECLARE_METHOD(jm_doAccessibleAction, sjc_CAccessibility, "doAccessibleAction",
DECLARE_STATIC_METHOD(jm_doAccessibleAction, sjc_CAccessibility, "doAccessibleAction",
"(Ljavax/accessibility/AccessibleAction;ILjava/awt/Component;)V");

(*env)->CallStaticVoidMethod(env, sjc_CAccessibility, jm_doAccessibleAction,

3 comments on commit b6d51e1

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot replied Jan 12, 2021

@VladimirKempik

This comment has been minimized.

Copy link

@VladimirKempik VladimirKempik replied Apr 15, 2021

/backport jdk15u-dev

@openjdk

This comment has been minimized.

Copy link

@openjdk openjdk bot replied Apr 15, 2021

@VladimirKempik could not automatically backport b6d51e15 to openjdk/jdk15u-dev due to conflicts in the following files:

  • src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityAction.m

To manually resolve these conflicts run the following commands in your personal fork of openjdk/jdk15u-dev:

$ git checkout -b backport-b6d51e15
$ git fetch --no-tags https://git.openjdk.java.net/jdk b6d51e15549e11be583625d908192d9f7f049489
$ git cherry-pick --no-commit b6d51e15549e11be583625d908192d9f7f049489
$ # Resolve conflicts
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport b6d51e15549e11be583625d908192d9f7f049489'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk15u-dev with the title Backport b6d51e15549e11be583625d908192d9f7f049489.

Please sign in to comment.