Refactored for updated API

Author: Jugen

richtextfx/src/main/java/org/fxmisc/richtext/TextFlowExt.java

@@ -21,7 +21,7 @@ class TextFlowExt extends TextFlow {
     /*
      * Rename to getLayoutInfo() and delete once JavaFX
      * [PR1596](https://github.com/openjdk/jfx/pull/1596)
-     * is integrated and released. Also delete 
+     * is integrated and released. Also delete
      * TextFlowLayout and TextFlowSpan.
      */
     private TextFlowLayout textLayout()
@@ -37,17 +37,20 @@ int getLineCount() {
     }
 
     int getLineStartPosition(int charIdx) {
-        return textLayout().getTextLineStart( getLineOfCharacter(charIdx) );
+        return textLayout().getTextLine( getLineOfCharacter(charIdx) ).getStart();
     }
 
     int getLineEndPosition(int charIdx) {
-        return textLayout().getTextLineEnd( getLineOfCharacter(charIdx) );
+        int line = getLineOfCharacter( charIdx );
+        int end = textLayout().getTextLine( line ).getEnd();
+        if ( line < (getLineCount() - 1) ) end--; // trailing space
+        return end;
     }
 
     int getLineOfCharacter(int charIdx) {
         var layout = textLayout();
         return IntStream.range( 0, getLineCount() )
-                .filter( l -> charIdx <= layout.getTextLineEnd( l ) )
+                .filter( l -> charIdx < layout.getTextLine( l ).getEnd() )
                 .findFirst().orElse( Math.max(0,getLineCount()-1) );
     }
 
@@ -151,22 +154,22 @@ PathElement[] getUnderlineShape(int from, int to, double offset, double waveRadi
     }
 
     CharacterHit hitLine(double x, int lineIndex) {
-        Rectangle2D r = textLayout().getLineBounds( lineIndex );
+        Rectangle2D r = textLayout().getTextLine( lineIndex ).getBounds();
         double y = r.getMinY() + r.getHeight() / 2.0;
         return hit( x, y, lineIndex );
     }
 
     CharacterHit hit(double x, double y) {
         var layout = textLayout();
         int line = IntStream.range( 0, getLineCount() )
-                    .filter( l -> y < layout.getLineBounds( l ).getMaxY() )
+                    .filter( l -> y < layout.getTextLine( l ).getBounds().getMaxY() )
                     .findFirst().orElse( Math.max(0,getLineCount()-1) );
         return hit( x, y, line );
     }
 
     CharacterHit hit(double x, double y, int line) {
 
-        Rectangle2D lineBounds = textLayout().getLineBounds( line );
+        Rectangle2D lineBounds = textLayout().getTextLine( line ).getBounds();
         HitInfo hit = hitTest(new Point2D(x, y));
         int charIdx = hit.getCharIndex();
         boolean leading = hit.isLeading();
@@ -178,7 +181,7 @@ CharacterHit hit(double x, double y, int line) {
         if ( ! leading && getLineCount() > 1) {
             // If this is a wrapped paragraph and hit character is at end of hit line, make sure that the
             // "character hit" stays at the end of the hit line (and not at the beginning of the next line).
-            leading = (getLineOfCharacter(charIdx) + 1 < getLineCount() && charIdx + 1 >= textLayout().getTextLineEnd( line ));
+            leading = (getLineOfCharacter(charIdx) + 1 < getLineCount() && charIdx + 1 >= textLayout().getTextLine( line ).getEnd());
         }
 
         if(x < lineBounds.getMinX() || x > lineBounds.getMaxX()) {

richtextfx/src/main/java/org/fxmisc/richtext/TextFlowLayout.java

@@ -8,7 +8,6 @@
 import javafx.beans.Observable;
 import javafx.geometry.Bounds;
 import javafx.geometry.Point2D;
-import javafx.geometry.Rectangle2D;
 import javafx.scene.Node;
 import javafx.scene.shape.LineTo;
 import javafx.scene.shape.MoveTo;
@@ -43,7 +42,7 @@ float getLineCenter( int lineNo ) {
 
     @Deprecated
     int getLineLength( int lineNo ) {
-        return getLineSpan( lineNo ).getLength();
+        return getTextLine( lineNo ).getLength();
     }
 
 
@@ -67,22 +66,6 @@ TwoLevelNavigator getTwoLevelNavigator() {
     }
 
 
-    Rectangle2D getLineBounds( int line ) {
-        return getLineSpan( line ).getBounds();
-    }
-
-    int getTextLineStart( int line ) {
-        return getLineSpan( line ).getStart();
-    }
-
-    int getTextLineEnd( int line ) {
-        TextFlowSpan span = getLineSpan( line );
-        int end = span.getStart() + span.getLength();
-        if ( line < (getTextLineCount() - 1) ) end--;
-        return end;
-    }
-
-
     /*
      * Iterate through the nodes in the TextFlow to determine the number of lines of text.
      * Also calculates the following metrics for each line along the way: line height,

richtextfx/src/main/java/org/fxmisc/richtext/TextFlowSpan.java

@@ -32,6 +32,7 @@ float getCenterY() {
 
     int getStart()  { return start; }
     int getLength() { return length; }
+    int getEnd()    { return start + length; }
     double getHeight() { return height; }
     double getWidth() { return width; }