Skip to content

Extracted Model content from StyledTextArea (view) into its own model class (StyledTextAreaModel) #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TomasMikula merged 7 commits into from
Jan 23, 2016
Merged

Extracted Model content from StyledTextArea (view) into its own model class (StyledTextAreaModel) #243

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f10b348
Created StyledTextAreaModel to better modulate the Model content from…
JordanMartinez Jan 22, 2016
eba3671
Updated `StyledTextArea` to use `StyledTextAreaModel`
JordanMartinez Jan 22, 2016
7a74a3f
Updated `AreaFactory`'s cloning factory methods.
JordanMartinez Jan 22, 2016
3d37aa1
Modulated model and view in StyledTextAreaBehavior (Controller); Remo…
JordanMartinez Jan 23, 2016
b6ec66e
Updated test class name to the class it now tests (StyledTextAreaModel).
JordanMartinez Jan 23, 2016
863f79a
Moved javadoc originally in TextEditingArea to StyledTextArea
JordanMartinez Jan 23, 2016
14a077f
Removed code that initializes JavaFX since it's no longer needed for …
JordanMartinez Jan 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions richtextfx/src/main/java/org/fxmisc/richtext/AreaFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public static <S, PS>VirtualizedScrollPane<StyledTextArea<S, PS>> embeddedStyled
public static <S, PS> StyledTextArea<S, PS> cloneStyleTextArea(StyledTextArea<S, PS> area) {
return new StyledTextArea<S, PS>(area.getInitialStyle(), area.getApplyStyle(),
area.getInitialParagraphStyle(), area.getApplyParagraphStyle(),
area.getContent(), area.isPreserveStyle());
area.getModel().getContent(), area.isPreserveStyle());
}

// Embeds cloned StyledTextArea
Expand Down Expand Up @@ -105,7 +105,7 @@ public static VirtualizedScrollPane<StyleClassedTextArea> embeddedStyleClassedTe

// Clones StyleClassedTextArea
public static StyleClassedTextArea cloneStyleClassedTextArea(StyleClassedTextArea area) {
return new StyleClassedTextArea(area.getContent(), area.isPreserveStyle());
return new StyleClassedTextArea(area.getModel().getContent(), area.isPreserveStyle());
}

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

// Clones CodeArea
public static CodeArea cloneCodeArea(CodeArea area) {
return new CodeArea(area.getContent());
return new CodeArea(area.getModel().getContent());
}

// Embeds a cloned CodeArea
Expand Down Expand Up @@ -189,7 +189,7 @@ public static VirtualizedScrollPane<InlineCssTextArea> embeddedInlineCssTextArea

// Clones InlineCssTextArea
public static InlineCssTextArea cloneInlineCssTextArea(InlineCssTextArea area) {
return new InlineCssTextArea(area.getContent());
return new InlineCssTextArea(area.getModel().getContent());
}

// Embeds a cloned InlineCssTextArea
Expand Down
Loading
⚡