Updated to match API changes

Author: Jugen

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

@@ -37,20 +37,20 @@ int getLineCount() {
     }
 
     int getLineStartPosition(int charIdx) {
-        return textLayout().getTextLine( getLineOfCharacter(charIdx) ).getStart();
+        return textLayout().getTextLine( getLineOfCharacter(charIdx), false ).start();
     }
 
     int getLineEndPosition(int charIdx) {
         int line = getLineOfCharacter( charIdx );
-        int end = textLayout().getTextLine( line ).getEnd();
+        int end = textLayout().getTextLine( line, false ).end();
         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.getTextLine( l ).getEnd() )
+                .filter( l -> charIdx < layout.getTextLine( l, false ).end() )
                 .findFirst().orElse( Math.max(0,getLineCount()-1) );
     }
 
@@ -154,22 +154,22 @@ PathElement[] getUnderlineShape(int from, int to, double offset, double waveRadi
     }
 
     CharacterHit hitLine(double x, int lineIndex) {
-        Rectangle2D r = textLayout().getTextLine( lineIndex ).getBounds();
+        Rectangle2D r = textLayout().getTextLine( lineIndex, false ).bounds();
         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.getTextLine( l ).getBounds().getMaxY() )
+                    .filter( l -> y < layout.getTextLine( l, true ).bounds().getMaxY() )
                     .findFirst().orElse( Math.max(0,getLineCount()-1) );
         return hit( x, y, line );
     }
 
     CharacterHit hit(double x, double y, int line) {
 
-        Rectangle2D lineBounds = textLayout().getTextLine( line ).getBounds();
+        Rectangle2D lineBounds = textLayout().getTextLine( line, false ).bounds();
         HitInfo hit = hitTest(new Point2D(x, y));
         int charIdx = hit.getCharIndex();
         boolean leading = hit.isLeading();
@@ -181,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().getTextLine( line ).getEnd());
+            leading = (getLineOfCharacter(charIdx) + 1 < getLineCount() && charIdx + 1 >= textLayout().getTextLine( line, false ).end());
         }
 
         if(x < lineBounds.getMinX() || x > lineBounds.getMaxX()) {

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

@@ -42,11 +42,11 @@ float getLineCenter( int lineNo ) {
 
     @Deprecated
     int getLineLength( int lineNo ) {
-        return getTextLine( lineNo ).getLength();
+        return getTextLine( lineNo, false ).length();
     }
 
 
-    TextFlowSpan getLineSpan( int lineNo ) {
+    TextFlowSpan getTextLine( int lineNo, boolean includeLineSpacing ) {
         return (lineNo >= 0 && getTextLineCount() > 0) ? lineMetrics.get( lineNo ) : EMPTY_SPAN;
     }
 
@@ -55,7 +55,7 @@ TextFlowSpan getLineSpan( int lineNo ) {
     TextFlowSpan getLineSpan( float y ) {
         final int lastLine = getTextLineCount();
         if ( lastLine < 1 ) return EMPTY_SPAN;
-        return lineMetrics.stream().filter( tfs -> y < tfs.getBounds().getMaxY() )
+        return lineMetrics.stream().filter( tfs -> y < tfs.bounds().getMaxY() )
                 .findFirst().orElse( lineMetrics.get( Math.max(0,lastLine-1) ) );
     }
 
@@ -143,7 +143,7 @@ else if ( nodeMinY >= prevMaxY ) {                                // Node is on
     private void adjustLineMetrics( int length, double width, double height ) {
         TextFlowSpan span = lineMetrics.get( lineMetrics.size()-1 );
         span.addLengthAndWidth( length, width );
-        if ( height > span.getHeight() ) {
+        if ( height > span.height() ) {
             span.setHeight( height );
         }
     }

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

@@ -19,22 +19,22 @@ class TextFlowSpan
         y = minY;
     }
 
-    Rectangle2D getBounds() {
+    Rectangle2D bounds() {
         if ( bounds == null ) {
             bounds = new Rectangle2D( 0, y, width, height );
         }
         return bounds;
     }
 
-    float getCenterY() {
+    float centerY() {
         return (float) (y + height / 2);
     }
 
-    int getStart()  { return start; }
-    int getLength() { return length; }
-    int getEnd()    { return start + length; }
-    double getHeight() { return height; }
-    double getWidth() { return width; }
+    int start()  { return start; }
+    int length() { return length; }
+    int end()    { return start + length; }
+    double height() { return height; }
+    double width() { return width; }
 
     void setHeight( double h ) { height = h; bounds = null; }