Merge pull request #631 from JordanMartinez/cleanup

Insure all public methods are overridden in interface; move interfaces to view package
FXMisc · Oct 27, 2017 · ac8f751 · ac8f751
2 parents c41ea98 + 1e550d9
commit ac8f751
Show file tree

Hide file tree

Showing 26 changed files with 337 additions and 138 deletions.
diff --git a/richtextfx-demos/src/main/java/org/fxmisc/richtext/demo/TooltipDemo.java b/richtextfx-demos/src/main/java/org/fxmisc/richtext/demo/TooltipDemo.java
@@ -9,7 +9,7 @@
 import javafx.stage.Popup;
 import javafx.stage.Stage;
 
-import org.fxmisc.richtext.MouseOverTextEvent;
+import org.fxmisc.richtext.event.MouseOverTextEvent;
 import org.fxmisc.richtext.StyleClassedTextArea;
 
 public class TooltipDemo extends Application {

diff --git a/richtextfx/src/integrationTest/java/org/fxmisc/richtext/api/HitTests.java b/richtextfx/src/integrationTest/java/org/fxmisc/richtext/api/HitTests.java
@@ -7,7 +7,7 @@
 import javafx.geometry.Pos;
 import javafx.stage.Stage;
 import org.fxmisc.richtext.InlineCssTextAreaAppTest;
-import org.fxmisc.richtext.model.NavigationActions;
+import org.fxmisc.richtext.NavigationActions;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/richtextfx/src/integrationTest/java/org/fxmisc/richtext/api/MouseOverTextDelayTests.java b/richtextfx/src/integrationTest/java/org/fxmisc/richtext/api/MouseOverTextDelayTests.java
@@ -4,7 +4,7 @@
 import javafx.geometry.Pos;
 import javafx.stage.Stage;
 import org.fxmisc.richtext.InlineCssTextAreaAppTest;
-import org.fxmisc.richtext.MouseOverTextEvent;
+import org.fxmisc.richtext.event.MouseOverTextEvent;
 import org.junit.Ignore;
 import org.junit.Test;
 

diff --git a/richtextfx/src/integrationTest/java/org/fxmisc/richtext/keyboard/DeletionTests.java b/richtextfx/src/integrationTest/java/org/fxmisc/richtext/keyboard/DeletionTests.java
@@ -10,7 +10,7 @@
 import static javafx.scene.input.KeyCode.BACK_SPACE;
 import static javafx.scene.input.KeyCode.DELETE;
 import static javafx.scene.input.KeyCode.SHORTCUT;
-import static org.fxmisc.richtext.model.NavigationActions.SelectionPolicy.CLEAR;
+import static org.fxmisc.richtext.NavigationActions.SelectionPolicy.CLEAR;
 import static org.junit.Assert.assertEquals;
 
 @RunWith(NestedRunner.class)

diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/Caret.java b/richtextfx/src/main/java/org/fxmisc/richtext/Caret.java
@@ -125,7 +125,7 @@ public static enum CaretVisibility {
      * This method can be used to achieve the special case of positioning the caret outside or inside the selection,
      * as opposed to always being at the boundary. Use with care.
      *
-     * <p><b>Caution:</b> see {@link org.fxmisc.richtext.model.TextEditingArea#getAbsolutePosition(int, int)} to
+     * <p><b>Caution:</b> see {@link TextEditingArea#getAbsolutePosition(int, int)} to
      * know how the column index argument can affect the returned position.</p>
      */
     public void moveTo(int paragraphIndex, int columnPosition);

diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/CaretSelectionBind.java b/richtextfx/src/main/java/org/fxmisc/richtext/CaretSelectionBind.java
@@ -2,7 +2,6 @@
 
 import javafx.beans.value.ObservableValue;
 import javafx.scene.control.IndexRange;
-import org.fxmisc.richtext.model.NavigationActions;
 import org.fxmisc.richtext.model.StyledDocument;
 
 import java.text.BreakIterator;
@@ -103,7 +102,7 @@ default void moveTo(int position) {
 
     /**
      * Moves the caret to the position returned from
-     * {@link org.fxmisc.richtext.model.TextEditingArea#getAbsolutePosition(int, int)}
+     * {@link TextEditingArea#getAbsolutePosition(int, int)}
      * and clears any selection.
      */
     @Override
@@ -176,7 +175,7 @@ default void moveToNextChar() {
      * Selects the given range and moves the caret to either the start of the new selection if the anchor was equal to
      * the original start or the end if the anchor was equal to the original end
      *
-     * <p><b>Caution:</b> see {@link org.fxmisc.richtext.model.TextEditingArea#getAbsolutePosition(int, int)} to
+     * <p><b>Caution:</b> see {@link TextEditingArea#getAbsolutePosition(int, int)} to
      * know how the column index argument can affect the returned position.</p>
      */
     @Override
@@ -292,7 +291,7 @@ else if(pos >= sel.getEnd())
 
     /**
      * Moves the caret to the position returned from
-     * {@link org.fxmisc.richtext.model.TextEditingArea#getAbsolutePosition(int, int)}.
+     * {@link TextEditingArea#getAbsolutePosition(int, int)}.
      */
     void moveTo(int paragraphIndex, int columnIndex, NavigationActions.SelectionPolicy selectionPolicy);
 

diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/CaretSelectionBindImpl.java b/richtextfx/src/main/java/org/fxmisc/richtext/CaretSelectionBindImpl.java
@@ -3,7 +3,6 @@
 import javafx.beans.value.ObservableValue;
 import javafx.geometry.Bounds;
 import javafx.scene.control.IndexRange;
-import org.fxmisc.richtext.model.NavigationActions;
 import org.fxmisc.richtext.model.StyledDocument;
 import org.reactfx.Subscription;
 import org.reactfx.Suspendable;

diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/ClipboardActions.java b/richtextfx/src/main/java/org/fxmisc/richtext/ClipboardActions.java
@@ -15,12 +15,10 @@
 import javafx.scene.input.DataFormat;
 
 import org.fxmisc.richtext.model.Codec;
-import org.fxmisc.richtext.model.EditActions;
 import org.fxmisc.richtext.model.ReadOnlyStyledDocument;
 import org.fxmisc.richtext.model.SegmentOps;
 import org.fxmisc.richtext.model.StyledDocument;
 import org.fxmisc.richtext.model.StyledSegment;
-import org.fxmisc.richtext.model.TextEditingArea;
 import org.reactfx.util.Tuple2;
 
 /**

diff --git a/...rg/fxmisc/richtext/model/EditActions.java → ...java/org/fxmisc/richtext/EditActions.java b/...rg/fxmisc/richtext/model/EditActions.java → ...java/org/fxmisc/richtext/EditActions.java
@@ -1,7 +1,7 @@
-package org.fxmisc.richtext.model;
+package org.fxmisc.richtext;
 
 import javafx.scene.control.IndexRange;
-import org.fxmisc.richtext.GenericStyledArea;
+import org.fxmisc.richtext.model.StyledDocument;
 
 /**
  * Specifies actions for editing the content of a {@link TextEditingArea}.