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

8253356: JavaFX Terminology Refresh #368

Closed

Conversation

@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Dec 15, 2020

Replace archaic/non-inclusive words in JavaFX with more neutral terms. See JDK-8253315 for background information.

The following changes are made:

  1. Rename whitelist/blacklist to allowlist/rejectlist
  2. Rename MasterTimer to PrimaryTimer in animation and toolkit implementation
  3. Rename local variable master in a couple places
  4. Remove master from comments in a few other places

This PR doesn't remove uses of the word master where there is no connotation of slavery.

Note that it is out of scope of this PR to address similar issues in 3rd-party code, such as WebKit or GStreamer. We will pick up any relevant changes after they are available in the upstream sources.

/reviewers 2


Progress

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

Issue

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jfx pull/368/head:pull/368
$ git checkout pull/368

1. Rename whitelist/blacklist to allowlist/rejectlist
2. Rename MasterTimer to PrimaryTimer in animation and toolkit implementation
3. Rename local variable master in a couple places
4. Remove master from comments in a few other places
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Dec 15, 2020

👋 Welcome back kcr! 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 Dec 15, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Dec 15, 2020

@kevinrushforth
The number of required reviews for this PR is now set to 2 (with at least 1 of role reviewers).

@mlbridge
Copy link

@mlbridge mlbridge bot commented Dec 15, 2020

Webrevs

@kevinrushforth kevinrushforth requested a review from arapte Dec 15, 2020
@arapte
Copy link
Member

@arapte arapte commented Dec 16, 2020

modules\javafx.graphics\src\main\native-glass\ios\GlassWindow.h has declaration of variables named masterWindow and masterWindowHost.
Please check if we should change these too.

@kevinrushforth
Copy link
Member Author

@kevinrushforth kevinrushforth commented Dec 16, 2020

Yes, I agree that these should be changed as well. Given the following in GlassWindow.h:

+(GlassMainWindow *)  getMasterWindow;

changing masterWindow to mainWindow is a better fit anyway.

@kevinrushforth
Copy link
Member Author

@kevinrushforth kevinrushforth commented Dec 16, 2020

@johanvos since this now touches iOS files, can you take a look at them (just a sanity check unless you also want to review the rest)?

@arapte
arapte approved these changes Dec 16, 2020
Copy link
Member

@arapte arapte left a comment

Looks good to me.

@johanvos
Copy link
Collaborator

@johanvos johanvos commented Dec 16, 2020

I will look into the iOS changes.

@johanvos
Copy link
Collaborator

@johanvos johanvos commented Dec 16, 2020

I confirm that the iOS changes do not cause regression.

@kevinrushforth kevinrushforth requested a review from aghaisas Dec 17, 2020
@prrace
prrace approved these changes Dec 17, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Dec 17, 2020

@kevinrushforth 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:

8253356: JavaFX Terminology Refresh

Reviewed-by: arapte, prr

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 Dec 17, 2020
@kevinrushforth kevinrushforth removed the request for review from aghaisas Dec 17, 2020
@kevinrushforth
Copy link
Member Author

@kevinrushforth kevinrushforth commented Dec 17, 2020

/integrate

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

@openjdk openjdk bot commented Dec 17, 2020

@kevinrushforth Pushed as commit fb8e0cd.

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

@kevinrushforth kevinrushforth deleted the kevinrushforth:8253356-terminology branch Dec 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 participants