Skip to content

LT-21500: Move ClerkOwningObjChanged to Pub/Sub #639

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
mark-sil merged 1 commit into from
Jan 27, 2026
Merged

LT-21500: Move ClerkOwningObjChanged to Pub/Sub #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion Src/LexText/Lexicon/ReversalListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using SIL.LCModel.Core.WritingSystems;
using SIL.FieldWorks.Common.Controls;
using SIL.FieldWorks.Common.FwUtils;
using static SIL.FieldWorks.Common.FwUtils.FwUtils;
using SIL.FieldWorks.Common.RootSites;
using SIL.LCModel;
using SIL.LCModel.Infrastructure;
Expand Down Expand Up @@ -446,7 +447,7 @@ public override void ChangeOwningObject(Guid newGuid, bool updateAndNotify, Dict
SetOwningObject(newOwningObj, updateAndNotify); // Reloads and sorts the list.
m_propertyTable.SetProperty("ActiveClerkOwningObject", newOwningObj, true);
m_propertyTable.SetPropertyPersistence("ActiveClerkOwningObject", false);
m_mediator.SendMessage("ClerkOwningObjChanged", this);
Publisher.Publish(new PublisherParameterObject(EventConstants.ClerkOwningObjChanged, this));
}
else
{
Expand Down
10 changes: 7 additions & 3 deletions Src/xWorks/RecordBrowseView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using SIL.FieldWorks.Common.ViewsInterfaces;
using SIL.FieldWorks.Common.Controls;
using SIL.FieldWorks.Common.FwUtils;
using static SIL.FieldWorks.Common.FwUtils.FwUtils;
using SIL.FieldWorks.Common.RootSites;
using SIL.FieldWorks.Common.Widgets;
using SIL.LCModel;
Expand Down Expand Up @@ -63,6 +64,8 @@ protected override void Dispose(bool disposing)

if (disposing)
{
Subscriber.Unsubscribe(EventConstants.ClerkOwningObjChanged, ClerkOwningObjChanged);

if (ExistingClerk != null) // ExistingClerk, *not* Clerk (see doc on ExistingClerk)
{
PersistSortSequence();
Expand Down Expand Up @@ -176,12 +179,12 @@ private void TargetColumnChanged(object sender, TargetColumnChangedEventArgs e)
}
}

public bool OnClerkOwningObjChanged(object sender)
private void ClerkOwningObjChanged(object sender)
{
CheckDisposed();

if (Clerk != sender || (m_browseViewer==null))
return false;
return;

if (Clerk.OwningObject == null)
{
Expand All @@ -196,7 +199,6 @@ public bool OnClerkOwningObjChanged(object sender)
m_browseViewer.RootObjectHvo = Clerk.OwningObject.Hvo;
SetInfoBarText();
}
return false; //allow others clients of this clerk to know about it as well.
}

/// <summary>
Expand Down Expand Up @@ -671,6 +673,8 @@ public override void Init(Mediator mediator, PropertyTable propertyTable, XmlNod
// ShowRecord() was called in InitBase, but quit without doing anything,
// so call it again, since we are ready now.
ShowRecord();

Subscriber.Subscribe(EventConstants.ClerkOwningObjChanged, ClerkOwningObjChanged);
}

private void CheckExpectedListItemsClassInSync()
Expand Down
2 changes: 1 addition & 1 deletion Src/xWorks/RecordClerk.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1391,7 +1391,7 @@ private void UpdateOwningObject(bool fUpdateOwningObjectOnlyIfChanged)
}
}
if (old != newObj)
m_mediator.SendMessage("ClerkOwningObjChanged", this);
Publisher.Publish(new PublisherParameterObject(EventConstants.ClerkOwningObjChanged, this));
}
}

Expand Down
8 changes: 5 additions & 3 deletions Src/xWorks/XmlDocView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ protected override void Dispose( bool disposing )

if( disposing )
{
Subscriber.Unsubscribe(EventConstants.ClerkOwningObjChanged, ClerkOwningObjChanged);
DisposeTooltip();
if(components != null)
components.Dispose();
Expand Down Expand Up @@ -720,12 +721,12 @@ static ICmObject GetTarget(ICmObject obj, int clsid)
return null;
}

public bool OnClerkOwningObjChanged(object sender)
private void ClerkOwningObjChanged(object sender)
{
CheckDisposed();

if (this.Clerk != sender || (m_mainView == null))
return false;
return;

if (Clerk.OwningObject == null)
{
Expand All @@ -741,7 +742,6 @@ public bool OnClerkOwningObjChanged(object sender)
m_mainView.ResetRoot(m_hvoOwner);
SetInfoBarText();
}
return false; //allow others clients of this clerk to know about it as well.
}

/// <summary>
Expand Down Expand Up @@ -1264,6 +1264,8 @@ public override void Init(Mediator mediator, PropertyTable propertyTable, XmlNod
CheckDisposed();

InitBase(mediator, propertyTable, configurationParameters);

Subscriber.Subscribe(EventConstants.ClerkOwningObjChanged, ClerkOwningObjChanged);
}

/// <summary>
Expand Down
Loading