Skip to content
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.

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

8264293: Create implementation for NSAccessibilityMenu protocol peer #6421

Closed
wants to merge 3 commits into from

Conversation

@azuev-java
Copy link
Member

@azuev-java azuev-java commented Nov 16, 2021

Added implementation for all menu related protocol peers;
Native methods moved to CommonComponentAccessibility so they are called on correct peers;


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issues

  • JDK-8264293: Create implementation for NSAccessibilityMenu protocol peer
  • JDK-8264296: Create implementation for NSAccessibilityPopUpButton protocol peer
  • JDK-8264295: Create implementation for NSAccessibilityMenuItem protocol peer
  • JDK-8264294: Create implementation for NSAccessibilityMenuBar protocol peer

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/6421/head:pull/6421
$ git checkout pull/6421

Update a local copy of the PR:
$ git checkout pull/6421
$ git pull https://git.openjdk.java.net/jdk pull/6421/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6421

View PR using the GUI difftool:
$ git pr show -t 6421

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/6421.diff

Added implementation for menu related protocol peers.
Moved native methods to CommonComponentAccessibility so they are called on correct peers.
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 16, 2021

👋 Welcome back kizune! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr label Nov 16, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 16, 2021

@azuev-java The following label will be automatically applied to this pull request:

  • client

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the client label Nov 16, 2021
@azuev-java
Copy link
Member Author

@azuev-java azuev-java commented Nov 16, 2021

/issue add JDK-8264296,JDK-8264295,JDK-8264294

@openjdk
Copy link

@openjdk openjdk bot commented Nov 16, 2021

@azuev-java
Adding additional issue to issue list: 8264296: Create implementation for NSAccessibilityPopUpButton protocol peer.

Adding additional issue to issue list: 8264295: Create implementation for NSAccessibilityMenuItem protocol peer.

Adding additional issue to issue list: 8264294: Create implementation for NSAccessibilityMenuBar protocol peer.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 17, 2021

Webrevs

@victordyakov
Copy link

@victordyakov victordyakov commented Nov 17, 2021

@pankaj-bansal please review

@victordyakov
Copy link

@victordyakov victordyakov commented Nov 17, 2021

@forantar please review

Copy link

@pankaj-bansal pankaj-bansal left a comment

Looks good to me. Menu Accessibility works fine with these changes.

@openjdk
Copy link

@openjdk openjdk bot commented Nov 17, 2021

@azuev-java This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8264293: Create implementation for NSAccessibilityMenu protocol peer
8264296: Create implementation for NSAccessibilityPopUpButton protocol peer
8264295: Create implementation for NSAccessibilityMenuItem protocol peer
8264294: Create implementation for NSAccessibilityMenuBar protocol peer

Reviewed-by: pbansal, ant

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 80 new commits pushed to the master branch:

  • 9f2f46e: 8275037: Test vmTestbase/nsk/sysdict/vm/stress/btree/btree011/btree011.java crashes with memory exhaustion on Windows
  • 2af9e59: 8276139: TestJpsHostName.java not reliable, better to expand HostIdentifierCreate.java test
  • e9934e1: 8277221: G1: Remove methods without implementations in G1CollectedHeap
  • 9aa30de: 8275317: AArch64: Support some type conversion vectorization in SLP
  • 08f65a5: 8277313: Validate header failed for test/jdk/java/net/httpclient/HeadTest.java
  • 23e5117: 8276559: (httpclient) Consider adding an HttpRequest.Builder.HEAD method to build a HEAD request.
  • a77d8dd: 8276787: Improve warning messages for -XX:+RecordDynamicDumpInfo
  • 8ed384c: 8276609: Document setting property jdk.serialFilter to an invalid value throws ExceptionInInitializerError
  • cddc6ce: 8275811: Incorrect instance to dispose
  • b0a463f: 8169468: NoResizeEventOnDMChangeTest.java fails because FS Window didn't receive all resizes!
  • ... and 70 more: https://git.openjdk.java.net/jdk/compare/55b36c6f3bb7eb066daaf41f9eba46633afedf08...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Nov 17, 2021
@@ -152,6 +152,10 @@ + (void) initializeRolesMap {
[rolesMap setObject:@"ListAccessibility" forKey:@"list"];
[rolesMap setObject:@"OutlineAccessibility" forKey:@"tree"];
[rolesMap setObject:@"TableAccessibility" forKey:@"table"];
[rolesMap setObject:@"MenuBarAccessibility" forKey:@"menubar"];
Copy link
Contributor

@savoptik savoptik Nov 17, 2021

Choose a reason for hiding this comment

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

Please increase the capacity of the rolesMap dictionary if you add a new role.

Copy link
Member Author

@azuev-java azuev-java Nov 17, 2021

Choose a reason for hiding this comment

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

Fixed.

JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThread:@selector(postMenuOpened)
on:(CommonComponentAccessibility *)jlong_to_ptr(element)
withObject:nil waitUntilDone:NO];
Copy link
Contributor

@forantar forantar Nov 17, 2021

Choose a reason for hiding this comment

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

Please move waitUntilDone to the new line for consistency.

Copy link
Member Author

@azuev-java azuev-java Nov 17, 2021

Choose a reason for hiding this comment

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

Fixed.

@implementation MenuAccessibility
- (NSAccessibilityRole _Nonnull)accessibilityRole
{
return [[[self parent] javaRole] isEqualToString:@"combobox"]
Copy link
Contributor

@forantar forantar Nov 17, 2021

Choose a reason for hiding this comment

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

Please correct the indentation.

Copy link
Member Author

@azuev-java azuev-java Nov 17, 2021

Choose a reason for hiding this comment

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

Fixed.

@forantar
Copy link
Contributor

@forantar forantar commented Nov 17, 2021

Besides what @savoptik mentioned, I left only cosmetics comments. Overall looks ok to me.

@azuev-java
Copy link
Member Author

@azuev-java azuev-java commented Nov 17, 2021

Besides what @savoptik mentioned, I left only cosmetics comments. Overall looks ok to me.

Cosmetics are also important so i fixed them too.

@forantar
Copy link
Contributor

@forantar forantar commented Nov 17, 2021

Looks fine now.

@azuev-java
Copy link
Member Author

@azuev-java azuev-java commented Nov 17, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Nov 17, 2021

Going to push as commit 8f5a8f7.
Since your change was applied there have been 80 commits pushed to the master branch:

  • 9f2f46e: 8275037: Test vmTestbase/nsk/sysdict/vm/stress/btree/btree011/btree011.java crashes with memory exhaustion on Windows
  • 2af9e59: 8276139: TestJpsHostName.java not reliable, better to expand HostIdentifierCreate.java test
  • e9934e1: 8277221: G1: Remove methods without implementations in G1CollectedHeap
  • 9aa30de: 8275317: AArch64: Support some type conversion vectorization in SLP
  • 08f65a5: 8277313: Validate header failed for test/jdk/java/net/httpclient/HeadTest.java
  • 23e5117: 8276559: (httpclient) Consider adding an HttpRequest.Builder.HEAD method to build a HEAD request.
  • a77d8dd: 8276787: Improve warning messages for -XX:+RecordDynamicDumpInfo
  • 8ed384c: 8276609: Document setting property jdk.serialFilter to an invalid value throws ExceptionInInitializerError
  • cddc6ce: 8275811: Incorrect instance to dispose
  • b0a463f: 8169468: NoResizeEventOnDMChangeTest.java fails because FS Window didn't receive all resizes!
  • ... and 70 more: https://git.openjdk.java.net/jdk/compare/55b36c6f3bb7eb066daaf41f9eba46633afedf08...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Nov 17, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Nov 17, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 17, 2021

@azuev-java Pushed as commit 8f5a8f7.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
5 participants