Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs =================================================================== diff -u -r9d2bb4d5618592132638e924593253ad8caee1b0 -r593dcdd2ed0910dc71062e9fe5c38fe61a18ebdd --- Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs (.../ViewResolver.cs) (revision 9d2bb4d5618592132638e924593253ad8caee1b0) +++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs (.../ViewResolver.cs) (revision 593dcdd2ed0910dc71062e9fe5c38fe61a18ebdd) @@ -119,9 +119,9 @@ return CreateViewForData(data, viewInfoList[0]); } - public bool CanOpenViewFor(object data, Type viewType = null) + public bool CanOpenViewFor(object data) { - return data != null && GetViewInfosFor(data, viewType).Any(); + return data != null && GetViewInfosFor(data).Any(); } public IList GetViewsForData(object data) @@ -291,7 +291,7 @@ foreach (var view in viewsToCheck) { - var viewInfo = GetViewInfoForView(data, view); + var viewInfo = GetViewInfoForView(view); if (IsViewData(view, data) && (extraCheck == null || extraCheck(view, viewInfo))) { @@ -302,7 +302,7 @@ private bool IsViewData(IView view, object data) { - var viewInfo = GetViewInfoForView(data, view); + var viewInfo = GetViewInfoForView(view); return data.Equals(view.Data) || (IsDataForView(view, data) && Equals(viewInfo.GetViewData(data), view.Data)); } @@ -313,13 +313,13 @@ return false; } - var viewInfo = GetViewInfoForView(data, view); + var viewInfo = GetViewInfoForView(view); return viewInfo != null && data.GetType().Implements(viewInfo.DataType) && viewInfo.AdditionalDataCheck(data); } - private ViewInfo GetViewInfoForView(object data, IView view) + private ViewInfo GetViewInfoForView(IView view) { - return view.ViewInfo ?? (view.ViewInfo = GetViewInfosFor(data, view.GetType()).FirstOrDefault()); + return viewInfos.FirstOrDefault(vi => vi.ViewType == view.GetType()); } private void ClearDefaultView(object data) Index: Core/Common/src/Core.Common.Gui/IViewResolver.cs =================================================================== diff -u -r9d2bb4d5618592132638e924593253ad8caee1b0 -r593dcdd2ed0910dc71062e9fe5c38fe61a18ebdd --- Core/Common/src/Core.Common.Gui/IViewResolver.cs (.../IViewResolver.cs) (revision 9d2bb4d5618592132638e924593253ad8caee1b0) +++ Core/Common/src/Core.Common.Gui/IViewResolver.cs (.../IViewResolver.cs) (revision 593dcdd2ed0910dc71062e9fe5c38fe61a18ebdd) @@ -38,9 +38,8 @@ /// Check if a view can be created for the and /// /// The data to check for - /// ViewType to use (if null then default will be used) /// - bool CanOpenViewFor(object data, Type viewType = null); + bool CanOpenViewFor(object data); /// /// Returns all currently opened views for the same data.