Skip to content

Commit 84ccd7e

Browse files
committed
Restore a couple IChangeContext uses lost in merge
Merge conflict resolution picked ChangeContext rather than IChangeContext for a couple of methods; this fixed that.
1 parent 4f2d766 commit 84ccd7e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/SIL.Harmony.Sample/Changes/NewWordChange.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class NewWordChange(Guid entityId, string text, string? note = null, Guid
1010
public string? Note { get; } = note;
1111
public Guid? AntonymId { get; } = antonymId;
1212

13-
public override async ValueTask<Word> NewEntity(Commit commit, ChangeContext context)
13+
public override async ValueTask<Word> NewEntity(Commit commit, IChangeContext context)
1414
{
1515
var antonymShouldBeNull = AntonymId is null || (await context.IsObjectDeleted(AntonymId.Value));
1616
return (new Word { Text = Text, Note = Note, Id = EntityId, AntonymId = antonymShouldBeNull ? null : AntonymId });

src/SIL.Harmony.Sample/Changes/SetTagChange.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class SetTagChange(Guid entityId, string text) : Change<Tag>(entityId), I
88
{
99
public string Text { get; } = text;
1010

11-
public override ValueTask<Tag> NewEntity(Commit commit, ChangeContext context)
11+
public override ValueTask<Tag> NewEntity(Commit commit, IChangeContext context)
1212
{
1313
return new(new Tag()
1414
{
@@ -18,7 +18,7 @@ public override ValueTask<Tag> NewEntity(Commit commit, ChangeContext context)
1818
}
1919

2020

21-
public override ValueTask ApplyChange(Tag entity, ChangeContext context)
21+
public override ValueTask ApplyChange(Tag entity, IChangeContext context)
2222
{
2323
entity.Text = Text;
2424
return ValueTask.CompletedTask;

0 commit comments

Comments
 (0)