Index: Core/Gui/src/Core.Gui/Plugin/ViewInfo.cs =================================================================== diff -u -rce7a3865e550c0ddf8680aaab9ff591763be5025 -re19f460e72a67bb4e4d7d32ced99952a3c81e432 --- Core/Gui/src/Core.Gui/Plugin/ViewInfo.cs (.../ViewInfo.cs) (revision ce7a3865e550c0ddf8680aaab9ff591763be5025) +++ Core/Gui/src/Core.Gui/Plugin/ViewInfo.cs (.../ViewInfo.cs) (revision e19f460e72a67bb4e4d7d32ced99952a3c81e432) @@ -75,15 +75,15 @@ public Image Image { get; set; } /// - /// Gets or sets the symbol of the view. + /// Gets or sets the method used to determine the symbol for the view. /// - public string Symbol { get; set; } + public Func GetSymbol { get; set; } /// - /// Gets or sets the font family for the symbol of the view. + /// Gets or sets the method used to determine the font family of the symbol for the view. /// - public FontFamily FontFamily { get; set; } - + public Func GetFontFamily { get; set; } + /// /// Gets or sets the optional method for checking if this view info object can be /// used for a given data object. Function arguments: @@ -213,15 +213,15 @@ public Image Image { get; set; } /// - /// Gets or sets the symbol of the view. + /// Gets or sets the method used to determine the symbol for the view. /// - public string Symbol { get; set; } + public Func GetSymbol { get; set; } /// - /// Gets or sets the font family for the symbol of the view. + /// Gets or sets the method used to determine the font family of the symbol for the view. /// - public FontFamily FontFamily { get; set; } - + public Func GetFontFamily { get; set; } + /// /// Gets or sets the optional method for checking if this view info object can be /// used for a given data object. Function arguments: @@ -289,8 +289,8 @@ ViewType = viewInfo.ViewType, Description = viewInfo.Description, Image = viewInfo.Image, - Symbol = viewInfo.Symbol, - FontFamily = viewInfo.FontFamily, + GetSymbol = viewInfo.GetSymbol, + GetFontFamily = viewInfo.GetFontFamily, AdditionalDataCheck = o => viewInfo.AdditionalDataCheck == null || viewInfo.AdditionalDataCheck((TData) o), GetViewData = o => viewInfo.GetViewData != null ? viewInfo.GetViewData((TData) o) : o, CloseForData = (v, o) => viewInfo.CloseForData != null && viewInfo.CloseForData((TView) v, o), Index: Core/Gui/test/Core.Gui.Test/Plugin/ViewInfoTest.cs =================================================================== diff -u -r15d39e3773620fe0e9c23de9831e16e6cc105d01 -re19f460e72a67bb4e4d7d32ced99952a3c81e432 --- Core/Gui/test/Core.Gui.Test/Plugin/ViewInfoTest.cs (.../ViewInfoTest.cs) (revision 15d39e3773620fe0e9c23de9831e16e6cc105d01) +++ Core/Gui/test/Core.Gui.Test/Plugin/ViewInfoTest.cs (.../ViewInfoTest.cs) (revision e19f460e72a67bb4e4d7d32ced99952a3c81e432) @@ -46,8 +46,8 @@ Assert.IsNull(viewInfo.Description); Assert.IsNull(viewInfo.GetViewName); Assert.IsNull(viewInfo.Image); - Assert.IsNull(viewInfo.Symbol); - Assert.IsNull(viewInfo.FontFamily); + Assert.IsNull(viewInfo.GetSymbol); + Assert.IsNull(viewInfo.GetFontFamily); Assert.IsNull(viewInfo.AdditionalDataCheck); Assert.IsNull(viewInfo.GetViewData); Assert.IsNull(viewInfo.AfterCreate); @@ -71,8 +71,8 @@ const string newDescription = ""; string GetViewName(IView view, object o) => ""; Image image = Resources.abacus; - const string symbol = ""; - var fontFamily = new FontFamily(); + string GetSymbol() => ""; + FontFamily GetFontFamily() => new FontFamily(); bool AdditionalDataCheck(object o) => true; object GetViewData(object o) => 45; void AfterCreate(IView view, object o) {} @@ -86,8 +86,8 @@ viewInfo.Description = newDescription; viewInfo.GetViewName = GetViewName; viewInfo.Image = image; - viewInfo.Symbol = symbol; - viewInfo.FontFamily = fontFamily; + viewInfo.GetSymbol = GetSymbol; + viewInfo.GetFontFamily = GetFontFamily; viewInfo.AdditionalDataCheck = AdditionalDataCheck; viewInfo.GetViewData = GetViewData; viewInfo.AfterCreate = AfterCreate; @@ -101,8 +101,8 @@ Assert.AreEqual(newDescription, viewInfo.Description); Assert.AreEqual((Func) GetViewName, viewInfo.GetViewName); Assert.AreEqual(image, viewInfo.Image); - Assert.AreEqual(symbol, viewInfo.Symbol); - Assert.AreSame(fontFamily, viewInfo.FontFamily); + Assert.AreEqual((Func) GetSymbol, viewInfo.GetSymbol); + Assert.AreEqual((Func) GetFontFamily, viewInfo.GetFontFamily); Assert.AreEqual((Func) AdditionalDataCheck, viewInfo.AdditionalDataCheck); Assert.AreEqual((Func) GetViewData, viewInfo.GetViewData); Assert.AreEqual((Action) AfterCreate, viewInfo.AfterCreate); @@ -163,8 +163,8 @@ Assert.IsNull(viewInfo.Description); Assert.IsNull(viewInfo.GetViewName); Assert.IsNull(viewInfo.Image); - Assert.IsNull(viewInfo.Symbol); - Assert.IsNull(viewInfo.FontFamily); + Assert.IsNull(viewInfo.GetSymbol); + Assert.IsNull(viewInfo.GetFontFamily); Assert.IsNull(viewInfo.AdditionalDataCheck); Assert.IsNull(viewInfo.GetViewData); Assert.IsNull(viewInfo.AfterCreate); @@ -181,8 +181,8 @@ const string newDescription = ""; string GetViewName(IView view, int o) => ""; Image image = Resources.abacus; - const string symbol = ""; - var fontFamily = new FontFamily(); + string GetSymbol() => ""; + FontFamily GetFontFamily() => new FontFamily(); bool AdditionalDataCheck(int o) => true; string GetViewData(int o) => o.ToString(); void AfterCreate(IView view, int o) {} @@ -193,8 +193,8 @@ viewInfo.Description = newDescription; viewInfo.GetViewName = (Func) GetViewName; viewInfo.Image = image; - viewInfo.Symbol = symbol; - viewInfo.FontFamily = fontFamily; + viewInfo.GetSymbol = GetSymbol; + viewInfo.GetFontFamily = GetFontFamily; viewInfo.AdditionalDataCheck = AdditionalDataCheck; viewInfo.GetViewData = GetViewData; viewInfo.AfterCreate = (Action) AfterCreate; @@ -205,8 +205,8 @@ Assert.AreEqual(newDescription, viewInfo.Description); Assert.AreEqual((Func) GetViewName, viewInfo.GetViewName); Assert.AreEqual(image, viewInfo.Image); - Assert.AreEqual(symbol, viewInfo.Symbol); - Assert.AreSame(fontFamily, viewInfo.FontFamily); + Assert.AreEqual((Func) GetSymbol, viewInfo.GetSymbol); + Assert.AreEqual((Func) GetFontFamily, viewInfo.GetFontFamily); Assert.AreEqual((Func) AdditionalDataCheck, viewInfo.AdditionalDataCheck); Assert.AreEqual((Func) GetViewData, viewInfo.GetViewData); Assert.AreEqual((Action) AfterCreate, viewInfo.AfterCreate); @@ -262,8 +262,8 @@ } Image image = Resources.abacus; - const string symbol = ""; - var fontFamily = new FontFamily(); + string GetSymbol() => ""; + FontFamily GetFontFamily() => new FontFamily(); bool AdditionalDataCheck(int o) { @@ -296,8 +296,8 @@ viewInfo.Description = newDescription; viewInfo.GetViewName = (Func) GetViewName; viewInfo.Image = image; - viewInfo.Symbol = symbol; - viewInfo.FontFamily = fontFamily; + viewInfo.GetSymbol = GetSymbol; + viewInfo.GetFontFamily = GetFontFamily; viewInfo.AdditionalDataCheck = AdditionalDataCheck; viewInfo.GetViewData = GetViewData; viewInfo.AfterCreate = (Action) AfterCreate; @@ -321,8 +321,8 @@ Assert.AreEqual(newDescription, info.Description); Assert.AreEqual(newViewName, info.GetViewName(stringView, dataObject)); Assert.AreEqual(image, info.Image); - Assert.AreEqual(symbol, info.Symbol); - Assert.AreSame(fontFamily, info.FontFamily); + Assert.AreEqual((Func) GetSymbol, info.GetSymbol); + Assert.AreEqual((Func) GetFontFamily, info.GetFontFamily); Assert.IsTrue(viewInfo.AdditionalDataCheck(dataObject)); Assert.AreEqual(dataObject.ToString(), viewInfo.GetViewData(dataObject)); Assert.AreEqual("A", viewInfo.CreateInstance(dataObject).Text); Index: Riskeer/Common/src/Riskeer.Common.Plugin/RiskeerViewInfo.cs =================================================================== diff -u -rc7ac0719acf1ba7f05cfaeb13eacba48007abd39 -re19f460e72a67bb4e4d7d32ced99952a3c81e432 --- Riskeer/Common/src/Riskeer.Common.Plugin/RiskeerViewInfo.cs (.../RiskeerViewInfo.cs) (revision c7ac0719acf1ba7f05cfaeb13eacba48007abd39) +++ Riskeer/Common/src/Riskeer.Common.Plugin/RiskeerViewInfo.cs (.../RiskeerViewInfo.cs) (revision e19f460e72a67bb4e4d7d32ced99952a3c81e432) @@ -42,8 +42,8 @@ throw new ArgumentNullException(nameof(getGuiFunc)); } - Symbol = getGuiFunc()?.ActiveStateInfo?.Symbol; - FontFamily = getGuiFunc()?.ActiveStateInfo?.FontFamily; + GetSymbol = () => getGuiFunc()?.ActiveStateInfo?.Symbol; + GetFontFamily = () => getGuiFunc()?.ActiveStateInfo?.FontFamily; } }