Use EstablishDefaultSense to update the secondary cache

Author: jtmaxwell3

Src/Common/FwUtils/EventConstants.cs

@@ -33,7 +33,6 @@ public static class EventConstants
 		public const string RefreshCurrentList = "RefreshCurrentList";
 		public const string RefreshInterlin = "RefreshInterlin";
 		public const string RefreshPopupWindowFonts = "RefreshPopupWindowFonts";
-		public const string RefreshSandbox = "RefreshSandbox";
 		public const string ReloadAreaTools = "ReloadAreaTools";
 		public const string RemoveFilters = "RemoveFilters";
 		public const string RestoreScrollPosition = "RestoreScrollPosition";

Src/LexText/Interlinear/FocusBoxController.cs

@@ -47,6 +47,8 @@ internal bool IsDirty
 			get { return m_sandbox.IsDirty; }
 		}
 
+		private bool suppressFocusChange = false;
+
 		// There is no logical reason for other buttons ever to get the focus. But .NET helpfully focuses the link words button
 		// as we hide the focus box. And in some other circumstance, which I can't even figure out, it focuses the menu button.
 		// I can't figure out how to prevent it, but it's better for the confirm
@@ -263,7 +265,10 @@ internal void AdjustSizeAndLocationForControls(bool fAdjustOverallSize)
 			}
 			finally
 			{
-				Focus();
+				if (!suppressFocusChange)
+				{
+					Focus();
+				}
 				m_fAdjustingSize = false;
 			}
 		}
@@ -310,6 +315,20 @@ public virtual void SelectOccurrence(AnalysisOccurrence selected)
 			ChangeOrCreateSandbox(selected);
 		}
 
+		public void UpdateField(int hvo, int flid)
+		{
+			try
+			{
+				// This fixes LT-22539.
+				suppressFocusChange = true;
+				m_sandbox.UpdateField(hvo, flid);
+			}
+			finally
+			{
+				suppressFocusChange = false;
+			}
+		}
+
 		#endregion
 
 		internal bool MakeDefaultSelection(object parameter)
@@ -552,6 +571,7 @@ internal interface IAnalysisControlInternal
 		int GetLineOfCurrentSelection();
 		bool SelectOnOrBeyondLine(int startLine, int increment);
 		void UpdateLineChoices(InterlinLineChoices choices);
+		void UpdateField(int hvo, int flid);
 		int MultipleAnalysisColor { set; }
 		bool IsDirty { get; }
 	}

Src/LexText/Interlinear/InterlinDocForAnalysis.Designer.cs

@@ -47,16 +47,6 @@ public InterlinDocForAnalysis()
 			InitializeComponent();
 			RightMouseClickedEvent += InterlinDocForAnalysis_RightMouseClickedEvent;
 			DoSpellCheck = true;
-			FwUtils.Subscriber.Subscribe(EventConstants.RefreshSandbox, RefreshSandbox);
-		}
-
-		private void RefreshSandbox(object commandObject)
-		{
-			if (IsFocusBoxInstalled && FocusBox.SelectedOccurrence != null)
-			{
-				FocusBox.SelectOccurrence(FocusBox.SelectedOccurrence);
-				MoveFocusBoxIntoPlace();
-			}
 		}
 
 		void InterlinDocForAnalysis_RightMouseClickedEvent(SimpleRootSite sender, FwRightMouseClickEventArgs e)
@@ -123,6 +113,10 @@ public override void PropChanged(int hvo, int tag, int ivMin, int cvIns, int cvD
 					MoveFocusBoxIntoPlace();
 				}
 			}
+			if (IsFocusBoxInstalled && FocusBox.SelectedOccurrence != null)
+			{
+				FocusBox.UpdateField(hvo, tag);
+			}
 		}
 
 		protected override void UpdateWordforms(HashSet<IWfiWordform> wordforms)

Src/LexText/Interlinear/InterlinDocForAnalysis.cs

@@ -3,29 +3,29 @@
 // (http://www.gnu.org/licenses/lgpl-2.1.html)
 
 //#define TraceMouseCalls		// uncomment this line to trace mouse messages
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Windows.Forms;
-using System.Diagnostics;
-using System.Text;
-using SIL.LCModel;
-using SIL.FieldWorks.Common.RootSites;
-using SIL.LCModel.Utils;
+using Icu.Collation;
 using SIL.FieldWorks.Common.FwUtils;
+using SIL.FieldWorks.Common.RootSites;
 using SIL.FieldWorks.Common.ViewsInterfaces;
-using SIL.FieldWorks.FdoUi;
 using SIL.FieldWorks.Common.Widgets;
-using SIL.LCModel.DomainServices;
-using SIL.LCModel.Infrastructure;
+using SIL.FieldWorks.FdoUi;
+using SIL.LCModel;
 using SIL.LCModel.Core.Cellar;
-using SIL.LCModel.Core.Text;
 using SIL.LCModel.Core.KernelInterfaces;
+using SIL.LCModel.Core.Text;
+using SIL.LCModel.DomainServices;
+using SIL.LCModel.Infrastructure;
+using SIL.LCModel.Utils;
 using SIL.PlatformUtilities;
-using XCore;
 using SIL.WritingSystems;
-using Icu.Collation;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using XCore;
 
 namespace SIL.FieldWorks.IText
 {
@@ -1656,6 +1656,22 @@ private int CreateSecondaryAndCopyStrings(int flidChoices, int hvoMain, int flid
 				m_caches.MainCache.MainCacheAccessor, m_caches.DataAccess as IVwCacheDa);
 		}
 
+		public void UpdateField(int hvo, int flid)
+		{
+			int hvoMorph = GetHvoMorphForLexSense(hvo);
+			if (hvoMorph != 0)
+			{
+				ILexSense lexSense = Caches.MainCache.ServiceLocator.GetInstance<ILexSenseRepository>().GetObject(hvo);
+				ILexEntry lexEntry = lexSense?.Owner as ILexEntry;
+				if (lexSense != null && lexEntry != null)
+				{
+					// This fixes LT-22534.
+					EstablishDefaultSense(hvoMorph, lexEntry, lexSense, null);
+				}
+
+			}
+		}
+
 		/// <summary>
 		/// Set the (real) LexEntry that is considered current. Broadcast a notification
 		/// to delegates if it changed.
@@ -3956,6 +3972,21 @@ protected List<int> LexSensesForCurrentMorphs()
 			return lexSensesForMorphs;
 		}
 
+		private int GetHvoMorphForLexSense(int lexSense)
+		{
+			int cmorphs = m_caches.DataAccess.get_VecSize(kSbWord, ktagSbWordMorphs);
+			for (int i = 0; i < cmorphs; i++)
+			{
+				int hvoMorph = m_caches.DataAccess.get_VecItem(kSbWord, ktagSbWordMorphs, i);
+				int hvoMorphSense = m_caches.DataAccess.get_ObjectProp(hvoMorph, ktagSbMorphGloss);
+				if (m_caches.RealHvo(hvoMorphSense) == lexSense)
+				{
+					return hvoMorph;
+				}
+			}
+			return 0;
+		}
+
 		/// <summary>
 		/// get the current dummy sandbox morphs
 		/// </summary>

Src/LexText/Interlinear/SandboxBase.cs

@@ -59,7 +59,6 @@ private void PopupToolWindow_Deactivate(object sender, EventArgs e)
 			{
 				oldActiveClerk.ActivateUI(oldUseRecordTreeBar, oldOldUpdateStatusBar);
 			}
-			FwUtils.Publisher.Publish(new PublisherParameterObject("RefreshSandbox"));
 		}
 
 		private void PopupToolWindow_Activated(object sender, EventArgs e)