Merge pull request #313 from afester/modelPackage

Move model classes to model package

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

@@ -13,8 +13,8 @@
 import org.fxmisc.flowless.VirtualizedScrollPane;
 import org.fxmisc.richtext.CodeArea;
 import org.fxmisc.richtext.LineNumberFactory;
-import org.fxmisc.richtext.StyleSpans;
-import org.fxmisc.richtext.StyleSpansBuilder;
+import org.fxmisc.richtext.model.StyleSpans;
+import org.fxmisc.richtext.model.StyleSpansBuilder;
 
 public class JavaKeywords extends Application {
 

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

@@ -18,8 +18,8 @@
 import org.fxmisc.flowless.VirtualizedScrollPane;
 import org.fxmisc.richtext.CodeArea;
 import org.fxmisc.richtext.LineNumberFactory;
-import org.fxmisc.richtext.StyleSpans;
-import org.fxmisc.richtext.StyleSpansBuilder;
+import org.fxmisc.richtext.model.StyleSpans;
+import org.fxmisc.richtext.model.StyleSpansBuilder;
 
 public class JavaKeywordsAsync extends Application {
 

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

@@ -12,8 +12,8 @@
 
 import org.fxmisc.flowless.VirtualizedScrollPane;
 import org.fxmisc.richtext.StyleClassedTextArea;
-import org.fxmisc.richtext.StyleSpans;
-import org.fxmisc.richtext.StyleSpansBuilder;
+import org.fxmisc.richtext.model.StyleSpans;
+import org.fxmisc.richtext.model.StyleSpansBuilder;
 
 import javafx.application.Application;
 import javafx.scene.Scene;

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

@@ -8,8 +8,8 @@
 import org.fxmisc.flowless.VirtualizedScrollPane;
 import org.fxmisc.richtext.CodeArea;
 import org.fxmisc.richtext.LineNumberFactory;
-import org.fxmisc.richtext.StyleSpans;
-import org.fxmisc.richtext.StyleSpansBuilder;
+import org.fxmisc.richtext.model.StyleSpans;
+import org.fxmisc.richtext.model.StyleSpansBuilder;
 
 import javafx.application.Application;
 import javafx.scene.Scene;

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

@@ -11,7 +11,7 @@
 import javafx.scene.paint.Color;
 import javafx.scene.text.TextAlignment;
 
-import org.fxmisc.richtext.Codec;
+import org.fxmisc.richtext.model.Codec;
 
 /**
  * Holds information about the style of a paragraph.

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

@@ -6,7 +6,7 @@
 
 package org.fxmisc.richtext.demo.richtext;
 
-import static org.fxmisc.richtext.TwoDimensional.Bias.*;
+import static org.fxmisc.richtext.model.TwoDimensional.Bias.*;
 
 import java.util.List;
 import java.util.Optional;
@@ -34,9 +34,9 @@
 import javafx.stage.Stage;
 
 import org.fxmisc.flowless.VirtualizedScrollPane;
-import org.fxmisc.richtext.Paragraph;
-import org.fxmisc.richtext.StyleSpans;
 import org.fxmisc.richtext.StyledTextArea;
+import org.fxmisc.richtext.model.Paragraph;
+import org.fxmisc.richtext.model.StyleSpans;
 import org.reactfx.SuspendableNo;
 
 public class RichText extends Application {

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

@@ -11,7 +11,7 @@
 
 import javafx.scene.paint.Color;
 
-import org.fxmisc.richtext.Codec;
+import org.fxmisc.richtext.model.Codec;
 
 /**
  * Holds information about the style of a text fragment.

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

@@ -14,6 +14,11 @@
 import javafx.scene.input.ClipboardContent;
 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.StyledDocument;
+import org.fxmisc.richtext.model.TextEditingArea;
 import org.reactfx.util.Tuple2;
 
 /**

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

@@ -3,6 +3,8 @@
 
 import java.util.Collection;
 
+import org.fxmisc.richtext.model.EditableStyledDocument;
+
 /**
  * A convenience subclass of {@link StyleClassedTextArea}
  * with fixed-width font and an undo manager that observes

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

@@ -1,6 +1,10 @@
 package org.fxmisc.richtext;
 
 
+import org.fxmisc.richtext.model.Codec;
+import org.fxmisc.richtext.model.EditableStyledDocument;
+import org.fxmisc.richtext.model.SimpleEditableStyledDocument;
+
 import javafx.scene.text.TextFlow;
 
 /**

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

@@ -22,8 +22,9 @@
 import javafx.scene.control.IndexRange;
 import javafx.scene.layout.Region;
 import javafx.scene.paint.Paint;
-
 import javafx.scene.text.TextFlow;
+
+import org.fxmisc.richtext.model.Paragraph;
 import org.fxmisc.richtext.util.MouseStationaryHelper;
 import org.reactfx.EventStream;
 import org.reactfx.util.Either;

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

@@ -19,6 +19,8 @@
 import javafx.scene.shape.PathElement;
 import javafx.scene.shape.StrokeLineCap;
 
+import org.fxmisc.richtext.model.Paragraph;
+import org.fxmisc.richtext.model.StyledText;
 import org.reactfx.value.Val;
 import org.reactfx.value.Var;
 

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

@@ -3,6 +3,10 @@
 import java.util.Collection;
 import java.util.Collections;
 
+import org.fxmisc.richtext.model.Codec;
+import org.fxmisc.richtext.model.EditableStyledDocument;
+import org.fxmisc.richtext.model.SimpleEditableStyledDocument;
+
 /**
  * Text area that uses style classes to define style of text segments and paragraph segments.
  */
@@ -17,8 +21,8 @@ public StyleClassedTextArea(EditableStyledDocument<Collection<String>, Collectio
         );
 
         setStyleCodecs(
-                SuperCodec.upCast(SuperCodec.collectionListCodec(Codec.STRING_CODEC)),
-                SuperCodec.upCast(SuperCodec.collectionListCodec(Codec.STRING_CODEC))
+                Codec.collectionCodec(Codec.STRING_CODEC),
+                Codec.collectionCodec(Codec.STRING_CODEC)
         );
     }
     public StyleClassedTextArea(boolean preserveStyle) {

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

@@ -53,6 +53,21 @@
 import org.fxmisc.flowless.Virtualized;
 import org.fxmisc.flowless.VirtualizedScrollPane;
 import org.fxmisc.richtext.CssProperties.EditableProperty;
+import org.fxmisc.richtext.model.Codec;
+import org.fxmisc.richtext.model.EditActions;
+import org.fxmisc.richtext.model.EditableStyledDocument;
+import org.fxmisc.richtext.model.NavigationActions;
+import org.fxmisc.richtext.model.SimpleEditableStyledDocument;
+import org.fxmisc.richtext.model.Paragraph;
+import org.fxmisc.richtext.model.PlainTextChange;
+import org.fxmisc.richtext.model.RichTextChange;
+import org.fxmisc.richtext.model.StyleSpans;
+import org.fxmisc.richtext.model.StyledDocument;
+import org.fxmisc.richtext.model.StyledTextAreaModel;
+import org.fxmisc.richtext.model.TextEditingArea;
+import org.fxmisc.richtext.model.TwoDimensional;
+import org.fxmisc.richtext.model.TwoLevelNavigator;
+import org.fxmisc.richtext.model.UndoActions;
 import org.fxmisc.undo.UndoManager;
 import org.fxmisc.undo.UndoManagerFactory;
 import org.reactfx.EventStream;

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

@@ -2,7 +2,7 @@
 
 import static javafx.scene.input.KeyCode.*;
 import static javafx.scene.input.KeyCombination.*;
-import static org.fxmisc.richtext.TwoDimensional.Bias.*;
+import static org.fxmisc.richtext.model.TwoDimensional.Bias.*;
 import static org.fxmisc.wellbehaved.event.EventPattern.*;
 import static org.fxmisc.wellbehaved.event.template.InputMapTemplate.consume;
 import static org.fxmisc.wellbehaved.event.template.InputMapTemplate.sequence;
@@ -20,12 +20,12 @@
 import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
 
-import org.fxmisc.richtext.NavigationActions.SelectionPolicy;
-import org.fxmisc.richtext.TwoDimensional.Position;
+import org.fxmisc.richtext.model.StyledTextAreaModel;
+import org.fxmisc.richtext.model.NavigationActions.SelectionPolicy;
+import org.fxmisc.richtext.model.TwoDimensional.Position;
 import org.fxmisc.richtext.ParagraphBox.CaretOffsetX;
 import org.fxmisc.wellbehaved.event.EventPattern;
 import org.fxmisc.wellbehaved.event.template.InputMapTemplate;
-
 import org.reactfx.EventStream;
 import org.reactfx.Subscription;
 import org.reactfx.value.Val;

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

@@ -1,12 +1,14 @@
 package org.fxmisc.richtext;
 
-import static org.fxmisc.richtext.TwoDimensional.Bias.*;
+import static org.fxmisc.richtext.model.TwoDimensional.Bias.*;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.fxmisc.richtext.model.TwoLevelNavigator;
+
 import javafx.scene.shape.PathElement;
 import javafx.scene.text.TextFlow;
 import javafx.scene.shape.LineTo;

richtextfx/src/main/java/org/fxmisc/richtext/Codec.java → richtextfx/src/main/java/org/fxmisc/richtext/model/Codec.java

@@ -1,9 +1,8 @@
-package org.fxmisc.richtext;
+package org.fxmisc.richtext.model;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
@@ -66,6 +65,10 @@ static <T> Codec<List<T>> listCodec(Codec<T> elemCodec) {
         return SuperCodec.collectionListCodec(elemCodec);
     }
 
+    static <T> Codec<Collection<T>> collectionCodec(Codec<T> elemCodec) {
+        return SuperCodec.upCast(SuperCodec.collectionListCodec(elemCodec));
+    }
+
     static <T> Codec<Optional<T>> optionalCodec(Codec<T> elemCodec) {
         return new Codec<Optional<T>>() {
 
@@ -115,47 +118,4 @@ public E decode(DataInputStream is) throws IOException {
 
         };
     }
-}
-
-interface SuperCodec<S, T extends S> extends Codec<T> {
-    void encodeSuper(DataOutputStream os, S s) throws IOException;
-
-    @Override
-    default void encode(DataOutputStream os, T t) throws IOException {
-        encodeSuper(os, t);
-    }
-
-    @SuppressWarnings("unchecked")
-    static <S, U extends S, T extends U> SuperCodec<S, U> upCast(SuperCodec<S, T> sc) {
-        return (SuperCodec<S, U>) sc;
-    }
-
-    static <T> SuperCodec<Collection<T>, List<T>> collectionListCodec(Codec<T> elemCodec) {
-        return new SuperCodec<Collection<T>, List<T>>() {
-
-            @Override
-            public String getName() {
-                return "list<" + elemCodec.getName() + ">";
-            }
-
-            @Override
-            public void encodeSuper(DataOutputStream os, Collection<T> col) throws IOException {
-                os.writeInt(col.size());
-                for(T t: col) {
-                    elemCodec.encode(os, t);
-                }
-            }
-
-            @Override
-            public List<T> decode(DataInputStream is) throws IOException {
-                int size = is.readInt();
-                List<T> elems = new ArrayList<>(size);
-                for(int i = 0; i < size; ++i) {
-                    T t = elemCodec.decode(is);
-                    elems.add(t);
-                }
-                return elems;
-            }
-        };
-    }
 }

richtextfx/src/main/java/org/fxmisc/richtext/EditActions.java → richtextfx/src/main/java/org/fxmisc/richtext/model/EditActions.java

@@ -1,4 +1,4 @@
-package org.fxmisc.richtext;
+package org.fxmisc.richtext.model;
 
 import javafx.scene.control.IndexRange;
 

richtextfx/src/main/java/org/fxmisc/richtext/EditableStyledDocument.java → richtextfx/src/main/java/org/fxmisc/richtext/model/EditableStyledDocument.java

@@ -1,4 +1,4 @@
-package org.fxmisc.richtext;
+package org.fxmisc.richtext.model;
 
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ObservableList;
@@ -8,7 +8,7 @@
 import org.reactfx.value.Val;
 
 /**
- * Content model for {@link StyledTextArea}. Implements edit operations
+ * Content model for {@link org.fxmisc.richtext.StyledTextArea}. Implements edit operations
  * on styled text, but not worrying about additional aspects such as
  * caret or selection, which are handled by {@link StyledTextAreaModel}.
  */

richtextfx/src/main/java/org/fxmisc/richtext/NavigationActions.java → richtextfx/src/main/java/org/fxmisc/richtext/model/NavigationActions.java

@@ -1,4 +1,4 @@
-package org.fxmisc.richtext;
+package org.fxmisc.richtext.model;
 
 import java.text.BreakIterator;
 

richtextfx/src/main/java/org/fxmisc/richtext/Paragraph.java → richtextfx/src/main/java/org/fxmisc/richtext/model/Paragraph.java

@@ -1,6 +1,6 @@
-package org.fxmisc.richtext;
+package org.fxmisc.richtext.model;
 
-import static org.fxmisc.richtext.TwoDimensional.Bias.*;
+import static org.fxmisc.richtext.model.TwoDimensional.Bias.*;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -9,7 +9,7 @@
 
 import javafx.scene.control.IndexRange;
 
-import org.fxmisc.richtext.TwoDimensional.Position;
+import org.fxmisc.richtext.model.TwoDimensional.Position;
 
 public final class Paragraph<PS, S> {
 

richtextfx/src/main/java/org/fxmisc/richtext/PlainTextChange.java → richtextfx/src/main/java/org/fxmisc/richtext/model/PlainTextChange.java

@@ -1,4 +1,4 @@
-package org.fxmisc.richtext;
+package org.fxmisc.richtext.model;
 
 
 public class PlainTextChange extends TextChange<String, PlainTextChange> {

richtextfx/src/main/java/org/fxmisc/richtext/ReadOnlyStyledDocument.java → richtextfx/src/main/java/org/fxmisc/richtext/model/ReadOnlyStyledDocument.java

@@ -1,4 +1,4 @@
-package org.fxmisc.richtext;
+package org.fxmisc.richtext.model;
 
 import static org.reactfx.util.Either.*;
 import static org.reactfx.util.Tuples.*;
@@ -94,7 +94,7 @@ public static <PS, S> ReadOnlyStyledDocument<PS, S> from(StyledDocument<PS, S> d
         }
     }
 
-    static <PS, S> Codec<StyledDocument<PS, S>> codec(Codec<PS> pCodec, Codec<S> tCodec) {
+    public static <PS, S> Codec<StyledDocument<PS, S>> codec(Codec<PS> pCodec, Codec<S> tCodec) {
         return new Codec<StyledDocument<PS, S>>() {
             private final Codec<List<Paragraph<PS, S>>> codec = Codec.listCodec(paragraphCodec(pCodec, tCodec));
 
@@ -264,7 +264,7 @@ public StyledDocument<PS, S> subSequence(int start, int end) {
         return split(end)._1.split(start)._2;
     }
 
-    Tuple3<ReadOnlyStyledDocument<PS, S>, RichTextChange<PS, S>, MaterializedListModification<Paragraph<PS, S>>> replace(
+    public Tuple3<ReadOnlyStyledDocument<PS, S>, RichTextChange<PS, S>, MaterializedListModification<Paragraph<PS, S>>> replace(
             int from, int to, ReadOnlyStyledDocument<PS, S> replacement) {
         return replace(from, to, x -> replacement);
     }

richtextfx/src/main/java/org/fxmisc/richtext/RichTextChange.java → richtextfx/src/main/java/org/fxmisc/richtext/model/RichTextChange.java

@@ -1,4 +1,4 @@
-package org.fxmisc.richtext;
+package org.fxmisc.richtext.model;
 
 public class RichTextChange<PS, S> extends TextChange<StyledDocument<PS, S>, RichTextChange<PS, S>> {
 

richtextfx/src/main/java/org/fxmisc/richtext/SimpleEditableStyledDocument.java → richtextfx/src/main/java/org/fxmisc/richtext/model/SimpleEditableStyledDocument.java

@@ -1,6 +1,6 @@
-package org.fxmisc.richtext;
+package org.fxmisc.richtext.model;
 
-import static org.fxmisc.richtext.TwoDimensional.Bias.*;
+import static org.fxmisc.richtext.model.TwoDimensional.Bias.*;
 
 import java.util.ArrayList;
 import java.util.Collections;

richtextfx/src/main/java/org/fxmisc/richtext/StyleSpan.java → richtextfx/src/main/java/org/fxmisc/richtext/model/StyleSpan.java

@@ -1,4 +1,4 @@
-package org.fxmisc.richtext;
+package org.fxmisc.richtext.model;
 
 import java.util.Objects;
 

richtextfx/src/main/java/org/fxmisc/richtext/StyleSpans.java → richtextfx/src/main/java/org/fxmisc/richtext/model/StyleSpans.java

@@ -1,6 +1,6 @@
-package org.fxmisc.richtext;
+package org.fxmisc.richtext.model;
 
-import static org.fxmisc.richtext.TwoDimensional.Bias.*;
+import static org.fxmisc.richtext.model.TwoDimensional.Bias.*;
 
 import java.util.Iterator;
 import java.util.Objects;