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

8263420: Incorrect function name in NSAccessibilityStaticText native peer implementation #1806

Closed
wants to merge 1 commit into from

Conversation

Autumn808
Copy link
Contributor

@Autumn808 Autumn808 commented Mar 15, 2023

This backport is part of the 28 backport Accessibility series JDK-8152350. Tested by building GUI and using the Accessibility components.


Progress

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

Issue

  • JDK-8263420: Incorrect function name in NSAccessibilityStaticText native peer implementation

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev pull/1806/head:pull/1806
$ git checkout pull/1806

Update a local copy of the PR:
$ git checkout pull/1806
$ git pull https://git.openjdk.org/jdk11u-dev pull/1806/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1806

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/1806.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 15, 2023

👋 Welcome back Autumn808! A progress list of the required criteria for merging this PR into pr/1804 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 changed the title Backport d896246a117a929b2d34463168095497c95ee601 8263420: Incorrect function name in NSAccessibilityStaticText native peer implementation Mar 15, 2023
@openjdk
Copy link

openjdk bot commented Mar 15, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Mar 15, 2023
@mlbridge
Copy link

mlbridge bot commented Mar 15, 2023

Webrevs

@RealCLanger
Copy link
Contributor

Hi @Autumn808,

why do you make this one a dependent PR on #1804? I think this could go on its own. Just rebase your branch to a master branch where you cherry-pick your commit Autumn808@d896246 on.

OTOH, you might just integrate #1804 now since I have it approved. Then merge master into this PR.

Cheers
Christoph

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/1804 to master March 16, 2023 18:58
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout JDK-8263420
git fetch https://git.openjdk.org/jdk11u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Mar 16, 2023

@Autumn808 this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout JDK-8263420
git fetch https://git.openjdk.org/jdk11u-dev master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added merge-conflict Pull request has merge conflict with target branch and removed merge-conflict Pull request has merge conflict with target branch labels Mar 16, 2023
@openjdk
Copy link

openjdk bot commented Mar 16, 2023

@Autumn808 Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

…peer implementation

Reviewed-by: kizune
(cherry picked from commit d896246)
@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Mar 16, 2023
@openjdk
Copy link

openjdk bot commented Mar 16, 2023

@Autumn808 Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@openjdk openjdk bot added the clean label Mar 16, 2023
@openjdk
Copy link

openjdk bot commented Mar 16, 2023

⚠️ @Autumn808 the full name on your profile does not match the author name in this pull requests' HEAD commit. If this pull request gets integrated then the author name from this pull requests' HEAD commit will be used for the resulting commit. If you wish to push a new commit with a different author name, then please run the following commands in a local repository of your personal fork:

$ git checkout JDK-8263420
$ git commit --author='Preferred Full Name <you@example.com>' --allow-empty -m 'Update full name'
$ git push

@openjdk
Copy link

openjdk bot commented Mar 16, 2023

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

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

8263420: Incorrect function name in NSAccessibilityStaticText native peer implementation

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 7 new commits pushed to the master branch:

  • 41ad047: 8264304: Create implementation for NSAccessibilityToolbar protocol peer
  • dd64212: 8264290: Create implementation for NSAccessibilityComponentGroup protocol peer
  • b8ac68d: 8220093: Change to GCC 8.2 for building on Linux at Oracle
  • 97809af: 8303937: Corrupted heap dumps due to missing retries for os::write()
  • c6f0085: 8303440: The "ZonedDateTime.parse" may not accept the "UTC+XX" zone id
  • 939741c: 8293232: Fix race condition in pkcs11 SessionManager
  • e80528b: 8282600: SSLSocketImpl should not use user_canceled workaround when not necessary

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Mar 16, 2023
@phohensee
Copy link
Member

Tagged the JBS issue.

@Autumn808
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Mar 16, 2023
@openjdk
Copy link

openjdk bot commented Mar 16, 2023

@Autumn808
Your change (at version 691fc4d) is now ready to be sponsored by a Committer.

@RealCLanger
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Mar 16, 2023

Going to push as commit 4b5fdd8.
Since your change was applied there have been 7 commits pushed to the master branch:

  • 41ad047: 8264304: Create implementation for NSAccessibilityToolbar protocol peer
  • dd64212: 8264290: Create implementation for NSAccessibilityComponentGroup protocol peer
  • b8ac68d: 8220093: Change to GCC 8.2 for building on Linux at Oracle
  • 97809af: 8303937: Corrupted heap dumps due to missing retries for os::write()
  • c6f0085: 8303440: The "ZonedDateTime.parse" may not accept the "UTC+XX" zone id
  • 939741c: 8293232: Fix race condition in pkcs11 SessionManager
  • e80528b: 8282600: SSLSocketImpl should not use user_canceled workaround when not necessary

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 16, 2023
@openjdk openjdk bot closed this Mar 16, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Mar 16, 2023
@openjdk
Copy link

openjdk bot commented Mar 16, 2023

@RealCLanger @Autumn808 Pushed as commit 4b5fdd8.

💡 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
Labels
backport clean integrated Pull request has been integrated
3 participants