-
Notifications
You must be signed in to change notification settings - Fork 5.3k
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
8274465: Fix javax/swing/text/ParagraphView/6364882/bug6364882.java failures #5761
Conversation
👋 Welcome back aivanov! A progress list of the required criteria for merging this PR into |
@aivanov-jdk The following label will be automatically applied to this pull request:
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. |
Good. |
I've tested this fix on two of our cloud hosts. Although I'm not sure whether it will pass on all our platforms, it's much better now. You still need at least one more review since I'm not familiar with this part. |
@aivanov-jdk 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:
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 26 new commits pushed to the
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I assume that the update test still can be used for 6364882 verification.
Yes, the assertions still work correctly. In JDK 6-b75, the explicitly broken lines are justified:
|
/integrate |
Going to push as commit bb4500d.
Your commit was automatically rebased without conflicts. |
@aivanov-jdk Pushed as commit bb4500d. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
I made the test and its assertions more flexible in regards to the font size and to the number of lines.
The test still requires there are at least four lines so that the text is wrapped before the first hard line break; thus at least one line of text is justified. This pre-requisite gets broken if
font-size: 4pt
property is added to thestyle
attribute in my local environment. I also ran the test with a few larger font sizes, the updated test passes successfully.I made sure the image is saved if any exception gets thrown from
checkJustification
, which wasn't the case.This PR replaces #5744.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/5761/head:pull/5761
$ git checkout pull/5761
Update a local copy of the PR:
$ git checkout pull/5761
$ git pull https://git.openjdk.java.net/jdk pull/5761/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 5761
View PR using the GUI difftool:
$ git pr show -t 5761
Using diff file
Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/5761.diff