Merge pull request #617 from JFormDesigner/createStyledTextNode-cleanup

moved ParagraphText specific code from createStyledTextNode() methods to class ParagraphText

Author: JordanMartinez

richtextfx-demos/src/main/java/org/fxmisc/richtext/demo/hyperlink/TextHyperlinkArea.java

@@ -62,10 +62,6 @@ public static TextExt createStyledTextNode(Consumer<TextExt> applySegment) {
         TextExt t = new TextExt();
         t.setTextOrigin(VPos.TOP);
         applySegment.accept(t);
-
-        // XXX: binding selectionFill to textFill,
-        // see the note at highlightTextFill
-        t.impl_selectionFillProperty().bind(t.fillProperty());
         return t;
     }
 }

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

@@ -112,7 +112,15 @@ public ObjectProperty<Paint> highlightTextFillProperty() {
 //        });
 
         // populate with text nodes
-        par.getStyledSegments().stream().map(nodeFactory).forEach(getChildren()::add);
+        par.getStyledSegments().stream().map(nodeFactory).forEach(n -> {
+            if (n instanceof TextExt) {
+                TextExt t = (TextExt) n;
+                // XXX: binding selectionFill to textFill,
+                // see the note at highlightTextFill
+                t.impl_selectionFillProperty().bind(t.fillProperty());
+            }
+            getChildren().add(n);
+        });
 
         // set up custom css shape helpers
         Supplier<Path> createBackgroundShape = () -> {
@@ -406,8 +414,8 @@ private void updateSharedShapeRange(T value, int start, int end) {
                 T lastShapeValue = lastShapeValueRange._1;
 
                 // calculate smallest possible position which is consecutive to the given start position
-                final int prevEndNext = lastShapeValueRange.get2().getEnd() + 1;  
-                if (start <= prevEndNext &&         // Consecutive? 
+                final int prevEndNext = lastShapeValueRange.get2().getEnd() + 1;
+                if (start <= prevEndNext &&         // Consecutive?
                     lastShapeValue.equals(value)) { // Same style?
 
                     IndexRange lastRange = lastShapeValueRange._2;

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

@@ -130,10 +130,6 @@ public static <S> Node createStyledTextNode(String text, S style,
         t.setTextOrigin(VPos.TOP);
         t.getStyleClass().add("text");
         applyStyle.accept(t, style);
-
-        // XXX: binding selectionFill to textFill,
-        // see the note at highlightTextFill
-        t.impl_selectionFillProperty().bind(t.fillProperty());
         return t;
     }
 }