Skip to content

Commit cd96277

Browse files
committed
Merge pull request #243 from JordanMartinez/modulateStyledTextArea
Extract Model content from StyledTextArea (view) into its own model class (StyledTextAreaModel).
2 parents 37872b5 + 14a077f commit cd96277

7 files changed

Lines changed: 922 additions & 445 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public static <S, PS>VirtualizedScrollPane<StyledTextArea<S, PS>> embeddedStyled
6262
public static <S, PS> StyledTextArea<S, PS> cloneStyleTextArea(StyledTextArea<S, PS> area) {
6363
return new StyledTextArea<S, PS>(area.getInitialStyle(), area.getApplyStyle(),
6464
area.getInitialParagraphStyle(), area.getApplyParagraphStyle(),
65-
area.getContent(), area.isPreserveStyle());
65+
area.getModel().getContent(), area.isPreserveStyle());
6666
}
6767

6868
// Embeds cloned StyledTextArea
@@ -105,7 +105,7 @@ public static VirtualizedScrollPane<StyleClassedTextArea> embeddedStyleClassedTe
105105

106106
// Clones StyleClassedTextArea
107107
public static StyleClassedTextArea cloneStyleClassedTextArea(StyleClassedTextArea area) {
108-
return new StyleClassedTextArea(area.getContent(), area.isPreserveStyle());
108+
return new StyleClassedTextArea(area.getModel().getContent(), area.isPreserveStyle());
109109
}
110110

111111
// Embeds cloned StyleClassedTextArea
@@ -148,7 +148,7 @@ public static VirtualizedScrollPane<CodeArea> embeddedCodeArea(String text) {
148148

149149
// Clones CodeArea
150150
public static CodeArea cloneCodeArea(CodeArea area) {
151-
return new CodeArea(area.getContent());
151+
return new CodeArea(area.getModel().getContent());
152152
}
153153

154154
// Embeds a cloned CodeArea
@@ -189,7 +189,7 @@ public static VirtualizedScrollPane<InlineCssTextArea> embeddedInlineCssTextArea
189189

190190
// Clones InlineCssTextArea
191191
public static InlineCssTextArea cloneInlineCssTextArea(InlineCssTextArea area) {
192-
return new InlineCssTextArea(area.getContent());
192+
return new InlineCssTextArea(area.getModel().getContent());
193193
}
194194

195195
// Embeds a cloned InlineCssTextArea

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

Lines changed: 86 additions & 297 deletions
Large diffs are not rendered by default.

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

Lines changed: 94 additions & 92 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)