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

8265210: TreeCell: cell editing state not updated on cell re-use #501

Closed
wants to merge 2 commits into from

Conversation

kleopatra
Copy link
Collaborator

@kleopatra kleopatra commented May 13, 2021

fix is analogous to similar issues for Tree/TableCell (combined JDK-8150525 and JDK-8265206)

added tests that failed before and passed after the fix

note: this PR also adds two asserts (which I forgot in the previous PR 473;) in Tree/TableEditingTest which are unrelated to this fix.


Progress

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

Issue

  • JDK-8265210: TreeCell: cell editing state not updated on cell re-use

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jfx pull/501/head:pull/501
$ git checkout pull/501

Update a local copy of the PR:
$ git checkout pull/501
$ git pull https://git.openjdk.java.net/jfx pull/501/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 501

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jfx/pull/501.diff

@bridgekeeper
Copy link

bridgekeeper bot commented May 13, 2021

👋 Welcome back fastegal! 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 May 13, 2021
@mlbridge
Copy link

mlbridge bot commented May 13, 2021

Webrevs

@kevinrushforth kevinrushforth requested a review from aghaisas May 18, 2021
Copy link
Collaborator

@aghaisas aghaisas left a comment

The fix looks good to me.
I have made one minor test cleanup observation. Once fixed, it is ready to be pushed.

import javafx.collections.ObservableList;
import javafx.scene.control.TreeCell;
import javafx.scene.control.TreeItem;
//import javafx.scene.control.TableColumn;
Copy link
Collaborator

@aghaisas aghaisas May 24, 2021

Choose a reason for hiding this comment

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

Minor - 2 commented imports can be removed.

Copy link
Collaborator Author

@kleopatra kleopatra May 24, 2021

Choose a reason for hiding this comment

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

removed (c&p shows, always ;) - thanks!

@openjdk
Copy link

openjdk bot commented May 24, 2021

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

8265210: TreeCell: cell editing state not updated on cell re-use

Reviewed-by: aghaisas

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

  • 9507ea4: 8264140: Add -Djava.security.manager=allow to JavaFX tests calling setSecurityManager
  • 2fd5092: 8263761: Update boot JDK to 16.0.1
  • aebac07: 8210199: [linux / macOS] fileChooser can't handle emojis
  • 240d28f: 8264127: ListCell editing status is true, when index changes while editing
  • 5843910: 8267392: ENTER key press on editable TableView throws NPE
  • 111bac4: 8263760: Update gradle to version 7.0.1
  • 485b242: 8264219: tools/scripts/build.ps1 is out of date and no longer works
  • e76b7b1: 8186904: TableColumnHeader: resize cursor lost on right click
  • 4619cdd: 8264138: Replace uses of Class.newInstance
  • 93de584: 8266966: Wrong CSS properties are applied to other nodes after fix for JDK-8204568
  • ... and 7 more: https://git.openjdk.java.net/jfx/compare/389e8c04c42bbc19eebbade69ed175c7e56cf65d...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 Ready to be integrated label May 24, 2021
@kleopatra
Copy link
Collaborator Author

kleopatra commented May 24, 2021

/integrate

@openjdk openjdk bot closed this May 24, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Ready to be integrated rfr Ready for review labels May 24, 2021
@openjdk
Copy link

openjdk bot commented May 24, 2021

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

  • 9507ea4: 8264140: Add -Djava.security.manager=allow to JavaFX tests calling setSecurityManager
  • 2fd5092: 8263761: Update boot JDK to 16.0.1
  • aebac07: 8210199: [linux / macOS] fileChooser can't handle emojis
  • 240d28f: 8264127: ListCell editing status is true, when index changes while editing
  • 5843910: 8267392: ENTER key press on editable TableView throws NPE
  • 111bac4: 8263760: Update gradle to version 7.0.1
  • 485b242: 8264219: tools/scripts/build.ps1 is out of date and no longer works
  • e76b7b1: 8186904: TableColumnHeader: resize cursor lost on right click
  • 4619cdd: 8264138: Replace uses of Class.newInstance
  • 93de584: 8266966: Wrong CSS properties are applied to other nodes after fix for JDK-8204568
  • ... and 7 more: https://git.openjdk.java.net/jfx/compare/389e8c04c42bbc19eebbade69ed175c7e56cf65d...master

Your commit was automatically rebased without conflicts.

Pushed as commit 24ffe35.

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

@kleopatra kleopatra deleted the bug-fix-8265210 branch Sep 3, 2021
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
2 participants