8372438: SimpleViewOnlyStyledModel: non-text paragraphs

[andy-goryachev-oracle]

Fixing a bug in SimpleViewOnlyStyledModel.lastParagraph() which breaks adding text segments after a Region-based paragraph.

Test cases:

@Test
public void addTextAfterRegion() {
    SimpleViewOnlyStyledModel m = new SimpleViewOnlyStyledModel();
    m.addParagraph(() -> new Region());
    m.addNodeSegment(() -> new Region());
    assertEquals(2, m.size());
}

@Test
public void addTextAfterRegionAfterText() {
    SimpleViewOnlyStyledModel m = new SimpleViewOnlyStyledModel();
    m.addNodeSegment(() -> new Region());
    m.addParagraph(() -> new Region());
    m.addSegment("text");
    assertEquals(3, m.size());
}

---

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-8372438: SimpleViewOnlyStyledModel: non-text paragraphs (Bug - P4)

Reviewers

• Ziad El Midaoui (@Ziad-Mid - Committer)
• Lukasz Kostyra (@lukostyra - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1983

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

Using diff file

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

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 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]

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

8372438: SimpleViewOnlyStyledModel: non-text paragraphs

Reviewed-by: zelmidaoui, lkostyra

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

• 9e1c70c: 8372761: Prevent degenerate transforms for zero-size Scene/SubScene
• e28c5d2: 8373098: RichTextArea: NPE in InputMethodRequests
• 05d6f54: 8372203: Piecewise linear easing function

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]

Webrevs

• 01: Full - Incremental (d0f1ee64)
• 00: Full (fb24deb1)

[andy-goryachev-oracle]

@Ziad-Mid could you please review this PR?

[Ziad-Mid]

LGTM , the test works with the fix

[andy-goryachev-oracle]

@lukostyra can I trouble you for a review?

[lukostyra]

LGTM

[andy-goryachev-oracle]

Thank you all!
/integrate

[openjdk]

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

• 9e1c70c: 8372761: Prevent degenerate transforms for zero-size Scene/SubScene
• e28c5d2: 8373098: RichTextArea: NPE in InputMethodRequests
• 05d6f54: 8372203: Piecewise linear easing function

Your commit was automatically rebased without conflicts.

[openjdk]

@andy-goryachev-oracle Pushed as commit 03612e1.

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