Skip to content

Commit 8459717

Browse files
authored
Merge pull request #313 from afester/modelPackage
Move model classes to model package
2 parents 9bb46ac + 0cdaa23 commit 8459717

42 files changed

Lines changed: 155 additions & 113 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import org.fxmisc.flowless.VirtualizedScrollPane;
1414
import org.fxmisc.richtext.CodeArea;
1515
import org.fxmisc.richtext.LineNumberFactory;
16-
import org.fxmisc.richtext.StyleSpans;
17-
import org.fxmisc.richtext.StyleSpansBuilder;
16+
import org.fxmisc.richtext.model.StyleSpans;
17+
import org.fxmisc.richtext.model.StyleSpansBuilder;
1818

1919
public class JavaKeywords extends Application {
2020

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import org.fxmisc.flowless.VirtualizedScrollPane;
1919
import org.fxmisc.richtext.CodeArea;
2020
import org.fxmisc.richtext.LineNumberFactory;
21-
import org.fxmisc.richtext.StyleSpans;
22-
import org.fxmisc.richtext.StyleSpansBuilder;
21+
import org.fxmisc.richtext.model.StyleSpans;
22+
import org.fxmisc.richtext.model.StyleSpansBuilder;
2323

2424
public class JavaKeywordsAsync extends Application {
2525

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
import org.fxmisc.flowless.VirtualizedScrollPane;
1414
import org.fxmisc.richtext.StyleClassedTextArea;
15-
import org.fxmisc.richtext.StyleSpans;
16-
import org.fxmisc.richtext.StyleSpansBuilder;
15+
import org.fxmisc.richtext.model.StyleSpans;
16+
import org.fxmisc.richtext.model.StyleSpansBuilder;
1717

1818
import javafx.application.Application;
1919
import javafx.scene.Scene;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import org.fxmisc.flowless.VirtualizedScrollPane;
99
import org.fxmisc.richtext.CodeArea;
1010
import org.fxmisc.richtext.LineNumberFactory;
11-
import org.fxmisc.richtext.StyleSpans;
12-
import org.fxmisc.richtext.StyleSpansBuilder;
11+
import org.fxmisc.richtext.model.StyleSpans;
12+
import org.fxmisc.richtext.model.StyleSpansBuilder;
1313

1414
import javafx.application.Application;
1515
import javafx.scene.Scene;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import javafx.scene.paint.Color;
1212
import javafx.scene.text.TextAlignment;
1313

14-
import org.fxmisc.richtext.Codec;
14+
import org.fxmisc.richtext.model.Codec;
1515

1616
/**
1717
* Holds information about the style of a paragraph.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
package org.fxmisc.richtext.demo.richtext;
88

9-
import static org.fxmisc.richtext.TwoDimensional.Bias.*;
9+
import static org.fxmisc.richtext.model.TwoDimensional.Bias.*;
1010

1111
import java.util.List;
1212
import java.util.Optional;
@@ -34,9 +34,9 @@
3434
import javafx.stage.Stage;
3535

3636
import org.fxmisc.flowless.VirtualizedScrollPane;
37-
import org.fxmisc.richtext.Paragraph;
38-
import org.fxmisc.richtext.StyleSpans;
3937
import org.fxmisc.richtext.StyledTextArea;
38+
import org.fxmisc.richtext.model.Paragraph;
39+
import org.fxmisc.richtext.model.StyleSpans;
4040
import org.reactfx.SuspendableNo;
4141

4242
public class RichText extends Application {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
import javafx.scene.paint.Color;
1313

14-
import org.fxmisc.richtext.Codec;
14+
import org.fxmisc.richtext.model.Codec;
1515

1616
/**
1717
* Holds information about the style of a text fragment.

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
import javafx.scene.input.ClipboardContent;
1515
import javafx.scene.input.DataFormat;
1616

17+
import org.fxmisc.richtext.model.Codec;
18+
import org.fxmisc.richtext.model.EditActions;
19+
import org.fxmisc.richtext.model.ReadOnlyStyledDocument;
20+
import org.fxmisc.richtext.model.StyledDocument;
21+
import org.fxmisc.richtext.model.TextEditingArea;
1722
import org.reactfx.util.Tuple2;
1823

1924
/**

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
import java.util.Collection;
55

6+
import org.fxmisc.richtext.model.EditableStyledDocument;
7+
68
/**
79
* A convenience subclass of {@link StyleClassedTextArea}
810
* with fixed-width font and an undo manager that observes

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package org.fxmisc.richtext;
22

33

4+
import org.fxmisc.richtext.model.Codec;
5+
import org.fxmisc.richtext.model.EditableStyledDocument;
6+
import org.fxmisc.richtext.model.SimpleEditableStyledDocument;
7+
48
import javafx.scene.text.TextFlow;
59

610
/**

0 commit comments

Comments
 (0)