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

8220202: Simplify/standardize method naming for HtmlTree #2674

Closed
wants to merge 2 commits into from

Conversation

amosshi
Copy link
Contributor

@amosshi amosshi commented Apr 21, 2024

Backport of JDK-8220202

  • This PR contains 2 commits
  • Commit 1: is the git apply from the original commit
  • Commit 2: is trying to aplly the rejected changes. Although it contains many files, well it only contains 3 types of changes:
    • Change type A. Change method name from addContent to add
    • Change type B. Change method name from addAttr to put
    • Change type C. Add missing import to fix compile error

Testing

  • Local: Test passed
    • TestHtmlDocument.java: Test results: passed: 1
  • Pipeline: All checks have passed
  • Testing Machine: SAP nightlies passed on 2024-04-22
    • Automated jtreg test: jtreg_langtools
    • jdk/javadoc/doclet/testHtmlDocument/TestHtmlDocument.java: SUCCESSFUL GitHub 📊⏲ - [761 msec]

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8220202 needs maintainer approval

Issue

  • JDK-8220202: Simplify/standardize method naming for HtmlTree (Enhancement - P3 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2674

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 21, 2024

👋 Welcome back ashi! 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 Apr 21, 2024

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

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

8220202: Simplify/standardize method naming for HtmlTree

Reviewed-by: lucy

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

  • 533b458: 8293965: Code signing warnings after JDK-8293550
  • e73d88f: 8315609: Open source few more swing text/html tests
  • ff1b975: 8315071: Modify TrayIconScalingTest.java, PrintLatinCJKTest.java to use new PassFailJFrame's builder pattern usage
  • f1687ea: 8306634: Open source AWT Event related tests
  • 4ca2d02: 8305874: Open source AWT Key, Text Event related tests
  • 7491ed4: 8302069: javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java update
  • 295a8cd: 8163921: HttpURLConnection default Accept header is malformed according to HTTP/1.1 RFC
  • 3f12da5: 8315741: Open source few swing JFormattedTextField and JPopupMenu tests
  • e1662fb: 8316154: Opensource JTextArea manual tests
  • 0be4705: 8315824: Open source several Swing Text/HTML related tests
  • ... and 4 more: https://git.openjdk.org/jdk11u-dev/compare/215cf9b9a9f19fcff9272af7f28f17281a8bdab8...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 changed the title Backport 1b9db9b7a131f7cf24b0ca64337ff61ad3544ef5 8220202: Simplify/standardize method naming for HtmlTree Apr 21, 2024
@openjdk
Copy link

openjdk bot commented Apr 21, 2024

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 Apr 21, 2024
@mlbridge
Copy link

mlbridge bot commented Apr 21, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Apr 23, 2024

@amosshi This pull request has not yet been marked as ready for integration.

Copy link
Contributor

@RealLucy RealLucy 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.
I admit I did not check each and every changed line. Diffing the original patch and this backport patch resulted in close to 5,000 lines.

@openjdk
Copy link

openjdk bot commented Apr 23, 2024

⚠️ @amosshi This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@amosshi
Copy link
Contributor Author

amosshi commented Apr 23, 2024

/approval request "Backporting as 8253700 dependency. Un-Clean backport. SAP nightlies passed on 2024-04-22”

@openjdk
Copy link

openjdk bot commented Apr 23, 2024

@amosshi
8220202: The approval request has been created successfully.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Apr 23, 2024
@amosshi
Copy link
Contributor Author

amosshi commented Apr 25, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Apr 25, 2024

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

  • decacb8: 8282017: sun/net/www/protocol/https/HttpsURLConnection/B6216082.java fails with "SocketException: Unexpected end of file from server"
  • 1ea1852: 8187759: Background not refreshed when painting over a transparent JFrame
  • 6cce290: 8318854: [macos14] Running any AWT app prints Secure coding warning
  • 533b458: 8293965: Code signing warnings after JDK-8293550
  • e73d88f: 8315609: Open source few more swing text/html tests
  • ff1b975: 8315071: Modify TrayIconScalingTest.java, PrintLatinCJKTest.java to use new PassFailJFrame's builder pattern usage
  • f1687ea: 8306634: Open source AWT Event related tests
  • 4ca2d02: 8305874: Open source AWT Key, Text Event related tests
  • 7491ed4: 8302069: javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java update
  • 295a8cd: 8163921: HttpURLConnection default Accept header is malformed according to HTTP/1.1 RFC
  • ... and 7 more: https://git.openjdk.org/jdk11u-dev/compare/215cf9b9a9f19fcff9272af7f28f17281a8bdab8...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 25, 2024
@openjdk openjdk bot closed this Apr 25, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 25, 2024
@openjdk
Copy link

openjdk bot commented Apr 25, 2024

@amosshi Pushed as commit dabf4d1.

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

@amosshi amosshi deleted the backport-8220202 branch April 25, 2024 16:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants