8342462: TextAreaSkin: remove USE_MULTIPLE_NODES #1601

andy-goryachev-oracle · 2024-10-16T23:01:39Z

Removed "not yet fully implemented" USE_MULTIPLE_NODES and related code.

I would like to remove the early unfinished idea of using multiple Text nodes in TextAreaSkin to clean up the code, to make it easier to do fixes for JDK-8342233 and JDK-8296266.

Also some minor cleanup.

Summary of Changes

removed USE_MULTIPLE_NODES and code paths that correspond to its true value
permanently adding one Text node to paragraphNodes Group, keeping the latter for compatibility purposes
removed any code that scans paragraphNodes children
using getTextNode() in place of ((Text)paragraphNodes.getChildren().get(0))

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

Issue

JDK-8342462: TextAreaSkin: remove USE_MULTIPLE_NODES (Enhancement - P4)

Reviewers

Kevin Rushforth (@kevinrushforth - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1601

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2024-10-16T23:02:07Z

👋 Welcome back angorya! 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 · 2024-10-16T23:02:36Z

@andy-goryachev-oracle 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:

8342462: TextAreaSkin: remove USE_MULTIPLE_NODES

Reviewed-by: kcr

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

6ac2dd3: 8336031: Create implementation of NSAccessibilityStaticText protocol
f5b18ad: 8337280: Include jdk.jsobject module with JavaFX
f71c390: 8340003: Bump minimum JDK version for JavaFX to JDK 22
77482de: 8341372: BackgroundPosition, BorderImage, BorderStroke, CornerRadii should be final
c4b1e1c: 8341686: FX: Update copyright year in docs, readme files to 2025
1c86d3b: 8340850: Wrong bug ID listed as reason for skipping SwingNodePlatformExitCrashTest
9c31cb0: 8340005: Eliminate native access calls from javafx.swing

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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.

mlbridge · 2024-10-17T14:57:27Z

Webrevs

01: Full - Incremental (a3523279)
00: Full (5780b280)

kevinrushforth · 2024-10-19T14:56:54Z

Either @arapte or I will review this. I think a single reviewer will be enough, given that the functionality hasn't changed.

kevinrushforth

This looks equivalent to the current code, and I couldn't see anything wrong in my testing. I left a couple questions inline.

kevinrushforth · 2024-10-21T18:16:01Z

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

-        return null;
+    @Override
+    protected PathElement[] getUnderlineShape(int start, int end) {
+        return getTextNode().underlineShape(start, end);


The former code would return null if start > textNode.textProperty().getValueSafe().length(). I think this is OK, given that the implementation of Text::underlineShape checks -- what do you think? This applies to getRangeShape, too.

I think it's ok. The javadoc for TextInputControlSkin::underlineShape() does not specify a null return value.

In fact, the javadoc for Text::rangeShape() and ::underlineShape() say

@return an array of {@code PathElement} which can be used to create a {@code Shape}

implying that it should never be null as the return value is typically used in Shape::getElements().setAll() or .addAll() which will throw an NPE if the thing is null. In fact, Text::rangeShape() (used for underline and range shape) always returns a non-null value.

kevinrushforth · 2024-10-21T18:38:23Z

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

+
+        if (y < contentView.snappedTopInset()) {
+            // Select the character at x in the first row
+            return 0;


I see that the implementation of the now-removed getNextInsertionPoint method also returned 0 unconditionally, so this is equivalent, but... isn't the comment wrong, since x isn't used in this case?

comment is indeed wrong, will fix.

kevinrushforth · 2024-10-21T18:43:22Z

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

+            return 0;
+        } else if (y > contentView.snappedTopInset() + contentView.getHeight()) {
+            // Select the character at x in the last row
+            return (textArea.getLength() - paragraphNode.getText().length());


Same question about the comment being wrong.

andy-goryachev-oracle · 2024-10-22T14:22:57Z

/integrate

openjdk · 2024-10-22T14:24:17Z

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

6ac2dd3: 8336031: Create implementation of NSAccessibilityStaticText protocol
f5b18ad: 8337280: Include jdk.jsobject module with JavaFX
f71c390: 8340003: Bump minimum JDK version for JavaFX to JDK 22
77482de: 8341372: BackgroundPosition, BorderImage, BorderStroke, CornerRadii should be final
1c86d3b: 8340850: Wrong bug ID listed as reason for skipping SwingNodePlatformExitCrashTest
9c31cb0: 8340005: Eliminate native access calls from javafx.swing

Your commit was automatically rebased without conflicts.

openjdk · 2024-10-22T14:24:25Z

@andy-goryachev-oracle Pushed as commit e2a3074.

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

8342462 TextAreaSkin: remove USE_MULTIPLE_NODES

5780b28

openjdk bot changed the title ~~8342462 TextAreaSkin: remove USE_MULTIPLE_NODES~~ 8342462: TextAreaSkin: remove USE_MULTIPLE_NODES Oct 16, 2024

andy-goryachev-oracle marked this pull request as ready for review October 17, 2024 14:53

openjdk bot added the rfr Ready for review label Oct 17, 2024

kevinrushforth approved these changes Oct 21, 2024

View reviewed changes

openjdk bot added the ready Ready to be integrated label Oct 21, 2024

wrong comments

a352327

openjdk bot removed the ready Ready to be integrated label Oct 21, 2024

andy-goryachev-oracle requested a review from kevinrushforth October 21, 2024 20:07

kevinrushforth approved these changes Oct 21, 2024

View reviewed changes

openjdk bot added the ready Ready to be integrated label Oct 21, 2024

openjdk bot added the integrated Pull request has been integrated label Oct 22, 2024

openjdk bot closed this Oct 22, 2024

openjdk bot removed ready Ready to be integrated rfr Ready for review labels Oct 22, 2024

andy-goryachev-oracle deleted the 8342462.text.area.skin.cleanup branch October 22, 2024 14:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8342462: TextAreaSkin: remove USE_MULTIPLE_NODES #1601

8342462: TextAreaSkin: remove USE_MULTIPLE_NODES #1601

andy-goryachev-oracle commented Oct 16, 2024 •

edited by openjdk bot

Loading

bridgekeeper bot commented Oct 16, 2024

openjdk bot commented Oct 16, 2024 •

edited

Loading

mlbridge bot commented Oct 17, 2024 •

edited

Loading

kevinrushforth commented Oct 19, 2024

kevinrushforth left a comment

kevinrushforth Oct 21, 2024

andy-goryachev-oracle Oct 21, 2024

kevinrushforth Oct 21, 2024

andy-goryachev-oracle Oct 21, 2024

kevinrushforth Oct 21, 2024

andy-goryachev-oracle commented Oct 22, 2024

openjdk bot commented Oct 22, 2024

openjdk bot commented Oct 22, 2024

8342462: TextAreaSkin: remove USE_MULTIPLE_NODES #1601

8342462: TextAreaSkin: remove USE_MULTIPLE_NODES #1601

Conversation

andy-goryachev-oracle commented Oct 16, 2024 • edited by openjdk bot Loading

Summary of Changes

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Oct 16, 2024

openjdk bot commented Oct 16, 2024 • edited Loading

mlbridge bot commented Oct 17, 2024 • edited Loading

Webrevs

kevinrushforth commented Oct 19, 2024

kevinrushforth left a comment

Choose a reason for hiding this comment

kevinrushforth Oct 21, 2024

Choose a reason for hiding this comment

andy-goryachev-oracle Oct 21, 2024

Choose a reason for hiding this comment

kevinrushforth Oct 21, 2024

Choose a reason for hiding this comment

andy-goryachev-oracle Oct 21, 2024

Choose a reason for hiding this comment

kevinrushforth Oct 21, 2024

Choose a reason for hiding this comment

andy-goryachev-oracle commented Oct 22, 2024

openjdk bot commented Oct 22, 2024

openjdk bot commented Oct 22, 2024

andy-goryachev-oracle commented Oct 16, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Oct 16, 2024 •

edited

Loading

mlbridge bot commented Oct 17, 2024 •

edited

Loading