Skip to content

Commit d3c6ea4

Browse files
Simplify code
1 parent 19c26db commit d3c6ea4

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ public interface EditableStyledDocument<PS, SEG, S> extends StyledDocument<PS, S
4545

4646
default EventStream<PlainTextChange> plainChanges() {
4747
return richChanges()
48-
.map(c -> new PlainTextChange(c.position, c.removed.getText(), c.inserted.getText()))
48+
.map(RichTextChange::toPlainTextChange)
4949
// filter out rich changes where the style was changed but text wasn't added/removed
50-
.filter(pc -> !pc.removed.equals(pc.inserted));
50+
.filter(pc -> !pc.isIdentity());
5151
}
5252

5353
EventStream<RichTextChange<PS, SEG, S>> richChanges();

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,8 @@ protected final StyledDocument<PS, SEG, S> sub(StyledDocument<PS, SEG, S> doc, i
3030
protected final RichTextChange<PS, SEG, S> create(int position, StyledDocument<PS, SEG, S> removed, StyledDocument<PS, SEG, S> inserted) {
3131
return new RichTextChange<>(position, removed, inserted);
3232
}
33+
34+
public final PlainTextChange toPlainTextChange() {
35+
return new PlainTextChange(position, removed.getText(), inserted.getText());
36+
}
3337
}

0 commit comments

Comments
 (0)