Skip to content

8254850: Update terminology in java.awt.GridBagLayout source code comments #1784

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

Jump to bottom
Closed
wants to merge 2 commits into from
Closed

8254850: Update terminology in java.awt.GridBagLayout source code comments #1784

wants to merge 2 commits into from

Conversation

prrace
Copy link
Contributor

@prrace prrace commented Dec 15, 2020 •
edited by openjdk bot
Loading

This is part of an effort in the JDK to replace archaic/non-inclusive words with more neutral terms.
See JDK-8253315 for details.

This updates a few comments in GridBagLayout to use the terms parent and child which are
sufficiently descriptive and consistent with lots of other usages.

Progress

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

Issue

  • JDK-8254850: Update terminology in java.awt.GridBagLayout source code comments

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/1784/head:pull/1784
$ git checkout pull/1784

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 15, 2020

👋 Welcome back prr! 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
Copy link

openjdk bot commented Dec 15, 2020

@prrace The following label will be automatically applied to this pull request:

  • awt

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 awt client-libs-dev@openjdk.org label Dec 15, 2020
@prrace prrace changed the title Update terminology in java.awt.GridBagLayout source code comments 8254850: Update terminology in java.awt.GridBagLayout source code comments Dec 15, 2020
@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 15, 2020
@mlbridge
Copy link

mlbridge bot commented Dec 15, 2020 •
edited
Loading

Webrevs

kevinrushforth
kevinrushforth approved these changes Dec 15, 2020
View reviewed changes
Copy link
Member

@kevinrushforth kevinrushforth left a comment

Choose a reason for hiding this comment

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

Looks good. One minor question.

src/java.desktop/share/classes/java/awt/GridBagLayout.java Outdated
@@ -1364,7 +1364,7 @@ else if (constraints.gridwidth == 0 && curCol < 0)
px = constraints.tempX + constraints.tempWidth; /* right column */

/*
* Figure out if we should use this slave\'s weight. If the weight
* Figure out if we should use this child\'s weight. If the weight
Copy link
Member

Choose a reason for hiding this comment

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

Is the \ still needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not for any reason I can imagine.

azuev-java
azuev-java approved these changes Dec 15, 2020
View reviewed changes
Copy link
Member

@azuev-java azuev-java left a comment

Choose a reason for hiding this comment

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

Looks good.

@openjdk
Copy link

openjdk bot commented Dec 15, 2020 •
edited
Loading

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

8254850: Update terminology in java.awt.GridBagLayout source code comments

Reviewed-by: kcr, kizune

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

  • 330ce86: 8257700: Add logging for sealed classes in JVM_GetPermittedSubclasses
  • c463264: 8258048: Placeholder hash code is the same as Dictionary hash code
  • ab5d581: 8258447: Move make/hotspot/hotspot.script to make/scripts
  • 70183f4: 8251438: Issues with our POSIX set_signal_handler()
  • 6eca296: 8258420: Move URL configuration from Docs.gmk to conf dir
  • 3c66485: 8257906: JFR: RecordingStream leaks memory
  • 0c8cc2c: 8258058: improve description of OutOfMemoryError relevant flags
  • cdb5342: 8258252: Move PtrQueue enqueue to PtrQueueSet subclasses
  • 17ace83: 8258074: Move some flags related to compiler to compiler_globals.hpp
  • 47ba652: 8258455: problem list tools/jdeprscan/tests/jdk/jdeprscan/TestRelease.java
  • ... and 26 more: https://git.openjdk.java.net/jdk/compare/2c3ae19a20434f93ccff23175ddaea398d49a0c6...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 Pull request is ready to be integrated label Dec 15, 2020
@prrace
Copy link
Contributor Author

prrace commented Dec 17, 2020

/integrate

@openjdk openjdk bot closed this Dec 17, 2020
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 17, 2020
@openjdk
Copy link

openjdk bot commented Dec 17, 2020

@prrace Since your change was applied there have been 65 commits pushed to the master branch:

  • 7b05439: 8258057: serviceability/attach/RemovingUnixDomainSocketTest.java doesn't ignore VM warnings
  • 143998e: 8248383: Clarify java.io.Reader.read(char[], ...) behavior for full array
  • 8251b74: 8257530: vmTestbase/metaspace/stressDictionary/StressDictionary.java timed out
  • 6aa8eed: 8258415: gtest for committed memory leaks reservation
  • 83be8a9: 8247732: validate user-input intrinsic_ids in ControlIntrinsic
  • 178c001: 8258479: Minor cleanups in VMError
  • c11525a: 8257772: Vectorizing clear memory operation using AVX-512 masked operations
  • d77b49d: 8258233: Reenable another fixed problemlisted test
  • 513269d: 8196093: javax/swing/JComboBox/8072767/bug8072767.java fails
  • 643ddc1: 8257882: Implement linkToNative intrinsic on AArch64
  • ... and 55 more: https://git.openjdk.java.net/jdk/compare/2c3ae19a20434f93ccff23175ddaea398d49a0c6...master

Your commit was automatically rebased without conflicts.

Pushed as commit 9ed0b76.

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

@prrace prrace deleted the gridbag branch February 10, 2021 19:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kevinrushforth kevinrushforth kevinrushforth approved these changes

@azuev-java azuev-java azuev-java approved these changes

Assignees
No one assigned
Labels
awt client-libs-dev@openjdk.org integrated Pull request has been integrated
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@prrace @kevinrushforth @azuev-java