8289357: (Tree)TableView is null in (Tree)TableRowSkin during autosize #805

Maran23 · 2022-06-28T17:06:39Z

Initialize the (Tree)TableView when creating the measure row.
This will guarantee, that we can access the (Tree)TableView in the (Tree)TableRowSkin, which is currently only null during the autosizing (It is always set otherwise).

With this change, a NPE is happening as the (Tree)TableRow currently assumes, that there must be a VirtualFlow somewhere in the scene (parent). I guard against this now.
I remembered, that there is a ticket for the above behaviour here: https://bugs.openjdk.org/browse/JDK-8274065

Finally, the (Tree)TableRow must be removed after the autosizing and the index must be set to -1 (as for the cell) so that e.g. cancelEdit() is not triggered. Some tests catched that (see test_rt_31015). This did not happen before as the table row setup was not complete, but now the row does know the table and therefore installs some listener on it in order to fire corresponding edit events.

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)

Issues

JDK-8289357: (Tree)TableView is null in (Tree)TableRowSkin during autosize
JDK-8292009: Wrong text artifacts in table header

Reviewers

Kevin Rushforth (@kevinrushforth - Reviewer)
Ajit Ghaisas (@aghaisas - Reviewer) 🔄 Re-review required (review applies to 4b0820b7)
Andy Goryachev (@andy-goryachev-oracle - Committer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 805

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

Using diff file

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

…. Also prevent a NPE as we don't have a VirtualFlow in the context of autosizing

bridgekeeper · 2022-06-28T17:07:02Z

👋 Welcome back mhanl! 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.

mlbridge · 2022-06-28T17:14:11Z

Webrevs

…to -1 to prevent triggering of listener

… the now correct row setup

…uto sizing

…table-view-null-in-table-row-skin

kevinrushforth · 2022-07-06T12:46:45Z

/reviewers 2

openjdk · 2022-07-06T12:47:18Z

@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

The code change looks quite reasonable to me, but it would be good to get additional eyes on this. @aghaisas will also review it.

@kleopatra do you have any thoughts on this?

kevinrushforth · 2022-08-09T21:34:11Z

I just noticed comments in JDK-8292009 indicating that this PR fixes that bug as well. It would be good to get the review for this fix done.

Since JDK-8292009 described a different problem that is also fixed as a result, it seems good to add that issue to this PR.

kevinrushforth · 2022-08-09T21:35:11Z

@Maran23 GitHub is reporting a merge conflict in two of the test files. Can you merge the latest upstream master into your branch?

…table-view-null-in-table-row-skin � Conflicts: � modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TableRowSkinTest.java � modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TreeTableRowSkinTest.java

Maran23 · 2022-08-10T09:27:07Z

@Maran23 GitHub is reporting a merge conflict in two of the test files. Can you merge the latest upstream master into your branch?

Didn't noticed, thanks for the ping.
For some reason the macOS build can not download ant:

+ mkdir -p /Users/runner/build-tools
+ wget -O /Users/runner/build-tools/apache-ant-1.10.5.tar.gz https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.tar.gz
--2022-08-10 09:37:54--  https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.tar.gz
Resolving archive.apache.org (archive.apache.org)... 138.[20](https://github.com/Maran23/jfx/runs/7763778214?check_suite_focus=true#step:3:21)1.131.134
Connecting to archive.apache.org (archive.apache.org)|138.201.131.134|:443... failed: Operation timed out.
Retrying.

I will trigger a rebuild soon.

kevinrushforth · 2022-08-10T12:51:11Z

For some reason the macOS build can not download ant:
...
I will trigger a rebuild soon.

@andy-goryachev-oracle and I have both seen this recently on some of our GHA runs. It's an intermittent failure, so a rebuild usually works.

Maran23 · 2022-08-10T13:10:36Z

/issue add JDK-8292009

openjdk · 2022-08-10T13:12:00Z

@Maran23
Adding additional issue to issue list: 8292009: Wrong text artifacts in table header.

modules/javafx.controls/src/main/java/javafx/scene/control/skin/TableColumnHeader.java

aghaisas

Looks good to me!

Maran23 · 2022-12-06T18:38:17Z

Can anyone else check this out soon? :)

kevinrushforth · 2022-12-06T18:40:54Z

Can anyone else check this out soon? :)

Sorry about the delay. I do want to see this go in soon, so yes, I can take a look. Perhaps @andy-goryachev-oracle can too?

andy-goryachev-oracle · 2022-12-06T18:59:14Z

we also have #931 in the pipeline.
thankfully, the changes seem to be orthogonal, even though I expect a few merge conflicts.

Maran23 · 2022-12-08T10:08:27Z

Just merged in the latest master to be safe. :)

aghaisas

Fix looks good to me!

andy-goryachev-oracle

the changes look good, please resolve the conflict - my #931 got integrated first, sorry.

openjdk · 2022-12-08T16:14:23Z

@Maran23 this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout 8289357-table-view-null-in-table-row-skin
git fetch https://git.openjdk.org/jfx master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

…table-view-null-in-table-row-skin � Conflicts: � modules/javafx.controls/src/main/java/javafx/scene/control/skin/TreeTableRowSkin.java

andy-goryachev-oracle

lgtm

Maran23 · 2022-12-08T19:08:45Z

/integrate

openjdk · 2022-12-08T19:11:23Z

Going to push as commit c900a00.

openjdk · 2022-12-08T19:11:56Z

@Maran23 Pushed as commit c900a00.

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

8289357: Initialize the (Tree)TableView when creating the measure row…

1c23a03

…. Also prevent a NPE as we don't have a VirtualFlow in the context of autosizing

openjdk bot added the rfr Ready for review label Jun 28, 2022

Maran23 added 3 commits June 28, 2022 20:38

8289357: Remove (Tree)TableRow after autosizing and update the index …

e3a9545

…to -1 to prevent triggering of listener

8289357: Fix test which failed as the coutner increased by one due to…

2e399e8

… the now correct row setup

8289357: Added test to verify, that no (Tree)TableRows remain after a…

b6dcccd

…uto sizing

kevinrushforth requested a review from aghaisas June 30, 2022 20:15

Merge branch 'master' of https://github.com/openjdk/jfx into 8289357-…

eb95e91

…table-view-null-in-table-row-skin

Maran23 mentioned this pull request Jul 5, 2022

8289751: Multiple unit test failures after JDK-8251483 #811

Closed

3 tasks

Maran23 added 2 commits July 6, 2022 01:24

Merge branch 'master' of https://github.com/openjdk/jfx into 8289357-…

98430c0

…table-view-null-in-table-row-skin

Enable tests again

4839de0

kevinrushforth self-requested a review July 8, 2022 14:57

kevinrushforth reviewed Jul 13, 2022

View reviewed changes

kevinrushforth self-requested a review July 22, 2022 16:03

Maran23 added 2 commits August 10, 2022 10:05

Added other ticket as reference in javadoc

1ee61b2

andy-goryachev-oracle reviewed Aug 10, 2022

View reviewed changes

modules/javafx.controls/src/main/java/javafx/scene/control/skin/TableColumnHeader.java Show resolved Hide resolved

modules/javafx.controls/src/main/java/javafx/scene/control/skin/TableColumnHeader.java Show resolved Hide resolved

aghaisas approved these changes Sep 13, 2022

View reviewed changes

kevinrushforth approved these changes Dec 8, 2022

View reviewed changes

kevinrushforth requested review from aghaisas and andy-goryachev-oracle and removed request for andy-goryachev-oracle December 8, 2022 13:12

aghaisas approved these changes Dec 8, 2022

View reviewed changes

openjdk bot added the ready Ready to be integrated label Dec 8, 2022

andy-goryachev-oracle approved these changes Dec 8, 2022

View reviewed changes

openjdk bot added merge-conflict Pull request has merge conflict with target branch and removed ready Ready to be integrated labels Dec 8, 2022

Merge branch 'master' of https://github.com/openjdk/jfx into 8289357-…

54f24a7

…table-view-null-in-table-row-skin � Conflicts: � modules/javafx.controls/src/main/java/javafx/scene/control/skin/TreeTableRowSkin.java

kevinrushforth requested review from kevinrushforth, andy-goryachev-oracle and aghaisas and removed request for andy-goryachev-oracle December 8, 2022 17:56

kevinrushforth approved these changes Dec 8, 2022

View reviewed changes

openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Dec 8, 2022

andy-goryachev-oracle approved these changes Dec 8, 2022

View reviewed changes

openjdk bot added the ready Ready to be integrated label Dec 8, 2022

openjdk bot added the integrated Pull request has been integrated label Dec 8, 2022

openjdk bot closed this Dec 8, 2022

openjdk bot removed ready Ready to be integrated rfr Ready for review labels Dec 8, 2022

Maran23 deleted the 8289357-table-view-null-in-table-row-skin branch August 4, 2023 18:00

8289357: (Tree)TableView is null in (Tree)TableRowSkin during autosize #805

8289357: (Tree)TableView is null in (Tree)TableRowSkin during autosize #805

Maran23 commented Jun 28, 2022 •

edited by openjdk bot

bridgekeeper bot commented Jun 28, 2022

mlbridge bot commented Jun 28, 2022 •

edited

kevinrushforth commented Jul 6, 2022

openjdk bot commented Jul 6, 2022

kevinrushforth left a comment

kevinrushforth commented Aug 9, 2022

kevinrushforth commented Aug 9, 2022

Maran23 commented Aug 10, 2022 •

edited

kevinrushforth commented Aug 10, 2022

Maran23 commented Aug 10, 2022

openjdk bot commented Aug 10, 2022

aghaisas left a comment

Maran23 commented Dec 6, 2022

kevinrushforth commented Dec 6, 2022

andy-goryachev-oracle commented Dec 6, 2022 •

edited

Maran23 commented Dec 8, 2022

aghaisas left a comment

andy-goryachev-oracle left a comment

openjdk bot commented Dec 8, 2022

andy-goryachev-oracle left a comment

Maran23 commented Dec 8, 2022

openjdk bot commented Dec 8, 2022

openjdk bot commented Dec 8, 2022

8289357: (Tree)TableView is null in (Tree)TableRowSkin during autosize #805

8289357: (Tree)TableView is null in (Tree)TableRowSkin during autosize #805

Conversation

Maran23 commented Jun 28, 2022 • edited by openjdk bot

Progress

Issues

Reviewers

Reviewing

bridgekeeper bot commented Jun 28, 2022

mlbridge bot commented Jun 28, 2022 • edited

Webrevs

kevinrushforth commented Jul 6, 2022

openjdk bot commented Jul 6, 2022

kevinrushforth left a comment

Choose a reason for hiding this comment

kevinrushforth commented Aug 9, 2022

kevinrushforth commented Aug 9, 2022

Maran23 commented Aug 10, 2022 • edited

kevinrushforth commented Aug 10, 2022

Maran23 commented Aug 10, 2022

openjdk bot commented Aug 10, 2022

aghaisas left a comment

Choose a reason for hiding this comment

Maran23 commented Dec 6, 2022

kevinrushforth commented Dec 6, 2022

andy-goryachev-oracle commented Dec 6, 2022 • edited

Maran23 commented Dec 8, 2022

aghaisas left a comment

Choose a reason for hiding this comment

andy-goryachev-oracle left a comment

Choose a reason for hiding this comment

openjdk bot commented Dec 8, 2022

andy-goryachev-oracle left a comment

Choose a reason for hiding this comment

Maran23 commented Dec 8, 2022

openjdk bot commented Dec 8, 2022

openjdk bot commented Dec 8, 2022

Maran23 commented Jun 28, 2022 •

edited by openjdk bot

mlbridge bot commented Jun 28, 2022 •

edited

Maran23 commented Aug 10, 2022 •

edited

andy-goryachev-oracle commented Dec 6, 2022 •

edited