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

8284676: TreeTableView loses sort ordering when applied on empty table #825

Closed
wants to merge 2 commits into from

Conversation

arapte
Copy link
Member

@arapte arapte commented Jul 12, 2022

Issue: In a TreeTableView if root item has no children then TreeTableView does not retain if a sort order is set.

Cause: This is a regression of fix for JDK-8256283, which returned false from SortPolicy.call() function if root item has no children. This function is called from TreeTableView.sort() line #1863. When the returned value is false then line #1885 gets executed, which removes the sort order that was added.

Fix: The fix for JDK-8256283 is modified to return true instead. Added a test that fails without and passes with fix.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (2 reviews required, with at least 1 Reviewer, 1 Author)

Issue

  • JDK-8284676: TreeTableView loses sort ordering when applied on empty table

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jfx pull/825/head:pull/825
$ git checkout pull/825

Update a local copy of the PR:
$ git checkout pull/825
$ git pull https://git.openjdk.org/jfx pull/825/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 825

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jfx/pull/825.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 12, 2022

👋 Welcome back arapte! 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 Ready for review label Jul 12, 2022
@mlbridge
Copy link

mlbridge bot commented Jul 12, 2022

Webrevs

@kevinrushforth
Copy link
Member

/reviewers 2

@openjdk
Copy link

openjdk bot commented Jul 12, 2022

@kevinrushforth
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with at least 1 Reviewer, 1 Author).

@kevinrushforth
Copy link
Member

@aghaisas or @jperedadnr can one of you be the second reviewer?

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. I confirm that the newly added test passes with the fix and fails without.

Copy link
Collaborator

@jperedadnr jperedadnr 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, minor naming issue

@openjdk
Copy link

openjdk bot commented Jul 13, 2022

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

8284676: TreeTableView loses sort ordering when applied on empty table

Reviewed-by: kcr, jpereda

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 Ready to be integrated label Jul 13, 2022
@arapte
Copy link
Member Author

arapte commented Jul 13, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jul 13, 2022

Going to push as commit 0132ac8.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jul 13, 2022
@openjdk openjdk bot closed this Jul 13, 2022
@openjdk openjdk bot removed ready Ready to be integrated rfr Ready for review labels Jul 13, 2022
@openjdk
Copy link

openjdk bot commented Jul 13, 2022

@arapte Pushed as commit 0132ac8.

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

@arapte arapte deleted the TTV-sortOrder-fix branch September 1, 2022 04:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants