Integrate new Caret / Selection API into GenericStyledArea

Author: JordanMartinez

richtextfx/src/integrationTest/java/org/fxmisc/richtext/view/MiscellaneousAPITests.java

@@ -6,8 +6,8 @@
 import javafx.geometry.Point2D;
 import javafx.geometry.Pos;
 import javafx.stage.Stage;
+import org.fxmisc.richtext.Caret;
 import org.fxmisc.richtext.InlineCssTextAreaAppTest;
-import org.fxmisc.richtext.ViewActions.CaretVisibility;
 import org.fxmisc.richtext.model.NavigationActions;
 import org.junit.Before;
 import org.junit.Test;
@@ -83,7 +83,7 @@ public void start(Stage stage) throws Exception {
             super.start(stage);
 
             // insure caret is always visible
-            area.setShowCaret(CaretVisibility.ON);
+            area.setShowCaret(Caret.CaretVisibility.ON);
 
             StringBuilder sb = new StringBuilder();
             for (int i = 0; i < 50; i++) {

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

@@ -81,6 +81,10 @@ public class BoundedSelectionImpl implements BoundedSelection {
 
     private Subscription subscription = () -> {};
 
+    BoundedSelectionImpl(GenericStyledArea<?, ?, ?> area) {
+        this(area, area.getMainCaret());
+    }
+
     BoundedSelectionImpl(GenericStyledArea<?, ?, ?> area, Caret caret) {
         this(area, caret, new IndexRange(0, 0));
     }

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

@@ -35,6 +35,15 @@
  */
 public interface Caret {
 
+    public static enum CaretVisibility {
+        /** Caret is displayed. */
+        ON,
+        /** Caret is displayed when area is focused, enabled, and editable. */
+        AUTO,
+        /** Caret is not displayed. */
+        OFF
+    }
+
     /** The position of the caret within the text */
     public ObservableValue<Integer> positionProperty();
     public int getPosition();
@@ -53,11 +62,11 @@ public interface Caret {
 
     /**
      * Whether to display the caret or not. Default value is
-     * {@link org.fxmisc.richtext.ViewActions.CaretVisibility#AUTO}.
+     * {@link CaretVisibility#AUTO}.
      */
-    public Var<GenericStyledArea.CaretVisibility> showCaretProperty();
-    public GenericStyledArea.CaretVisibility getShowCaret();
-    public void setShowCaret(GenericStyledArea.CaretVisibility value);
+    public Var<CaretVisibility> showCaretProperty();
+    public CaretVisibility getShowCaret();
+    public void setShowCaret(CaretVisibility value);
 
     /** Whether the caret is being shown in the viewport */
     public ObservableValue<Boolean> visibleProperty();

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

@@ -44,10 +44,10 @@ final class CaretImpl implements Caret {
     @Override public final int getColumnPosition() { return columnPosition.getValue(); }
     @Override public final ObservableValue<Integer> columnPositionProperty() { return columnPosition; }
 
-    private final Var<GenericStyledArea.CaretVisibility> showCaret = Var.newSimpleVar(GenericStyledArea.CaretVisibility.AUTO);
-    @Override public final GenericStyledArea.CaretVisibility getShowCaret() { return showCaret.getValue(); }
-    @Override public final void setShowCaret(GenericStyledArea.CaretVisibility value) { showCaret.setValue(value); }
-    @Override public final Var<GenericStyledArea.CaretVisibility> showCaretProperty() { return showCaret; }
+    private final Var<CaretVisibility> showCaret = Var.newSimpleVar(CaretVisibility.AUTO);
+    @Override public final CaretVisibility getShowCaret() { return showCaret.getValue(); }
+    @Override public final void setShowCaret(CaretVisibility value) { showCaret.setValue(value); }
+    @Override public final Var<CaretVisibility> showCaretProperty() { return showCaret; }
 
     private final Binding<Boolean> visible;
     @Override public final boolean isVisible() { return visible.getValue(); }