java9 tweak (#888)

FXMisc · Jan 2, 2020 · 14f9479 · 14f9479
1 parent 725f9d0
commit 14f9479
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/richtextfx/src/main/java9/org/fxmisc/richtext/TextFlowExt.java b/richtextfx/src/main/java9/org/fxmisc/richtext/TextFlowExt.java
@@ -43,9 +43,9 @@ int getLineStartPosition(int charIdx) {
 
     int getLineEndPosition(int charIdx) {
         TwoLevelNavigator navigator = textLayout().getTwoLevelNavigator();
-        int currentLineIndex = navigator.offsetToPosition(charIdx, Forward).getMajor();
-        int minor = (currentLineIndex == getLineCount() - 1) ? 0 : -1;
-        return navigator.position(currentLineIndex + 1, minor).toOffset();
+        int currentLineIndex = navigator.offsetToPosition(charIdx, Forward).getMajor() + 1;
+        int minor = (currentLineIndex == getLineCount()) ? 0 : -1;
+        return navigator.position(currentLineIndex, minor).toOffset();
     }
 
     int getLineOfCharacter(int charIdx) {

diff --git a/richtextfx/src/main/java9/org/fxmisc/richtext/TextFlowLayout.java b/richtextfx/src/main/java9/org/fxmisc/richtext/TextFlowLayout.java
@@ -66,7 +66,8 @@ TwoLevelNavigator getTwoLevelNavigator() {
     int getLineCount() {
 
         if ( lineCount > -1 ) return lineCount;
-
+
+        lineCount = 0;
         lineMetrics.clear();
         double totLines = 0.0, prevMinY = 1.0, prevMaxY = -1.0;
         int totCharSoFar = 0;